servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r1573568 - in /servicemix/smx5/trunk: ./ examples/akka/akka-camel/ examples/cxf/cxf-jaxws-blueprint/ examples/cxf/cxf-osgi/ examples/cxf/cxf-ws-addressing/ examples/cxf/cxf-ws-security-blueprint/ examples/cxf/cxf-ws-security-osgi/ examples/...
Date Mon, 03 Mar 2014 14:19:24 GMT
Author: gertv
Date: Mon Mar  3 14:19:23 2014
New Revision: 1573568

URL: http://svn.apache.org/r1573568
Log:
SM-2260: Refactor POMs - optimize dependencyManagement and pluginManagement
Thanks to Krzysztof for the patches!

Modified:
    servicemix/smx5/trunk/examples/akka/akka-camel/pom.xml
    servicemix/smx5/trunk/examples/cxf/cxf-jaxws-blueprint/pom.xml
    servicemix/smx5/trunk/examples/cxf/cxf-osgi/pom.xml
    servicemix/smx5/trunk/examples/cxf/cxf-ws-addressing/pom.xml
    servicemix/smx5/trunk/examples/cxf/cxf-ws-security-blueprint/pom.xml
    servicemix/smx5/trunk/examples/cxf/cxf-ws-security-osgi/pom.xml
    servicemix/smx5/trunk/examples/cxf/cxf-wsn/cxf-wsn-client/pom.xml
    servicemix/smx5/trunk/itests/pom.xml
    servicemix/smx5/trunk/parent/pom.xml
    servicemix/smx5/trunk/pom.xml

Modified: servicemix/smx5/trunk/examples/akka/akka-camel/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/examples/akka/akka-camel/pom.xml?rev=1573568&r1=1573567&r2=1573568&view=diff
==============================================================================
--- servicemix/smx5/trunk/examples/akka/akka-camel/pom.xml (original)
+++ servicemix/smx5/trunk/examples/akka/akka-camel/pom.xml Mon Mar  3 14:19:23 2014
@@ -13,10 +13,6 @@
   <name>Apache ServiceMix :: Examples :: Akka :: Akka Camel</name>
   <packaging>bundle</packaging>
 
-  <properties>
-    <maven-scala-plugin.version>2.15.2</maven-scala-plugin.version>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.scala-lang</groupId>
@@ -69,7 +65,6 @@
       <plugin>
         <groupId>org.scala-tools</groupId>
         <artifactId>maven-scala-plugin</artifactId>
-        <version>${maven-scala-plugin.version}</version>
         <executions>
           <execution>
             <goals>

