cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1089185 - in /cxf/branches/2.3.x-fixes: ./ parent/pom.xml
Date Tue, 05 Apr 2011 19:58:35 GMT
Author: dkulp
Date: Tue Apr  5 19:58:35 2011
New Revision: 1089185

URL: http://svn.apache.org/viewvc?rev=1089185&view=rev
Log:
Merged revisions 1085072 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1085072 | dkulp | 2011-03-24 14:56:28 -0400 (Thu, 24 Mar 2011) | 1 line
  
  Update to latest versions of a bunch of things
........

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

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr  5 19:58:35 2011
@@ -1 +1 @@
-/cxf/trunk:1087817,1089065
+/cxf/trunk:1085072,1087817,1089065

Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.3.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/parent/pom.xml?rev=1089185&r1=1089184&r2=1089185&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/parent/pom.xml Tue Apr  5 19:58:35 2011
@@ -48,8 +48,8 @@
         <cxf.saaj.impl.version>1.3.2</cxf.saaj.impl.version>
 
         <!-- please maintain alphabetical order here -->
-        <cxf.abdera.version>1.1</cxf.abdera.version>
-        <cxf.activemq.version>5.4.1</cxf.activemq.version>
+        <cxf.abdera.version>1.1.2</cxf.abdera.version>
+        <cxf.activemq.version>5.4.2</cxf.activemq.version>
         <cxf.derby.version>10.2.2.0</cxf.derby.version>
 
         <cxf.jaxb21.version>2.1</cxf.jaxb21.version>
@@ -68,7 +68,7 @@
 
         <cxf.jdom.version>1.0</cxf.jdom.version>
         <cxf.jetty.version>7.3.1.v20110307</cxf.jetty.version>
-        <cxf.msv.version>2010.1</cxf.msv.version>
+        <cxf.msv.version>2010.2</cxf.msv.version>
         <cxf.rhino.version>1.7R2</cxf.rhino.version>
         <cxf.saaj.version>1.3</cxf.saaj.version>
         <cxf.servlet-api.group>org.apache.geronimo.specs</cxf.servlet-api.group>
@@ -78,10 +78,12 @@
         <cxf.spring.mock>spring-test</cxf.spring.mock>
         <cxf.stax.impl.groupId>org.codehaus.woodstox</cxf.stax.impl.groupId>
         <cxf.stax.impl.artifactId>woodstox-core-asl</cxf.stax.impl.artifactId>
-        <cxf.stax.impl.version>4.0.8</cxf.stax.impl.version>
+        <cxf.woodstox.core.version>4.1.1</cxf.woodstox.core.version>
+        <cxf.stax.impl.version>${cxf.woodstox.core.version}</cxf.stax.impl.version>
         <cxf.wsdl4j.version>1.6.2</cxf.wsdl4j.version>
         <cxf.xmlbeans.version>2.4.0</cxf.xmlbeans.version>
         <cxf.xmlschema.version>1.4.7</cxf.xmlschema.version>
+        <cxf.axiom.version>1.2.10</cxf.axiom.version>
         <cxf.checkstyle.extension />
 
         <cxf.spring.validation.mode>VALIDATION_AUTO</cxf.spring.validation.mode>
@@ -279,18 +281,19 @@
                         <argLine>${cxf.surefire.fork.vmargs}</argLine>
                         <parallel>${cxf.surefire.parallel.mode}</parallel>
                         <systemPropertyVariables>
