Author: dkulp Date: Fri Jul 24 14:26:35 2009 New Revision: 797481 URL: http://svn.apache.org/viewvc?rev=797481&view=rev Log: Merged revisions 797453 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.2.x-fixes
................ r797453 | dkulp | 2009-07-24 09:49:35 -0400 (Fri, 24 Jul 2009) | 12 lines Merged revisions 797231 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r797231 | dkulp | 2009-07-23 17:33:34 -0400 (Thu, 23 Jul 2009) | 4 lines Update to latest version of JAXB, jetty, others Build with latest version of ServiceMix jbi api jar Test with 5.1.0 of ActiveMQ. 5.2.0 causes a hang in the transaction system test. Not sure why yet. ........ ................ Modified: cxf/branches/2.1.x-fixes/ (props changed) cxf/branches/2.1.x-fixes/integration/jbi/pom.xml cxf/branches/2.1.x-fixes/parent/pom.xml cxf/branches/2.1.x-fixes/rt/bindings/jbi/pom.xml cxf/branches/2.1.x-fixes/rt/transports/jbi/pom.xml cxf/branches/2.1.x-fixes/systests/pom.xml Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jul 24 14:26:35 2009 @@ -1,2 +1,2 @@ -/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873 67,788824-788825,788827-788828,788830,789423,789429,789707,789709-789710,789712,789721,789905,789908,789910,789912,790295,790646-790647,790651,790654-790655,790659,791948,791950,791952,791955,792276,792288,792291,792992,792995,792998,794402,794404,794735,794797,794799,794803,795161-795162,796300-796301,796598,797449,797452 -/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774,788820,789371,789420,789527-789529,789704-789705,789896,789898-789900,790294,790637-790644,791354,791538,791753,791947,792261-792263,792684,792975,792985,794297,794396,794728,794778-794780,794892,795160,796022-796023,796593,796780,797194 +/cxf/branches/2.2.x-fixes:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,758910,759890,759961,759963-759964,759966,760029,760073,760150,760171,760178,760198,760212,760456,760468,760582,760938,761094,761113,761120,761317,761759,761789,762393,762518,762567,763200,763272,763495,763854,763931,763942,763953,764033-764034,764581,764599-764606,764887,765357,766013,766058,766100-766101,766763,766770,766860,766962-766963,767159,767191,767927,771416,772143,772402,772658,772714,773009-773010,773027,773049,773146,773581,773691,773693,774446-774496,774558,774760,774851,774979,775423,776024-776025,776218,776429,776459,777189,777224,777243,777481,777505,777572,777580,780033,780184,780213,780421,780664,780800,780902,780911,781497,781841,782733,782735-782736,783099,783407,784064,784197,785293,785296,785298-785299,785301,785656,786158,786587,786589,786591-786592,786640,787272,787276,787282-787283,787285,787295,787307,787324,7873 67,788824-788825,788827-788828,788830,789423,789429,789707,789709-789710,789712,789721,789905,789908,789910,789912,790295,790646-790647,790651,790654-790655,790659,791948,791950,791952,791955,792276,792288,792291,792992,792995,792998,794402,794404,794735,794797,794799,794803,795161-795162,796300-796301,796598,797449,797452-797453 +/cxf/trunk:782181,782728-782730,783097,783396,784059,784181,784895,785279-785282,785468,786142,786271,786395,786582-786583,786638,786647,787269,787277-787279,787290,787305,787323,787366,788060,788187,788703,788774,788820,789371,789420,789527-789529,789704-789705,789896,789898-789900,790294,790637-790644,791354,791538,791753,791947,792261-792263,792684,792975,792985,794297,794396,794728,794778-794780,794892,795160,796022-796023,796593,796780,797194,797231 Propchange: cxf/branches/2.1.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.1.x-fixes/integration/jbi/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/integration/jbi/pom.xml?rev=797481&r1=797480&r2=797481&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/integration/jbi/pom.xml (original) +++ cxf/branches/2.1.x-fixes/integration/jbi/pom.xml Fri Jul 24 14:26:35 2009 @@ -74,15 +74,17 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.apache.servicemix</groupId> - <artifactId>servicemix-jbi</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-frontend-jaxws</artifactId> <version>${project.version}</version> </dependency> + + <dependency> + <groupId>org.apache.servicemix.specs</groupId> + <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> <scm> Modified: cxf/branches/2.1.x-fixes/parent/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/parent/pom.xml?rev=797481&r1=797480&r2=797481&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/parent/pom.xml (original) +++ cxf/branches/2.1.x-fixes/parent/pom.xml Fri Jul 24 14:26:35 2009 @@ -47,12 +47,12 @@ <!-- please maintain alphabetical order here --> <abdera.version>0.4.0-incubating</abdera.version> - <activemq.version>4.1.1</activemq.version> + <activemq.version>5.1.0</activemq.version> <derby.version>10.2.2.0</derby.version> <jaxb.version>2.1</jaxb.version> <jaxb.impl.version>2.1.9</jaxb.impl.version> <jaxb.xjc.version>2.1.9</jaxb.xjc.version> - <jetty.version>6.1.18</jetty.version> + <jetty.version>6.1.19</jetty.version> <saaj.version>1.3</saaj.version> <spring.version>2.0.8</spring.version> <spring.mock>spring-mock</spring.mock> @@ -73,7 +73,6 @@ <spring.validation.mode>VALIDATION_AUTO</spring.validation.mode> <downloadSources>true</downloadSources> - <servicemix.version>3.2.1</servicemix.version> </properties> @@ -473,24 +472,10 @@ <version>1.4.2</version> </dependency> <dependency> - <groupId>org.apache.servicemix</groupId> - <artifactId>servicemix-jbi</artifactId> - <version>${servicemix.version}</version> + <groupId>org.apache.servicemix.specs</groupId> + <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId> + <version>1.3.0</version> <scope>provided</scope> - <exclusions> - <exclusion> - <groupId>servicemix</groupId> - <artifactId>jaxp</artifactId> - </exclusion> - <exclusion> - <groupId>mx4j</groupId> - <artifactId>mx4j</artifactId> - </exclusion> - <exclusion> - <groupId>org.codehaus.woodstox</groupId> - <artifactId>wstx-asl</artifactId> - </exclusion> - </exclusions> </dependency> <dependency> @@ -595,6 +580,11 @@ </exclusions> </dependency> <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + <version>1.5.8</version> + </dependency> + <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> <version>${jetty.version}</version> Modified: cxf/branches/2.1.x-fixes/rt/bindings/jbi/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/bindings/jbi/pom.xml?rev=797481&r1=797480&r2=797481&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/bindings/jbi/pom.xml (original) +++ cxf/branches/2.1.x-fixes/rt/bindings/jbi/pom.xml Fri Jul 24 14:26:35 2009 @@ -73,10 +73,11 @@ </dependency> <dependency> - <groupId>org.apache.servicemix</groupId> - <artifactId>servicemix-jbi</artifactId> + <groupId>org.apache.servicemix.specs</groupId> + <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId> <scope>provided</scope> </dependency> + </dependencies> <build> Modified: cxf/branches/2.1.x-fixes/rt/transports/jbi/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/transports/jbi/pom.xml?rev=797481&r1=797480&r2=797481&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/rt/transports/jbi/pom.xml (original) +++ cxf/branches/2.1.x-fixes/rt/transports/jbi/pom.xml Fri Jul 24 14:26:35 2009 @@ -64,10 +64,9 @@ <scope>test</scope> </dependency> - <dependency> - <groupId>org.apache.servicemix</groupId> - <artifactId>servicemix-jbi</artifactId> + <groupId>org.apache.servicemix.specs</groupId> + <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId> <scope>provided</scope> </dependency> </dependencies> Modified: cxf/branches/2.1.x-fixes/systests/pom.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/systests/pom.xml?rev=797481&r1=797480&r2=797481&view=diff ============================================================================== --- cxf/branches/2.1.x-fixes/systests/pom.xml (original) +++ cxf/branches/2.1.x-fixes/systests/pom.xml Fri Jul 24 14:26:35 2009 @@ -470,7 +470,7 @@ <dependency> <groupId>org.apache.servicemix</groupId> <artifactId>servicemix-core</artifactId> - <version>${servicemix.version}</version> + <version>3.3.1</version> <exclusions> <exclusion> <groupId>jaxen</groupId>
