Author: hadrian
Date: Fri Jan 21 04:48:25 2011
New Revision: 1061632
URL: http://svn.apache.org/viewvc?rev=1061632&view=rev
Log:
CAMEL-3561. Improved fix that parameterizes the compiler plugin version
Modified:
camel/trunk/parent/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-activemq/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-component/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-java/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-spring/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-war/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-war/src/main/resources/archetype-resources/pom.xml
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1061632&r1=1061631&r2=1061632&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Fri Jan 21 04:48:25 2011
@@ -147,6 +147,8 @@
<xerces-version>2.9.1</xerces-version>
<xalan-version>2.7.1</xalan-version>
<xmlbeans-version>2.5.0</xmlbeans-version>
+ <!-- used by camel archetypes -->
+ <maven-compiler-plugin-version>2.3.2</maven-compiler-plugin-version>
<!-- OSGi bundles properties -->
<camel.osgi.import.camel.version>version="[$(version;==;${camel.osgi.version.clean}),$(version;=+;${camel.osgi.version.clean}))"</camel.osgi.import.camel.version>
Modified: camel/trunk/tooling/archetypes/camel-archetype-activemq/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-activemq/pom.xml?rev=1061632&r1=1061631&r2=1061632&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-activemq/pom.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-activemq/pom.xml Fri Jan 21
04:48:25 2011
@@ -61,6 +61,7 @@
<replacefilter token="$SPRING_VESRION_REPLACEME$"
value="${spring-version}" />
<replacefilter token="$JAXB_API_VERSION_REPLACEME$"
value="${jaxb-api-version}" />
<replacefilter token="$JAXB_IMPL_VERSION_REPLACEME$"
value="${jaxb-version}" />
+ <replacefilter
token="$MAVEN_COMPILER_PLUGIN_VERSION_REPLACEME$"
value="${maven-compiler-plugin-version}" />
</replace>
</tasks>
</configuration>
Modified:
camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml?rev=1061632&r1=1061631&r2=1061632&view=diff
==============================================================================
---
camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/trunk/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml
Fri Jan 21 04:48:25 2011
@@ -89,7 +89,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>$MAVEN_COMPILER_PLUGIN_VERSION_REPLACEME$</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
Modified: camel/trunk/tooling/archetypes/camel-archetype-component/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-component/pom.xml?rev=1061632&r1=1061631&r2=1061632&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-component/pom.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-component/pom.xml Fri Jan 21
04:48:25 2011
@@ -54,6 +54,7 @@
<configuration>
<tasks>
<replace
file="${project.build.directory}/classes/archetype-resources/pom.xml"
token="$CAMEL_VERSION_REPLACEME$" value="${project.version}"
casesensitive="true" />
+ <replace
file="${project.build.directory}/classes/archetype-resources/pom.xml"
token="$MAVEN_COMPILER_PLUGIN_VERSION_REPLACEME$"
value="${maven-compiler-plugin-version}" casesensitive="true" />
</tasks>
</configuration>
</execution>
Modified:
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml?rev=1061632&r1=1061631&r2=1061632&view=diff
==============================================================================
---
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/trunk/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml
Fri Jan 21 04:48:25 2011
@@ -62,7 +62,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>$MAVEN_COMPILER_PLUGIN_VERSION_REPLACEME$</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
Modified: camel/trunk/tooling/archetypes/camel-archetype-java/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-java/pom.xml?rev=1061632&r1=1061631&r2=1061632&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-java/pom.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-java/pom.xml Fri Jan 21
04:48:25 2011
@@ -58,6 +58,7 @@
<replacefilter token="$LOG4J_VERSION_REPLACEME$"
value="${log4j-version}" />
<replacefilter token="$JAXB_API_VERSION_REPLACEME$"
value="${jaxb-api-version}" />
<replacefilter token="$JAXB_IMPL_VERSION_REPLACEME$"
value="${jaxb-version}" />
+ <replacefilter
token="$MAVEN_COMPILER_PLUGIN_VERSION_REPLACEME$"
value="${maven-compiler-plugin-version}" />
</replace>
</tasks>
</configuration>
Modified:
camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml?rev=1061632&r1=1061631&r2=1061632&view=diff
==============================================================================
---
camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/trunk/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml
Fri Jan 21 04:48:25 2011
@@ -61,7 +61,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>$MAVEN_COMPILER_PLUGIN_VERSION_REPLACEME$</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
Modified: camel/trunk/tooling/archetypes/camel-archetype-spring/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-spring/pom.xml?rev=1061632&r1=1061631&r2=1061632&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-spring/pom.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-spring/pom.xml Fri Jan 21
04:48:25 2011
@@ -58,6 +58,7 @@
<replacefilter token="$LOG4J_VERSION_REPLACEME$"
value="${log4j-version}" />
<replacefilter token="$JAXB_API_VERSION_REPLACEME$"
value="${jaxb-api-version}" />
<replacefilter token="$JAXB_IMPL_VERSION_REPLACEME$"
value="${jaxb-version}" />
+ <replacefilter
token="$MAVEN_COMPILER_PLUGIN_VERSION_REPLACEME$"
value="${maven-compiler-plugin-version}" />
</replace>
</tasks>
</configuration>
Modified:
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml?rev=1061632&r1=1061631&r2=1061632&view=diff
==============================================================================
---
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/trunk/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml
Fri Jan 21 04:48:25 2011
@@ -61,7 +61,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>$MAVEN_COMPILER_PLUGIN_VERSION_REPLACEME$</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
Modified: camel/trunk/tooling/archetypes/camel-archetype-war/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-war/pom.xml?rev=1061632&r1=1061631&r2=1061632&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-war/pom.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-war/pom.xml Fri Jan 21
04:48:25 2011
@@ -57,6 +57,7 @@
<replace
file="${project.build.directory}/classes/archetype-resources/pom.xml"
token="$ACTIVEMQ_VERSION_REPLACEME$" value="${activemq-version}"
casesensitive="true" />
<replace
file="${project.build.directory}/classes/archetype-resources/pom.xml"
token="$JETTY_VERSION_REPLACEME$" value="${jetty-version}" casesensitive="true"
/>
<replace
file="${project.build.directory}/classes/archetype-resources/pom.xml"
token="$XBEAN_VERSION_REPLACEME$" value="${xbean-spring-version}"
casesensitive="true" />
+ <replace
file="${project.build.directory}/classes/archetype-resources/pom.xml"
token="$MAVEN_COMPILER_PLUGIN_VERSION_REPLACEME$"
value="${maven-compiler-plugin-version}" casesensitive="true" />
</tasks>
</configuration>
</execution>
Modified:
camel/trunk/tooling/archetypes/camel-archetype-war/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-war/src/main/resources/archetype-resources/pom.xml?rev=1061632&r1=1061631&r2=1061632&view=diff
==============================================================================
---
camel/trunk/tooling/archetypes/camel-archetype-war/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/trunk/tooling/archetypes/camel-archetype-war/src/main/resources/archetype-resources/pom.xml
Fri Jan 21 04:48:25 2011
@@ -80,7 +80,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
+ <version>$MAVEN_COMPILER_PLUGIN_VERSION_REPLACEME$</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
