cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1369653 - in /cxf/branches/2.6.x-fixes: ./ osgi/bundle/all/pom.xml osgi/bundle/compatible/pom.xml osgi/bundle/jaxrs/pom.xml osgi/bundle/minimal/pom.xml parent/pom.xml testutils/pom.xml
Date Sun, 05 Aug 2012 19:41:50 GMT
Author: sergeyb
Date: Sun Aug  5 19:41:50 2012
New Revision: 1369653

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

........
  r1369649 | sergeyb | 2012-08-05 22:28:11 +0300 (Sun, 05 Aug 2012) | 1 line
  
  Removing JRA dependency
........

Modified:
    cxf/branches/2.6.x-fixes/   (props changed)
    cxf/branches/2.6.x-fixes/osgi/bundle/all/pom.xml
    cxf/branches/2.6.x-fixes/osgi/bundle/compatible/pom.xml
    cxf/branches/2.6.x-fixes/osgi/bundle/jaxrs/pom.xml
    cxf/branches/2.6.x-fixes/osgi/bundle/minimal/pom.xml
    cxf/branches/2.6.x-fixes/parent/pom.xml
    cxf/branches/2.6.x-fixes/testutils/pom.xml

Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1369649

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

Modified: cxf/branches/2.6.x-fixes/osgi/bundle/all/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/osgi/bundle/all/pom.xml?rev=1369653&r1=1369652&r2=1369653&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/osgi/bundle/all/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/osgi/bundle/all/pom.xml Sun Aug  5 19:41:50 2012
@@ -379,7 +379,6 @@
                             org.apache.xmlbeans*;resolution:=optional,
                             org.apache.xml.security*;resolution:=optional,
                             org.apache.ws.security*;resolution:=optional,
-                            org.codehaus.jra*;resolution:=optional,
                             org.codehaus.jettison*;resolution:=optional,
                             org.eclipse.emf*;resolution:=optional,
                             org.eclipse.jetty*;resolution:=optional;version="${cxf.jetty.osgi.version}",

Modified: cxf/branches/2.6.x-fixes/osgi/bundle/compatible/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/osgi/bundle/compatible/pom.xml?rev=1369653&r1=1369652&r2=1369653&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/osgi/bundle/compatible/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/osgi/bundle/compatible/pom.xml Sun Aug  5 19:41:50 2012
@@ -237,7 +237,6 @@
                             org.apache.xmlbeans*;resolution:=optional,
                             org.apache.xml.security*;resolution:=optional,
                             org.apache.ws.security*;resolution:=optional,
-                            org.codehaus.jra*;resolution:=optional,
                             org.codehaus.jettison*;resolution:=optional,
                             org.eclipse.emf*;resolution:=optional,
                             org.eclipse.jetty*;resolution:=optional;version="${cxf.jetty.osgi.version}",

Modified: cxf/branches/2.6.x-fixes/osgi/bundle/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/osgi/bundle/jaxrs/pom.xml?rev=1369653&r1=1369652&r2=1369653&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/osgi/bundle/jaxrs/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/osgi/bundle/jaxrs/pom.xml Sun Aug  5 19:41:50 2012
@@ -156,7 +156,6 @@
                             org.apache.ws.commons.schema*;resolution:=optional,
                             org.apache.xml.resolver*;resolution:=optional,
                             org.apache.xmlbeans*;resolution:=optional,
-                            org.codehaus.jra*;resolution:=optional,
                             org.codehaus.jettison*;resolution:=optional,
                             org.jaxen*;resolution:=optional,
                             org.jdom*;resolution:=optional,

Modified: cxf/branches/2.6.x-fixes/osgi/bundle/minimal/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/osgi/bundle/minimal/pom.xml?rev=1369653&r1=1369652&r2=1369653&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/osgi/bundle/minimal/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/osgi/bundle/minimal/pom.xml Sun Aug  5 19:41:50 2012
@@ -207,7 +207,6 @@
                             org.apache.xmlbeans*;resolution:=optional,
                             org.apache.xml.security*;resolution:=optional,
                             org.apache.ws.security*;resolution:=optional,
-                            org.codehaus.jra*;resolution:=optional,
                             org.codehaus.jettison*;resolution:=optional,
                             org.jaxen*;resolution:=optional,
                             org.jdom*;resolution:=optional,

Modified: cxf/branches/2.6.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/parent/pom.xml?rev=1369653&r1=1369652&r2=1369653&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/parent/pom.xml Sun Aug  5 19:41:50 2012
@@ -634,11 +634,6 @@
                 </exclusions>
             </dependency>
             <dependency>
-                <groupId>org.codehaus.jra</groupId>
-                <artifactId>jra</artifactId>
-                <version>1.0-alpha-4</version>
-            </dependency>
-            <dependency>
                 <groupId>jtidy</groupId>
                 <artifactId>jtidy</artifactId>
                 <version>4aug2000r7-dev</version>

Modified: cxf/branches/2.6.x-fixes/testutils/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/testutils/pom.xml?rev=1369653&r1=1369652&r2=1369653&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/testutils/pom.xml (original)
+++ cxf/branches/2.6.x-fixes/testutils/pom.xml Sun Aug  5 19:41:50 2012
@@ -40,10 +40,6 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.jra</groupId>
-            <artifactId>jra</artifactId>
-        </dependency>
-        <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-core</artifactId>
             <version>${project.version}</version>



Mime
View raw message