-                                <useRandomPorts>true</useRandomPorts>
-                                <cxf.validateServiceSchemas>${cxf.validateServices}</cxf.validateServiceSchemas>
-                                <java.awt.headless>${java.awt.headless}</java.awt.headless>
-                                <java.util.logging.config.file>${basedir}/target/test-classes/logging.properties</java.util.logging.config.file>
-                                <org.apache.activemq.default.directory.prefix>${basedir}/target/ActiveMQ/</org.apache.activemq.default.directory.prefix>
-                                <derby.system.home>${basedir}/target/derby</derby.system.home>
-                                <spring.validation.mode>${cxf.spring.validation.mode}</spring.validation.mode>
-                                <server.launcher.vmargs>${cxf.server.launcher.vmargs}</server.launcher.vmargs>
-                                <!-- If we close the port after a client in the same JVM
has opened a keep-alive
-                                connection, on some Linux's, the socket remains consumed
until
-                                some timeout occurs.   That may cause some tests to timeout/hang.
-->
-                                <org.apache.cxf.transports.http_jetty.DontClosePort>false</org.apache.cxf.transports.http_jetty.DontClosePort>
+                            <org.apache.ws.commons.schema.protectReadOnlyCollections>${cxf.protect-xmlschema-collections}</org.apache.ws.commons.schema.protectReadOnlyCollections>
+                            <useRandomPorts>true</useRandomPorts>
+                            <cxf.validateServiceSchemas>${cxf.validateServices}</cxf.validateServiceSchemas>
+                            <java.awt.headless>${java.awt.headless}</java.awt.headless>
+                            <java.util.logging.config.file>${basedir}/target/test-classes/logging.properties</java.util.logging.config.file>
+                            <org.apache.activemq.default.directory.prefix>${basedir}/target/ActiveMQ/</org.apache.activemq.default.directory.prefix>
+                            <derby.system.home>${basedir}/target/derby</derby.system.home>
+                            <spring.validation.mode>${cxf.spring.validation.mode}</spring.validation.mode>
+                            <server.launcher.vmargs>${cxf.server.launcher.vmargs}</server.launcher.vmargs>
+                            <!-- If we close the port after a client in the same JVM has
opened a keep-alive
+                            connection, on some Linux's, the socket remains consumed until
+                            some timeout occurs.   That may cause some tests to timeout/hang.
-->
+                            <org.apache.cxf.transports.http_jetty.DontClosePort>false</org.apache.cxf.transports.http_jetty.DontClosePort>
                         </systemPropertyVariables>
                     </configuration>
                 </plugin>
@@ -367,14 +370,20 @@
             <dependency>
                 <groupId>com.sun.xml.fastinfoset</groupId>
                 <artifactId>FastInfoset</artifactId>
-                <version>1.2.8</version>
+                <version>1.2.9</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.xml</groupId>
+                        <artifactId>jsr173</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
 
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.8.1</version>
+                <version>4.8.2</version>
                 <scope>test</scope>
             </dependency>
 
@@ -451,7 +460,7 @@
             <dependency>
                 <groupId>org.apache.ant</groupId>
                 <artifactId>ant</artifactId>
-                <version>1.8.1</version>
+                <version>1.8.2</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.ant</groupId>
@@ -471,7 +480,7 @@
             <dependency>
                 <groupId>org.apache.servicemix.specs</groupId>
                 <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
-                <version>1.5.0</version>
+                <version>1.7.0</version>
                 <scope>provided</scope>
             </dependency>
 
@@ -510,6 +519,7 @@
                     </exclusion>
  
 
+
                 </exclusions>
             </dependency>
             <dependency>
@@ -571,12 +581,12 @@
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-webapp</artifactId>
                 <version>${cxf.jetty.version}</version>
-	    </dependency>
+            </dependency>
             <dependency>
                 <groupId>org.eclipse.jetty</groupId>
                 <artifactId>jetty-servlet</artifactId>
                 <version>${cxf.jetty.version}</version>
-	    </dependency>
+            </dependency>
             <dependency>
                 <groupId>xalan</groupId>
                 <artifactId>xalan</artifactId>
@@ -836,12 +846,12 @@
             <dependency>
                 <groupId>org.springframework.security</groupId>
                 <artifactId>spring-security-core</artifactId>
-                <version>2.0.4</version>
+                <version>2.0.6.RELEASE</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework.security</groupId>
                 <artifactId>spring-security-core-tiger</artifactId>
-                <version>2.0.4</version>
+                <version>2.0.6.RELEASE</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.springframework</groupId>
@@ -868,7 +878,7 @@
             <dependency>
                 <groupId>org.springframework.security</groupId>
                 <artifactId>spring-security-acl</artifactId>
-                <version>2.0.4</version>
+                <version>2.0.6.RELEASE</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.springframework</groupId>
@@ -893,24 +903,24 @@
                 </exclusions>
             </dependency>
             <dependency>
-                 <groupId>org.springframework</groupId>
-                 <artifactId>spring-dao</artifactId>
-                 <version>2.0.8</version>
-                 <exclusions>
-                  <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-jdbc</artifactId>
-                  </exclusion>
-                  <exclusion>
-                    <groupId>org.springframework</groupId>
-                    <artifactId>spring-remoting</artifactId>
-                  </exclusion> 
-                  <exclusion>
-                   <groupId>org.springframework</groupId>
-                   <artifactId>spring-support</artifactId>
-                  </exclusion>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-dao</artifactId>
+                <version>2.0.8</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-jdbc</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-remoting</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>org.springframework</groupId>
+                        <artifactId>spring-support</artifactId>
+                    </exclusion>
                 </exclusions>
-             </dependency> 
+            </dependency>
 
             <dependency>
                 <groupId>org.springframework</groupId>
@@ -924,9 +934,9 @@
                 <version>3.1</version>
             </dependency>
             <dependency>
