cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r710177 - in /cxf/branches/2.1.x-fixes: ./ common/xjc/dv-test/pom.xml common/xjc/ts-test/pom.xml pom.xml rt/frontend/jaxrs/pom.xml rt/ws/security/pom.xml
Date Mon, 03 Nov 2008 21:44:16 GMT
Author: dkulp
Date: Mon Nov  3 13:44:15 2008
New Revision: 710177

URL: http://svn.apache.org/viewvc?rev=710177&view=rev
Log:
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.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/common/xjc/dv-test/pom.xml
    cxf/branches/2.1.x-fixes/common/xjc/ts-test/pom.xml
    cxf/branches/2.1.x-fixes/pom.xml
    cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/pom.xml
    cxf/branches/2.1.x-fixes/rt/ws/security/pom.xml

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov  3 13:44:15 2008
@@ -1 +1 @@
-/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708417,708550,708554,709353-709354
+/cxf/trunk:686333-686363,686764,686820,687096,687194,687363,687387,687463,687543,687722,687798,687814,687817,687891,687910,687914,688086,688102,688133,688596,688735,688870,689572,689596,689855,689924,690067,690289,691246,691271,691295,691338,691355,691488,691602,691646,691706,691728,692116,692157,692310,692466,692499,693653,693819,694179,694263,694417,694716,694744,694747,694795,694869,694981,694987,694993,695041,695096,695396,695484,695537,695552,695561,695619,695684,695835,695840,695868,695935,695977,696016,696094,696433,696720,697085,697868,698128,699289,700261,700507,700602,700981,701316,701783,701830,701862,702187,702205-702248,702267,702547,702561,702580,702602,702609,702616,702653,702656,702957,703191,703239,703309,703501,703513,703548,704584,704937,704997,705150,705235,705274,705340,705446,705548,705614,705692,705708,706482,706631,706675,706900,706909,707034,707089,707100,707902,708035,708044,708074,708417,708550,708554,709353-709354,709425

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

Modified: cxf/branches/2.1.x-fixes/common/xjc/dv-test/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/xjc/dv-test/pom.xml?rev=710177&r1=710176&r2=710177&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/common/xjc/dv-test/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/common/xjc/dv-test/pom.xml Mon Nov  3 13:44:15 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.1.x-fixes/common/xjc/ts-test/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/xjc/ts-test/pom.xml?rev=710177&r1=710176&r2=710177&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/common/xjc/ts-test/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/common/xjc/ts-test/pom.xml Mon Nov  3 13:44:15 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.1.x-fixes/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/pom.xml?rev=710177&r1=710176&r2=710177&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/pom.xml Mon Nov  3 13:44:15 2008
@@ -140,22 +140,6 @@
     </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>
             <!-- default profile enables checkstyle and Xlint stuff -->

Modified: cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/pom.xml?rev=710177&r1=710176&r2=710177&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/rt/frontend/jaxrs/pom.xml Mon Nov  3 13:44:15 2008
@@ -160,11 +160,6 @@
             <name>Apache Incubating Repository</name>
             <url>http://people.apache.org/repo/m2-incubating-repository</url>
         </repository>
-        <repository>
-            <id>java.net.2</id>
-            <name>Java Net 2 Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </repository>
     </repositories>
 
 </project>

Modified: cxf/branches/2.1.x-fixes/rt/ws/security/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/rt/ws/security/pom.xml?rev=710177&r1=710176&r2=710177&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/rt/ws/security/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/rt/ws/security/pom.xml Mon Nov  3 13:44:15 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