cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r714133 - in /cxf/branches/2.0.x-fixes: ./ common/xjc/dv-test/pom.xml common/xjc/ts-test/pom.xml pom.xml rt/ws/security/pom.xml
Date Fri, 14 Nov 2008 20:54:18 GMT
Author: dkulp
Date: Fri Nov 14 12:54:18 2008
New Revision: 714133

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

................
  r710177 | dkulp | 2008-11-03 16:44:15 -0500 (Mon, 03 Nov 2008) | 9 lines
  
  Merged revisions 709425 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r709425 | dkulp | 2008-10-31 10:08:03 -0400 (Fri, 31 Oct 2008) | 2 lines
    
    I've pushed all of our deps from java.net to central.   Thus, remove java.net repos from
poms.
  ........
................

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/common/xjc/dv-test/pom.xml
    cxf/branches/2.0.x-fixes/common/xjc/ts-test/pom.xml
    cxf/branches/2.0.x-fixes/pom.xml
    cxf/branches/2.0.x-fixes/rt/ws/security/pom.xml

Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Nov 14 12:54:18 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,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,712896
-/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,712893
+/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,691745,692162-692163,692468,692500,694466-694469,694472,694717,694748-694749,694870,695503,695509,695553,695555,695563,695875-695877,695940,695980,696436,696455,696721,697086,698129,701526,701634,702275,702443,702527,702582,702604,702610,702642-702643,702649,702760,702870,702873,702959,703193,703242,703523,704303,704587,704738,704998,705153,705280-705449,705455,709357,709641,709644,710177,712896
+/cxf/trunk:651669-686342,686344-686363,686764,686820,687096,687387,687463,688086,688102,688735,691271,691355,691488,691602,691706,691728,692116,692157,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694869,695396,695484,695537,695552,695561,695619,695684,695835,695935,695977,696094,696433,696720,697085,698128,700261,700602,701783,701830,701862,702267,702580,702602,702609,702616,702656,702957,703191,703239,703501,704584,704997,705150,705274,705340,705446,708550,708554,709353-709354,709425,712893
 /incubator/cxf/trunk:434594-651668

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

Modified: cxf/branches/2.0.x-fixes/common/xjc/dv-test/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/xjc/dv-test/pom.xml?rev=714133&r1=714132&r2=714133&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/common/xjc/dv-test/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/common/xjc/dv-test/pom.xml Fri Nov 14 12:54:18 2008
@@ -32,20 +32,6 @@
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net</id>
-            <name>java.net Maven Repository</name>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
 
     <dependencies>
 

Modified: cxf/branches/2.0.x-fixes/common/xjc/ts-test/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/common/xjc/ts-test/pom.xml?rev=714133&r1=714132&r2=714133&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/common/xjc/ts-test/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/common/xjc/ts-test/pom.xml Fri Nov 14 12:54:18 2008
@@ -32,21 +32,6 @@
         <relativePath>../../../parent/pom.xml</relativePath>
     </parent>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net</id>
-            <name>java.net Maven Repository</name>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
     <dependencies>
 
         <dependency>

Modified: cxf/branches/2.0.x-fixes/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/pom.xml?rev=714133&r1=714132&r2=714133&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/pom.xml Fri Nov 14 12:54:18 2008
@@ -140,20 +140,6 @@
         <module>maven-plugins/eclipse-plugin-generator</module>
     </modules>
 
-    <repositories>
-        <repository>
-            <id>java.net</id>
-            <name>java.net Maven Repository</name>
-            <url>http://download.java.net/maven/1/</url>
-            <layout>legacy</layout>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
 
     <profiles>
         <profile>

Modified: cxf/branches/2.0.x-fixes/rt/ws/security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/ws/security/pom.xml?rev=714133&r1=714132&r2=714133&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/ws/security/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/rt/ws/security/pom.xml Fri Nov 14 12:54:18 2008
@@ -58,6 +58,11 @@
             <artifactId>saaj-api</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.opensaml</groupId>
+            <artifactId>opensaml</artifactId>
+            <version>1.1</version>
+        </dependency>
+        <dependency>
             <groupId>org.apache.ws.security</groupId>
             <artifactId>wss4j</artifactId>
             <version>1.5.4</version>
@@ -67,6 +72,10 @@
                     <artifactId>axis</artifactId>
                 </exclusion>
                 <exclusion>
+                    <groupId>opensaml</groupId>
+                    <artifactId>opensaml</artifactId>
+                </exclusion>
+                <exclusion>
                     <groupId>axis</groupId>
                     <artifactId>axis-ant</artifactId>
                 </exclusion>



Mime
View raw message