You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2016/02/20 21:13:59 UTC
svn commit: r1731449 - in /axis/axis2/java/core/branches/1_7: ./ legal/
modules/distribution/
Author: veithen
Date: Sat Feb 20 20:13:59 2016
New Revision: 1731449
URL: http://svn.apache.org/viewvc?rev=1731449&view=rev
Log:
Merge r1731446 and r1731448 to the 1.7 branch to ensure that the binary distribution contains all necessary license files.
Added:
axis/axis2/java/core/branches/1_7/legal/gson-LICENSE.txt
- copied unchanged from r1731448, axis/axis2/java/core/trunk/legal/gson-LICENSE.txt
axis/axis2/java/core/branches/1_7/legal/httpclient-LICENSE.txt
- copied unchanged from r1731448, axis/axis2/java/core/trunk/legal/httpclient-LICENSE.txt
axis/axis2/java/core/branches/1_7/legal/woden-core-LICENSE.txt
- copied unchanged from r1731448, axis/axis2/java/core/trunk/legal/woden-core-LICENSE.txt
axis/axis2/java/core/branches/1_7/legal/xmlschema-core-LICENSE.txt
- copied unchanged from r1731448, axis/axis2/java/core/trunk/legal/xmlschema-core-LICENSE.txt
Removed:
axis/axis2/java/core/branches/1_7/legal/XmlSchema-LICENSE.txt
axis/axis2/java/core/branches/1_7/legal/regexp-LICENSE.txt
axis/axis2/java/core/branches/1_7/legal/woden-api-LICENSE.txt
axis/axis2/java/core/branches/1_7/legal/woden-impl-commons-LICENSE.txt
axis/axis2/java/core/branches/1_7/legal/woden-impl-dom-LICENSE.txt
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/distribution/pom.xml
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Feb 20 20:13:59 2016
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448
Modified: axis/axis2/java/core/branches/1_7/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/distribution/pom.xml?rev=1731449&r1=1731448&r2=1731449&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/distribution/pom.xml Sat Feb 20 20:13:59 2016
@@ -281,7 +281,9 @@
</dependency>
<!-- These are needed to run JAX-WS tools -->
- <dependency>
+ <!-- TODO: don't add them unless you also add the corresponding license files
+ (and check that inclusion of these dependencies conforms to ASF policies) -->
+ <!-- dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
<exclusions>
@@ -310,7 +312,7 @@
<groupId>com.sun.xml.stream.buffer</groupId>
<artifactId>streambuffer</artifactId>
<version>1.2</version>
- </dependency>
+ </dependency -->
</dependencies>
<url>http://axis.apache.org/axis2/java/core/</url>
<scm>