cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r702611 - in /cxf/branches/2.0.x-fixes: ./ distribution/pom.xml distribution/src/main/release/lib/WHICH_JARS distribution/src/main/release/release_notes.txt parent/pom.xml rt/ws/security/pom.xml
Date Tue, 07 Oct 2008 20:08:46 GMT
Author: dkulp
Date: Tue Oct  7 13:08:45 2008
New Revision: 702611

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

................
  r702604 | dkulp | 2008-10-07 15:44:12 -0400 (Tue, 07 Oct 2008) | 9 lines
  
  Merged revisions 702602 via svnmerge from 
  https://svn.apache.org/repos/asf/cxf/trunk
  
  ........
    r702602 | dkulp | 2008-10-07 15:42:50 -0400 (Tue, 07 Oct 2008) | 2 lines
    
    Update to bouncycastle 140 and xalan 2.7.1 as we can ship stuff that allows ws-security
to now work out of the box
  ........
................

Modified:
    cxf/branches/2.0.x-fixes/   (props changed)
    cxf/branches/2.0.x-fixes/distribution/pom.xml
    cxf/branches/2.0.x-fixes/distribution/src/main/release/lib/WHICH_JARS
    cxf/branches/2.0.x-fixes/distribution/src/main/release/release_notes.txt
    cxf/branches/2.0.x-fixes/parent/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 Tue Oct  7 13:08:45 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,696721,697086,702275
-/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,696433,696720,697085,702267
+/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,696721,697086,702275,702604
+/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,696433,696720,697085,702267,702602
 /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/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/distribution/pom.xml?rev=702611&r1=702610&r2=702611&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/distribution/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/distribution/pom.xml Tue Oct  7 13:08:45 2008
@@ -195,12 +195,6 @@
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-rt-ws-security</artifactId>
             <version>${pom.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>bouncycastle</groupId>
-                    <artifactId>bcprov-jdk14</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -230,12 +224,6 @@
             <groupId>${pom.groupId}</groupId>
             <artifactId>cxf-bundle</artifactId>
             <version>${pom.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>bouncycastle</groupId>
-                    <artifactId>bcprov-jdk14</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>

Modified: cxf/branches/2.0.x-fixes/distribution/src/main/release/lib/WHICH_JARS
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/distribution/src/main/release/lib/WHICH_JARS?rev=702611&r1=702610&r2=702611&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/distribution/src/main/release/lib/WHICH_JARS (original)
+++ cxf/branches/2.0.x-fixes/distribution/src/main/release/lib/WHICH_JARS Tue Oct  7 13:08:45
2008
@@ -48,9 +48,10 @@
 - jdom.jar
 
 For WS-Security support:
-- bcprov-jdk14.jar
+- bcprov-jdk15.jar
 - wss4j.jar
 - xalan.jar
+- serializer.jar
 - xmlsec.jar
 
 For HTTP Binding support:

Modified: cxf/branches/2.0.x-fixes/distribution/src/main/release/release_notes.txt
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/distribution/src/main/release/release_notes.txt?rev=702611&r1=702610&r2=702611&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/distribution/src/main/release/release_notes.txt (original)
+++ cxf/branches/2.0.x-fixes/distribution/src/main/release/release_notes.txt Tue Oct  7 13:08:45
2008
@@ -47,20 +47,6 @@
 For more details, see the Installation Guide.
 
 
-2.3 Bouncy Castle/JCE requirement for WS-Security
-
-To use the WS-Security features of CXF, you need to obtain a JCE crypto provider
-that implements the algorithms that you plan to use. One option is to download 
-the Bouncy Castle jar from:
-http://bouncycastle.org/download/bcprov-jdk14-136.jar 
-and add that to the lib directory or classpath.   
-
-
-The latest version of the WSS4J library that is used to implement WS-Security 
-requires the opensaml jar to be on the classpath.  This is different than previous
-versions that only required it if doing SAML assertions.  When upgrading
-to CXF 2.0.8, you will need to add the opensaml jar to your application.   
-
 3. Building the Samples
 
 Building the samples included in the binary distribution is easy. Change to

Modified: cxf/branches/2.0.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/parent/pom.xml?rev=702611&r1=702610&r2=702611&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.0.x-fixes/parent/pom.xml Tue Oct  7 13:08:45 2008
@@ -825,8 +825,8 @@
             </dependency>
             <dependency>
                 <groupId>bouncycastle</groupId>
-                <artifactId>bcprov-jdk14</artifactId>
-                <version>136</version>
+                <artifactId>bcprov-jdk15</artifactId>
+                <version>140</version>
             </dependency>
         </dependencies>
     </dependencyManagement>

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=702611&r1=702610&r2=702611&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 Tue Oct  7 13:08:45 2008
@@ -74,14 +74,14 @@
                     <groupId>bouncycastle</groupId>
                     <artifactId>bcprov-jdk15</artifactId>
                 </exclusion>
-		<exclusion>
-		    <groupId>bouncycastle</groupId>
-		    <artifactId>bcprov-jdk13</artifactId>
-		</exclusion>
-		<exclusion>
-		    <groupId>bouncycastle</groupId>
-		    <artifactId>bcprov-jdk14</artifactId>
-		</exclusion>
+                <exclusion>
+                    <groupId>bouncycastle</groupId>
+                    <artifactId>bcprov-jdk13</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>bouncycastle</groupId>
+                    <artifactId>bcprov-jdk14</artifactId>
+                </exclusion>
                 <exclusion>
                     <groupId>xerces</groupId>
                     <artifactId>xercesImpl</artifactId>
@@ -93,20 +93,24 @@
             </exclusions>
         </dependency>
         <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        <dependency>
             <groupId>xalan</groupId>
             <artifactId>xalan</artifactId>
-            <version>2.7.0</version>
+            <version>2.7.1</version>
             <scope>runtime</scope>
             <exclusions>
-              <exclusion>
-                <groupId>xml-apis</groupId>
-                <artifactId>xml-apis</artifactId>
-              </exclusion>
+                <exclusion>
+                    <groupId>xml-apis</groupId>
+                    <artifactId>xml-apis</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
             <groupId>bouncycastle</groupId>
-            <artifactId>bcprov-jdk14</artifactId>
+            <artifactId>bcprov-jdk15</artifactId>
             <scope>runtime</scope>
         </dependency>
 



Mime
View raw message