Modified: servicemix/smx5/trunk/examples/cxf/cxf-jaxws-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/examples/cxf/cxf-jaxws-blueprint/pom.xml?rev=1573568&r1=1573567&r2=1573568&view=diff
==============================================================================
--- servicemix/smx5/trunk/examples/cxf/cxf-jaxws-blueprint/pom.xml (original)
+++ servicemix/smx5/trunk/examples/cxf/cxf-jaxws-blueprint/pom.xml Mon Mar  3 14:19:23 2014
@@ -40,12 +40,10 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-api</artifactId>
-            <version>${cxf.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>${cxf.version}</version>
         </dependency>
     </dependencies>
 

Modified: servicemix/smx5/trunk/examples/cxf/cxf-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/examples/cxf/cxf-osgi/pom.xml?rev=1573568&r1=1573567&r2=1573568&view=diff
==============================================================================
--- servicemix/smx5/trunk/examples/cxf/cxf-osgi/pom.xml (original)
+++ servicemix/smx5/trunk/examples/cxf/cxf-osgi/pom.xml Mon Mar  3 14:19:23 2014
@@ -40,7 +40,6 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>${cxf.version}</version>
         </dependency>
          <dependency>
             <groupId>commons-io</groupId>
@@ -49,7 +48,6 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-security</artifactId>
-            <version>${cxf.version}</version>
         </dependency>
     </dependencies>
 

Modified: servicemix/smx5/trunk/examples/cxf/cxf-ws-addressing/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/examples/cxf/cxf-ws-addressing/pom.xml?rev=1573568&r1=1573567&r2=1573568&view=diff
==============================================================================
--- servicemix/smx5/trunk/examples/cxf/cxf-ws-addressing/pom.xml (original)
+++ servicemix/smx5/trunk/examples/cxf/cxf-ws-addressing/pom.xml Mon Mar  3 14:19:23 2014
@@ -41,7 +41,6 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>${cxf.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>

Modified: servicemix/smx5/trunk/examples/cxf/cxf-ws-security-blueprint/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/examples/cxf/cxf-ws-security-blueprint/pom.xml?rev=1573568&r1=1573567&r2=1573568&view=diff
==============================================================================
--- servicemix/smx5/trunk/examples/cxf/cxf-ws-security-blueprint/pom.xml (original)
+++ servicemix/smx5/trunk/examples/cxf/cxf-ws-security-blueprint/pom.xml Mon Mar  3 14:19:23
2014
@@ -43,17 +43,14 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>${cxf.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-security</artifactId>
-            <version>${cxf.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>${cxf.version}</version>
         </dependency>
     </dependencies>
 

Modified: servicemix/smx5/trunk/examples/cxf/cxf-ws-security-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/examples/cxf/cxf-ws-security-osgi/pom.xml?rev=1573568&r1=1573567&r2=1573568&view=diff
==============================================================================
--- servicemix/smx5/trunk/examples/cxf/cxf-ws-security-osgi/pom.xml (original)
+++ servicemix/smx5/trunk/examples/cxf/cxf-ws-security-osgi/pom.xml Mon Mar  3 14:19:23 2014
@@ -43,17 +43,14 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>${cxf.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-security</artifactId>
-            <version>${cxf.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>${cxf.version}</version>
         </dependency>
     </dependencies>
 

Modified: servicemix/smx5/trunk/examples/cxf/cxf-wsn/cxf-wsn-client/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/examples/cxf/cxf-wsn/cxf-wsn-client/pom.xml?rev=1573568&r1=1573567&r2=1573568&view=diff
==============================================================================
--- servicemix/smx5/trunk/examples/cxf/cxf-wsn/cxf-wsn-client/pom.xml (original)
+++ servicemix/smx5/trunk/examples/cxf/cxf-wsn/cxf-wsn-client/pom.xml Mon Mar  3 14:19:23
2014
@@ -38,32 +38,26 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>${cxf-version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
-            <version>${cxf-version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
-            <version>${cxf-version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-addr</artifactId>
-            <version>${cxf-version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-ws-policy</artifactId>
-            <version>${cxf-version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf.services.wsn</groupId>
             <artifactId>cxf-services-wsn-core</artifactId>
-            <version>${cxf-version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.examples</groupId>

Modified: servicemix/smx5/trunk/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/itests/pom.xml?rev=1573568&r1=1573567&r2=1573568&view=diff
==============================================================================
--- servicemix/smx5/trunk/itests/pom.xml (original)
+++ servicemix/smx5/trunk/itests/pom.xml Mon Mar  3 14:19:23 2014
@@ -53,7 +53,6 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.11</version>
         <scope>test</scope>
       </dependency>
       <dependency>
@@ -126,7 +125,6 @@
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>depends-maven-plugin</artifactId>
-        <version>1.2</version>
         <executions>
           <execution>
             <id>generate-depends-file</id>
@@ -140,7 +138,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.14</version>
         <configuration>
           <redirectTestOutputToFile>true</redirectTestOutputToFile>
           <argLine>-Dorg.ops4j.pax.url.mvn.localRepository=${settings.localRepository}
-Dfile.encoding=UTF-8</argLine>
@@ -150,7 +147,6 @@
       <plugin>
         <groupId>org.scala-tools</groupId>
         <artifactId>maven-scala-plugin</artifactId>
-        <version>2.15.2</version>
         <executions>
           <execution>
             <id>compile</id>

Modified: servicemix/smx5/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/parent/pom.xml?rev=1573568&r1=1573567&r2=1573568&view=diff
==============================================================================
--- servicemix/smx5/trunk/parent/pom.xml (original)
+++ servicemix/smx5/trunk/parent/pom.xml Mon Mar  3 14:19:23 2014
@@ -425,6 +425,11 @@
         <version>${cxf.version}</version>
       </dependency>
       <dependency>
+        <groupId>org.apache.cxf.services.wsn</groupId>
+        <artifactId>cxf-services-wsn-core</artifactId>
+        <version>${cxf-version}</version>
+      </dependency>
+      <dependency>
         <groupId>org.apache.servicemix.specs</groupId>
         <artifactId>org.apache.servicemix.specs.jsr311-api-1.1.1</artifactId>
         <version>${servicemix.specs.version}</version>

Modified: servicemix/smx5/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx5/trunk/pom.xml?rev=1573568&r1=1573567&r2=1573568&view=diff
==============================================================================
--- servicemix/smx5/trunk/pom.xml (original)
+++ servicemix/smx5/trunk/pom.xml Mon Mar  3 14:19:23 2014
@@ -164,14 +164,36 @@
 
         <!-- ServiceMix legal shared resources -->
         <servicemix.legal.version>1.0</servicemix.legal.version>
+        
+        <!-- Maven Compiler Plugin -->
+        <maven.compiler.source>1.5</maven.compiler.source>
+        <maven.compiler.target>1.5</maven.compiler.target>
+        <maven.compiler.debug>true</maven.compiler.debug>
+        <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
+        <maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
 
         <!-- Maven Plugins -->
         <depends-maven-plugin.version>1.2</depends-maven-plugin.version>
-        <maven-antrun-plugin.version>1.6</maven-antrun-plugin.version>
+        <maven-antrun-plugin.version>1.7</maven-antrun-plugin.version>
         <maven-assembly-plugin.version>2.4</maven-assembly-plugin.version>
-        <maven-bundle-plugin.version>2.3.7</maven-bundle-plugin.version>
+        <maven-bundle-plugin.version>2.4.0</maven-bundle-plugin.version>
         <maven-eclipse-plugin.version>2.9</maven-eclipse-plugin.version>
         <lifecycle-mapping-plugin.version>1.0.0</lifecycle-mapping-plugin.version>
+        <maven-release-plugin.version>2.4.2</maven-release-plugin.version>
+        <maven-idea-plugin.version>2.2.1</maven-idea-plugin.version>
+        <maven-surefire-plugin.version>2.16</maven-surefire-plugin.version>
+        <cobertura-maven-plugin.version>2.2</cobertura-maven-plugin.version>
+        <exec-maven-plugin.version>1.1.1</exec-maven-plugin.version>
+        <build-helper-maven-plugin.version>1.8</build-helper-maven-plugin.version>
+        <maven-dependency-plugin.version>2.8</maven-dependency-plugin.version>
+        <maven-remote-resources-plugin.version>1.5</maven-remote-resources-plugin.version>
+        <maven-javadoc-plugin.version>2.9.1</maven-javadoc-plugin.version>
+        <maven-jxr-plugin.version>2.4</maven-jxr-plugin.version>
+        <apache-rat-plugin.version>0.10</apache-rat-plugin.version>
+        <maven-deploy-plugin.version>2.8.1</maven-deploy-plugin.version>
+        <maven-gpg-plugin.version>1.4</maven-gpg-plugin.version>
+        <maven-source-plugin.version>2.2.1</maven-source-plugin.version>
+        <maven-scala-plugin.version>2.15.2</maven-scala-plugin.version>
 
         <!-- Other Dependencies -->
         <commons-lang.version>2.6</commons-lang.version>
@@ -300,7 +322,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.2.1</version>
+                    <version>${maven-release-plugin.version}</version>
                     <configuration>
                         <preparationGoals>clean install</preparationGoals>
                         <goals>deploy</goals>
@@ -309,6 +331,11 @@
                     </configuration>
                 </plugin>
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>${maven-deploy-plugin.version}</version>
+                </plugin>
+                <plugin>
                     <groupId>org.apache.servicemix.tooling</groupId>
                     <artifactId>depends-maven-plugin</artifactId>
                     <version>${depends-maven-plugin.version}</version>
@@ -322,9 +349,12 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
+                    <version>${maven-compiler-plugin.version}</version>
                     <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
+                        <source>${maven.compiler.source}</source>
+                        <target>${maven.compiler.target}</target>
+                        <debug>${maven.compiler.debug}</debug>
+                        <encoding>${maven.compiler.encoding}</encoding>
                         <maxmem>256M</maxmem>
                         <fork>${compiler.fork}</fork>
                     </configuration>
@@ -332,7 +362,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-idea-plugin</artifactId>
-                    <version>2.1</version>
+                    <version>${maven-idea-plugin.version}</version>
                     <configuration>
                         <downloadSources>true</downloadSources>
                         <downloadJavadocs>true</downloadJavadocs>
@@ -351,7 +381,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.3.1</version>
+                    <version>${maven-surefire-plugin.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -366,17 +396,57 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>cobertura-maven-plugin</artifactId>
-                    <version>2.2</version>
+                    <version>${cobertura-maven-plugin.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>exec-maven-plugin</artifactId>
-                    <version>1.1.1</version>
+                    <version>${exec-maven-plugin.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>1.5</version>
+                    <version>${build-helper-maven-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>${maven-dependency-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-remote-resources-plugin</artifactId>
+                    <version>${maven-remote-resources-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>${maven-javadoc-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jxr-plugin</artifactId>
+                    <version>${maven-jxr-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.rat</groupId>
+                    <artifactId>apache-rat-plugin</artifactId>
+                    <version>${apache-rat-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <version>${maven-gpg-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>${maven-source-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.scala-tools</groupId>
+                    <artifactId>maven-scala-plugin</artifactId>
+                    <version>${maven-scala-plugin.version}</version>
                 </plugin>
                 <plugin>
                     <groupId>org.eclipse.m2e</groupId>
@@ -487,7 +557,6 @@
             </plugin>
             <plugin>
                 <artifactId>maven-remote-resources-plugin</artifactId>
-                <version>1.1</version>
                 <executions>
                     <execution>
                         <goals>
@@ -517,12 +586,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.3</version>
+                <version>${maven-javadoc-plugin.version}</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jxr-plugin</artifactId>
-                <version>2.0</version>
+                <version>${maven-jxr-plugin.version}</version>
             </plugin>
         </plugins>
     </reporting>
@@ -541,7 +610,6 @@
                     <plugin>
                         <groupId>org.apache.rat</groupId>
                         <artifactId>apache-rat-plugin</artifactId>
-                        <version>0.6</version>
                         <executions>
                             <execution>
                                 <phase>verify</phase>
@@ -580,7 +648,6 @@
                     <plugin>
                         <inherited>true</inherited>
                         <artifactId>maven-deploy-plugin</artifactId>
-                        <version>2.3</version>
                         <configuration>
                             <updateReleaseInfo>true</updateReleaseInfo>
                         </configuration>
@@ -588,7 +655,6 @@
                     <!-- We want to sign the artifact, the POM, and all attached artifacts
-->
                     <plugin>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.0-alpha-4</version>
                         <executions>
                             <execution>
                                 <goals>
@@ -641,7 +707,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-source-plugin</artifactId>
-                        <version>2.0.4</version>
                         <executions>
                             <execution>
                                 <id>attach-sources</id>



Mime
View raw message