cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r757953 - in /cxf/branches/2.1.x-fixes: ./ buildtools/src/main/resources/notice-supplements.xml distribution/src/main/release/BUILDING.txt parent/pom.xml rt/ws/security/pom.xml
Date Tue, 24 Mar 2009 18:55:28 GMT
Author: dkulp
Date: Tue Mar 24 18:55:26 2009
New Revision: 757953

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

........
  r753380 | dkulp | 2009-03-13 16:20:27 -0400 (Fri, 13 Mar 2009) | 2 lines
  
  Update various versions of stuff, update release notes, update legal muck, etc....
........

Modified:
    cxf/branches/2.1.x-fixes/   (props changed)
    cxf/branches/2.1.x-fixes/buildtools/src/main/resources/notice-supplements.xml
    cxf/branches/2.1.x-fixes/distribution/src/main/release/BUILDING.txt
    cxf/branches/2.1.x-fixes/parent/pom.xml
    cxf/branches/2.1.x-fixes/rt/ws/security/pom.xml

Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:753380

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

Modified: cxf/branches/2.1.x-fixes/buildtools/src/main/resources/notice-supplements.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/buildtools/src/main/resources/notice-supplements.xml?rev=757953&r1=757952&r2=757953&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/buildtools/src/main/resources/notice-supplements.xml (original)
+++ cxf/branches/2.1.x-fixes/buildtools/src/main/resources/notice-supplements.xml Tue Mar
24 18:55:26 2009
@@ -139,6 +139,74 @@
   </supplement>
   <supplement>
     <project>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <licenses>
+        <license>
+          <name>MIT License</name>
+          <url>http://www.slf4j.org/license.html</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+    <project>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+      <licenses>
+        <license>
+          <name>MIT License</name>
+          <url>http://www.slf4j.org/license.html</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+
+  <supplement>
+    <project>
+      <groupId>jaxen</groupId>
+      <artifactId>jaxen</artifactId>
+      <licenses>
+        <license>
+          <name>BSD</name>
+          <url>http://jaxen.codehaus.org/license.html</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+    <project>
+      <groupId>asm</groupId>
+      <artifactId>asm</artifactId>
+      <licenses>
+        <license>
+          <name>BSD</name>
+          <url>http://asm.objectweb.org/license.html</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+
+
+  <supplement>
+    <project>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <name>Apache Commons - collections</name>
+      <organization>
+        <name>The Apache Software Foundation</name>
+        <url>http://www.apache.org</url>
+      </organization>
+      <licenses>
+        <license>
+          <name>The Apache Software License, Version 2.0</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+      </licenses>
+    </project>
+  </supplement>
+  <supplement>
+    <project>
       <groupId>net.java.dev.stax-utils</groupId>
       <artifactId>stax-utils</artifactId>
       <name>StAX Utilities</name>

Modified: cxf/branches/2.1.x-fixes/distribution/src/main/release/BUILDING.txt
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/distribution/src/main/release/BUILDING.txt?rev=757953&r1=757952&r2=757953&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/distribution/src/main/release/BUILDING.txt (original)
+++ cxf/branches/2.1.x-fixes/distribution/src/main/release/BUILDING.txt Tue Mar 24 18:55:26
2009
@@ -6,14 +6,14 @@
 
 1) Install J2SE 5.0 SDK, which can be downloaded from 
    http://java.sun.com/j2se/1.5.0/download.jsp. Use version of 1.5.0_13 JDK.
-   Note: CXF 2.1 does build on Java 6 update 4 and later.  It will not build on 
+   Note: CXF >=2.1 does build on Java 6 update 4 and later.  It will not build on 
    updates prior to update 4.
 
 2) Make sure that your JAVA_HOME environment variable is set to the newly installed 
    JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or 
    $JAVA_HOME$/bin (unix).
 
-3) Install Maven 2.0.9, which can be downloaded from 
+3) Install Maven 2.0.9 or newer, which can be downloaded from 
    http://maven.apache.org/download.html. Make sure that your PATH includes 
    the MVN_HOME/bin directory. 
 
@@ -29,7 +29,7 @@
          $> mvn -Pfastinstall.
    This will compile Apache CXF without running the tests and takes less
    time to build.
-   Depending on the load of remote Maven 2.0 repositories, you may have 
+   Depending on the load of remote Maven repositories, you may have 
    to run "mvn" several times utill the required dependencies are 
    all located in your local maven repository. It usually takes some time for 
    maven to download required dependencies in the first build.

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=757953&r1=757952&r2=757953&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/parent/pom.xml (original)
+++ cxf/branches/2.1.x-fixes/parent/pom.xml Tue Mar 24 18:55:26 2009
@@ -50,13 +50,13 @@
         <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.9</jetty.version>
+        <jetty.version>6.1.15</jetty.version>
         <saaj.version>1.3</saaj.version>
         <spring.version>2.0.8</spring.version>
         <spring.mock>spring-mock</spring.mock>
-	<stax.impl.groupId>org.codehaus.woodstox</stax.impl.groupId>
-	<stax.impl.artifactId>wstx-asl</stax.impl.artifactId>
-	<stax.impl.version>3.2.6</stax.impl.version>
+        <stax.impl.groupId>org.codehaus.woodstox</stax.impl.groupId>
+        <stax.impl.artifactId>wstx-asl</stax.impl.artifactId>
+        <stax.impl.version>3.2.6</stax.impl.version>
         <cglib-nodep.version>2.1_3</cglib-nodep.version>
         <wsdl4j.version>1.6.2</wsdl4j.version>
         <derby.version>10.2.2.0</derby.version>

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=757953&r1=757952&r2=757953&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 Tue Mar 24 18:55:26 2009
@@ -58,14 +58,9 @@
             <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.5</version>
+            <version>1.5.6</version>
             <exclusions>
                 <exclusion>
                     <groupId>axis</groupId>



Mime
View raw message