cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r692470 - in /cxf/branches/2.0.x-fixes: ./ buildtools/pom.xml parent/pom.xml
Date Fri, 05 Sep 2008 15:53:24 GMT
Author: dkulp
Date: Fri Sep  5 08:53:24 2008
New Revision: 692470

URL: http://svn.apache.org/viewvc?rev=692470&view=rev
Log:
Merged revisions 692468 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.1.x-fixes

................
  r692468 | dkulp | 2008-09-05 11:49:28 -0400 (Fri, 05 Sep 2008) | 9 lines
  
  Merged revisions 692466 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r692466 | dkulp | 2008-09-05 11:46:16 -0400 (Fri, 05 Sep 2008) | 2 lines
    
    Update version of plexus-velocity stuff that the checkstyle plugin will use to remove
an [ERROR] message off the build
  ........
................

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/buildtools/pom.xml
    cxf/branches/2.0.x-fixes/parent/pom.xml

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep  5 08:53:24 2008
@@ -1,3 +1,3 @@
-/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715
-/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706
+/cxf/branches/2.1.x-fixes:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559,678629,678808,678852,678891,678893,679248,679597,680435,681060,681165,681813,681816,682902,682951,683089,683290,683318,684099,684790-684793,684842,684862,684895-684918,685205,685253,686237,686283,686299,686333-686364,686765,686827,687097,687464-687465,689109,689112,689122,691316,691357,691491,691711,691715,692468
+/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,692466
 /incubator/cxf/trunk:434594-651668

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Sep  5 08:53:24 2008
@@ -1 +1 @@
-/cxf/branches/2.1.x-fixes:1-686313,686315-686332,686334-686346,686348-686828,687097,687464-687465,689109,689112,689122,690841,691316,691357,691491,691711,691715,692344
+/cxf/branches/2.1.x-fixes:1-686313,686315-686332,686334-686346,686348-686828,687097,687464-687465,689109,689112,689122,690841,691316,691357,691491,691711,691715,692344,692468

Modified: cxf/branches/2.0.x-fixes/buildtools/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/buildtools/pom.xml?rev=692470&r1=692469&r2=692470&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/buildtools/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/buildtools/pom.xml Fri Sep  5 08:53:24 2008
@@ -37,13 +37,6 @@
     </properties>
 
     <dependencies>
-
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm-all</artifactId>
-            <version>20070324</version>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>jdom</groupId>
             <artifactId>jdom</artifactId>
@@ -53,71 +46,32 @@
         <dependency>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-utils</artifactId>
-            <version>1.4.1</version>
+            <version>1.4.4</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
-            <version>2.0.5</version>
+            <version>2.0.7</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-model</artifactId>
-            <version>2.0.5</version>
+            <version>2.0.7</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-project</artifactId>
-            <version>2.0.5</version>
+            <version>2.0.7</version>
             <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-shade-plugin</artifactId>
-            <version>1.0-alpha-15</version>
+            <version>1.1</version>
             <optional>true</optional>
         </dependency>
     </dependencies>
-
-    <!--build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-remote-resources-plugin</artifactId>
-                <version>1.0-alpha-5</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-remote-resources-plugin</artifactId>
-                    <version>1.0-alpha-5</version>
-                    <configuration>
-                        <resourceBundles>
-                            <resourceBundle>org.apache:apache-jar-resource-bundle:1.1</resourceBundle>
-                        </resourceBundles>
-                        <properties>
-                            <addLicense>true</addLicense>
-                            <projectName>Apache CXF</projectName>
-                        </properties>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build-->
-
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/cxf/branches/2.0.x-fixes/buildtools</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/cxf/branches/2.0.x-fixes/buildtools</developerConnection>
-    </scm>
-
 </project>

Modified: cxf/branches/2.0.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/parent/pom.xml?rev=692470&r1=692469&r2=692470&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/parent/pom.xml Fri Sep  5 08:53:24 2008
@@ -149,6 +149,22 @@
                             <artifactId>cxf-buildtools</artifactId>
                             <version>${project.version}</version>
                         </dependency>
+                        <dependency>
+                            <groupId>org.codehaus.plexus</groupId>
+                            <artifactId>plexus-velocity</artifactId>
+                            <version>1.1.3</version>
+                            <exclusions>
+                                <exclusion>
+                                    <!-- Use the version specified by checkstyle:checkstyle
instead -->
+                                    <artifactId>commons-collections</artifactId>
+                                    <groupId>commons-collections</groupId>
+                                </exclusion>
+                                <exclusion>
+                                    <artifactId>plexus-utils</artifactId>
+                                    <groupId>plexus</groupId>
+                                </exclusion>
+                            </exclusions>
+                        </dependency>
                     </dependencies>
                     <executions>
                         <execution>



Mime
View raw message