camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jans...@apache.org
Subject svn commit: r827456 - in /camel/trunk: parent/pom.xml pom.xml tests/test-bundles/pom.xml
Date Tue, 20 Oct 2009 13:54:55 GMT
Author: janstey
Date: Tue Oct 20 13:54:55 2009
New Revision: 827456

URL: http://svn.apache.org/viewvc?rev=827456&view=rev
Log:
MR-252 - lock down plugin versions

Modified:
    camel/trunk/parent/pom.xml
    camel/trunk/pom.xml
    camel/trunk/tests/test-bundles/pom.xml

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=827456&r1=827455&r2=827456&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Oct 20 13:54:55 2009
@@ -1142,7 +1142,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-eclipse-plugin</artifactId>
-          <version>2.5.1</version>
           <configuration>
             <buildcommands>
               <java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
@@ -1164,7 +1163,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>2.2</version>
           <dependencies>
             <dependency>
               <groupId>org.apache.camel</groupId>
@@ -1191,111 +1189,7 @@
             </execution>
           </executions>
         </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.2</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>2.3</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.2-beta-4</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-plugin-plugin</artifactId>
-          <version>2.5</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-clean-plugin</artifactId>
-          <version>2.3</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.5</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-shade-plugin</artifactId>
-          <version>1.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-install-plugin</artifactId>
-          <version>2.2</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-remote-resources-plugin</artifactId>
-          <version>1.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>2.2</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.0.2</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>2.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-war-plugin</artifactId>
-          <version>2.1-alpha-2</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.4.3</version>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>properties-maven-plugin</artifactId>
-          <version>1.0-alpha-2</version>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>build-helper-maven-plugin</artifactId>
-          <version>1.4</version>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>axistools-maven-plugin</artifactId>
-          <version>1.3</version>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>exec-maven-plugin</artifactId>
-          <version>1.1.1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>ianal-maven-plugin</artifactId>
-          <version>1.0-alpha-1</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>maven-bundle-plugin</artifactId>
-          <version>2.0.1</version>
-        </plugin>
+
       </plugins>
     </pluginManagement>
     <defaultGoal>install</defaultGoal>

Modified: camel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=827456&r1=827455&r2=827456&view=diff
==============================================================================
--- camel/trunk/pom.xml (original)
+++ camel/trunk/pom.xml Tue Oct 20 13:54:55 2009
@@ -113,10 +113,11 @@
           <artifactId>build-helper-maven-plugin</artifactId>
           <version>1.4</version>
         </plugin>
-
+  
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
+          <version>2.0.2</version>
           <configuration>
             <source>1.5</source>
             <target>1.5</target>
@@ -124,85 +125,86 @@
             <fork>${compiler.fork}</fork>
           </configuration>
         </plugin>
-
+  
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-eclipse-plugin</artifactId>
           <version>2.5.1</version>
-           <dependencies>
-             <dependency>
-                <groupId>org.apache.camel</groupId>
-                <artifactId>camel-buildtools</artifactId>
-                <version>${project.version}</version>
-             </dependency>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.camel</groupId>
+              <artifactId>camel-buildtools</artifactId>
+              <version>${project.version}</version>
+            </dependency>
           </dependencies>
         </plugin>
-
+  
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-idea-plugin</artifactId>
+          <version>2.2</version>
           <configuration>
             <downloadSources>true</downloadSources>
             <downloadJavadocs>true</downloadJavadocs>
           </configuration>
         </plugin>
-
+  
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-           <configuration>
-              <attach>true</attach>
-              <source>1.5</source>
-              <quiet>true</quiet>
-              <bottom>Apache CAMEL</bottom>
-              <javadocVersion>1.5</javadocVersion>
-              <encoding>UTF-8</encoding>
-            </configuration>
-         </plugin>
-
+          <version>2.5</version>
+          <configuration>
+            <attach>true</attach>
+            <source>1.5</source>
+            <quiet>true</quiet>
+            <bottom>Apache CAMEL</bottom>
+            <javadocVersion>1.5</javadocVersion>
+            <encoding>UTF-8</encoding>
+          </configuration>
+        </plugin>
+  
         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-release-plugin</artifactId>
-            <configuration>
-                <!--<tagBase>https://svn.apache.org/repos/asf/camel/tags</tagBase>-->
-                <!--<useReleaseProfile>false</useReleaseProfile>-->
-                <!--<preparationGoals>clean install</preparationGoals>-->
-                <!--<goals>deploy</goals>-->
-                <arguments>-Papache-release,enable-schemagen,sourcecheck,hibernate-derby</arguments>
-                <autoVersionSubmodules>true</autoVersionSubmodules>
-            </configuration>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-release-plugin</artifactId>
+          <version>2.0-beta-9</version>
+          <configuration>
+            <!--<tagBase>https://svn.apache.org/repos/asf/camel/tags</tagBase>-->
+            <!--<useReleaseProfile>false</useReleaseProfile>-->
+            <!--<preparationGoals>clean install</preparationGoals>-->
+            <!--<goals>deploy</goals>-->
+            <arguments>-Papache-release,enable-schemagen,sourcecheck,hibernate-derby</arguments>
+            <autoVersionSubmodules>true</autoVersionSubmodules>
+          </configuration>
         </plugin>
