You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2012/01/25 11:12:43 UTC

svn commit: r1235707 - in /camel/trunk/tooling/archetypes: camel-archetype-blueprint/src/main/resources-filtered/META-INF/maven/ camel-archetype-blueprint/src/main/resources/archetype-resources/ camel-archetype-scala/src/main/resources-filtered/META-IN...

Author: davsclaus
Date: Wed Jan 25 10:12:42 2012
New Revision: 1235707

URL: http://svn.apache.org/viewvc?rev=1235707&view=rev
Log:
CAMEL-4940: Added versions to plugin so no WARN from maven.

Modified:
    camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
    camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
    camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
    camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml

Modified: camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1235707&r1=1235706&r2=1235707&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml Wed Jan 25 10:12:42 2012
@@ -31,7 +31,10 @@
       <defaultValue>${maven-compiler-plugin-version}</defaultValue>
     </requiredProperty>
     <requiredProperty key="maven-bundle-plugin-version">
-      <defaultValue>2.3.4</defaultValue>
+      <defaultValue>${maven-bundle-version}</defaultValue>
+    </requiredProperty>
+    <requiredProperty key="maven-surefire-plugin-version">
+      <defaultValue>${maven-surefire-plugin}</defaultValue>
     </requiredProperty>
     <requiredProperty key="slf4j-version">
       <defaultValue>${slf4j-version}</defaultValue>

Modified: camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml?rev=1235707&r1=1235706&r2=1235707&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml Wed Jan 25 10:12:42 2012
@@ -103,7 +103,9 @@
 
       <!-- must use fork mode pertest for unit testing with camel-test-blueprint -->
       <plugin>
+        <groupId>org.apache.maven.surefire</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
+        <version>${maven-surefire-plugin-version}</version>
         <configuration>
           <forkMode>pertest</forkMode>
         </configuration>

Modified: camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1235707&r1=1235706&r2=1235707&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml Wed Jan 25 10:12:42 2012
@@ -30,6 +30,12 @@
     <requiredProperty key="maven-compiler-plugin-version">
       <defaultValue>${maven-compiler-plugin-version}</defaultValue>
     </requiredProperty>
+    <requiredProperty key="maven-eclipse-plugin-version">
+      <defaultValue>2.8</defaultValue>
+    </requiredProperty>
+    <requiredProperty key="exec-maven-plugin-version">
+      <defaultValue>1.2.1</defaultValue>
+    </requiredProperty>
     <requiredProperty key="scala-version">
       <defaultValue>${scala-version}</defaultValue>
     </requiredProperty>

Modified: camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml?rev=1235707&r1=1235706&r2=1235707&view=diff
==============================================================================
--- camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml (original)
+++ camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml Wed Jan 25 10:12:42 2012
@@ -114,6 +114,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
+        <version>${maven-eclipse-plugin-version}</version>
         <configuration>
           <projectnatures>
             <projectnature>ch.epfl.lamp.sdt.core.scalanature</projectnature>
@@ -133,6 +134,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
+        <version>${exec-maven-plugin-version}</version>
         <configuration>
           <mainClass>${package}.MyRouteMain</mainClass>
         </configuration>