-              <groupId>commons-codec</groupId>
-              <artifactId>commons-codec</artifactId>
-              <version>1.4</version>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>1.4</version>
             </dependency>
             <dependency>
                 <groupId>commons-pool</groupId>
@@ -1074,6 +1084,26 @@
                 </exclusions>
             </dependency>
             <dependency>
+                <groupId>org.jibx</groupId>
+                <artifactId>jibx-bind</artifactId>
+                <version>${cxf.jibx.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jibx</groupId>
+                <artifactId>jibx-run</artifactId>
+                <version>${cxf.jibx.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jibx</groupId>
+                <artifactId>jibx-schema</artifactId>
+                <version>${cxf.jibx.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jibx</groupId>
+                <artifactId>jibx-tools</artifactId>
+                <version>${cxf.jibx.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>xml-resolver</groupId>
                 <artifactId>xml-resolver</artifactId>
                 <version>1.2</version>
@@ -1081,7 +1111,7 @@
             <dependency>
                 <groupId>commons-lang</groupId>
                 <artifactId>commons-lang</artifactId>
-                <version>2.5</version>
+                <version>2.6</version>
             </dependency>
             <dependency>
                 <groupId>org.bouncycastle</groupId>
@@ -1189,7 +1219,7 @@
             <dependency>
                 <groupId>org.apache.ws.commons.axiom</groupId>
                 <artifactId>axiom-api</artifactId>
-                <version>1.2.9</version>
+                <version>${cxf.axiom.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.mail</groupId>
@@ -1232,7 +1262,7 @@
             <dependency>
                 <groupId>org.apache.ws.commons.axiom</groupId>
                 <artifactId>axiom-impl</artifactId>
-                <version>1.2.9</version>
+                <version>${cxf.axiom.version}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.mail</groupId>
@@ -1299,7 +1329,7 @@
             <dependency>
                 <groupId>org.codehaus.woodstox</groupId>
                 <artifactId>woodstox-core-asl</artifactId>
-                <version>4.0.8</version>
+                <version>${cxf.woodstox.core.version}</version>
             </dependency>
             <dependency>
                 <groupId>net.java.dev.msv</groupId>
@@ -1546,7 +1576,7 @@
             <properties>
                 <cxf.spring.version>2.5.6.SEC02</cxf.spring.version>
             </properties>
-        </profile> 
+        </profile>
         <profile>
             <!-- Profile to clean even if you do not have the cxf plugins in
              your local mavven repo -->
@@ -1561,47 +1591,47 @@
                 <defaultGoal>clean</defaultGoal>
             </build>
         </profile>
-	<profile>
-	  <id>m2eclipse</id>
-	  <build>
-	    <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-pmd-plugin</artifactId>
-                    <version>2.5</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.apache.cxf.build-utils</groupId>
-                            <artifactId>cxf-buildtools</artifactId>
-                            <version>${cxf.build-utils.version}</version>
-                        </dependency>
-                    </dependencies>
-                    <configuration>
-                        <rulesets>
-                            <ruleset>${cxf.resources.base.path}cxf-pmd-ruleset.xml</ruleset>
-                        </rulesets>
-                        <sourceEncoding>UTF-8</sourceEncoding>
-                        <targetJdk>1.5</targetJdk>
-                        <linkXRef>false</linkXRef>
-                        <includeTests>true</includeTests>
-                        <verbose>true</verbose>
-                        <excludeRoots>
-                            <excludeRoot>${basedir}/src/main/generated</excludeRoot>
-                        </excludeRoots>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <id>validate</id>
-                            <phase>validate</phase>
-                            <goals>
-                                <goal>check</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-	    </plugins>
-	  </build>
-	</profile>
+        <profile>
+            <id>m2eclipse</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-pmd-plugin</artifactId>
+                        <version>2.5</version>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.cxf.build-utils</groupId>
+                                <artifactId>cxf-buildtools</artifactId>
+                                <version>${cxf.build-utils.version}</version>
+                            </dependency>
+                        </dependencies>
+                        <configuration>
+                            <rulesets>
+                                <ruleset>${cxf.resources.base.path}cxf-pmd-ruleset.xml</ruleset>
+                            </rulesets>
+                            <sourceEncoding>UTF-8</sourceEncoding>
+                            <targetJdk>1.5</targetJdk>
+                            <linkXRef>false</linkXRef>
+                            <includeTests>true</includeTests>
+                            <verbose>true</verbose>
+                            <excludeRoots>
+                                <excludeRoot>${basedir}/src/main/generated</excludeRoot>
+                            </excludeRoots>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <id>validate</id>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 </project>
 



Mime
View raw message