-
+  
         <plugin>
-           <groupId>org.apache.maven.plugins</groupId>
-           <artifactId>maven-shade-plugin</artifactId>
-           <version>1.2</version>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-shade-plugin</artifactId>
+          <version>1.1</version>
         </plugin>
-
+  
         <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-war-plugin</artifactId>
-            <version>2.1-alpha-2</version>
-            <configuration>
-                <webResources>
-                    <!--
-                    HACK: Include legal files explicity, otherwise they will end up in the
wrong path
-                          or in another jar file in the war.
-
-                    NOTE: targetPath is broken for webResources (as documented)
-                    -->
-                    <resource>
-                        <directory>${project.build.outputDirectory}</directory>
-                        <includes>
-                            <include>META-INF/LICENSE*</include>
-                            <include>META-INF/NOTICE*</include>
-                            <include>META-INF/DEPENDENCIES*</include>
-                        </includes>
-                    </resource>
-                </webResources>
-            </configuration>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-war-plugin</artifactId>
+          <version>2.1-alpha-2</version>
+          <configuration>
+            <webResources>
+              <!--
+                HACK: Include legal files explicitly, otherwise they will end up in the wrong
path or in another jar file in the war. NOTE: targetPath is broken
+                for webResources (as documented)
+              -->
+              <resource>
+                <directory>${project.build.outputDirectory}</directory>
+                <includes>
+                  <include>META-INF/LICENSE*</include>
+                  <include>META-INF/NOTICE*</include>
+                  <include>META-INF/DEPENDENCIES*</include>
+                </includes>
+              </resource>
+            </webResources>
+          </configuration>
         </plugin>
-
+  
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>cobertura-maven-plugin</artifactId>
@@ -231,16 +233,15 @@
             </check>
           </configuration>
         </plugin>
-
+  
         <plugin>
           <groupId>org.apache.cxf</groupId>
           <artifactId>cxf-codegen-plugin</artifactId>
           <version>${cxf-version}</version>
           <dependencies>
-            <!-- needed to add this to get around the following error on IBM's JDK
-                 org.apache.xerces.impl.dv.DVFactoryException: DTD factory class
-                 org.apache.xerces.impl.dv.dtd.DTDDVFactoryImpl does not extend
-                 from DTDDVFactory.
+            <!--
+              needed to add this to get around the following error on IBM's JDK org.apache.xerces.impl.dv.DVFactoryException:
DTD factory class
+              org.apache.xerces.impl.dv.dtd.DTDDVFactoryImpl does not extend from DTDDVFactory.
             -->
             <dependency>
               <groupId>xerces</groupId>
@@ -249,18 +250,103 @@
             </dependency>
           </dependencies>
         </plugin>
-
+  
         <plugin>
           <groupId>com.sun.tools.jxc.maven2</groupId>
           <artifactId>maven-jaxb-schemagen-plugin</artifactId>
           <version>1.3-dev</version>
         </plugin>
-
+  
         <plugin>
           <groupId>org.mortbay.jetty</groupId>
           <artifactId>maven-jetty-plugin</artifactId>
           <version>${jetty-version}</version>
         </plugin>
+  
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-antrun-plugin</artifactId>
+          <version>1.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>2.3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-plugin-plugin</artifactId>
+          <version>2.5</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-clean-plugin</artifactId>
+          <version>2.3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-install-plugin</artifactId>
+          <version>2.2</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-remote-resources-plugin</artifactId>
+          <version>1.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>2.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>2.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>2.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.4.3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>properties-maven-plugin</artifactId>
+          <version>1.0-alpha-2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>axistools-maven-plugin</artifactId>
+          <version>1.3</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>exec-maven-plugin</artifactId>
+          <version>1.1.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>ianal-maven-plugin</artifactId>
+          <version>1.0-alpha-1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <version>2.0.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-checkstyle-plugin</artifactId>
+          <version>2.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>2.0.4</version>
+        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -288,6 +374,7 @@
       </plugin>
 
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <!--forkMode>pertest</forkMode-->
@@ -579,6 +666,7 @@
       <build>
         <plugins>
           <plugin>
+            <groupId>org.apache.maven.plugins</groupId> 
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
               <childDelegation>false</childDelegation>
@@ -600,7 +688,6 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-source-plugin</artifactId>
-            <version>2.0.4</version>
             <executions>
               <execution>
                 <id>attach-sources</id>

Modified: camel/trunk/tests/test-bundles/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/tests/test-bundles/pom.xml?rev=827456&r1=827455&r2=827456&view=diff
==============================================================================
--- camel/trunk/tests/test-bundles/pom.xml (original)
+++ camel/trunk/tests/test-bundles/pom.xml Tue Oct 20 13:54:55 2009
@@ -108,6 +108,7 @@
                 </dependencies>
             </plugin>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-remote-resources-plugin</artifactId>
                 <executions>
                     <execution>



Mime
View raw message