Author: dkulp
Date: Fri Apr 1 22:40:15 2011
New Revision: 1087924
URL: http://svn.apache.org/viewvc?rev=1087924&view=rev
Log:
Merged revisions 1087847 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1087847 | bimargulies | 2011-04-01 14:52:36 -0400 (Fri, 01 Apr 2011) | 1 line
Now that I know that relaxngDatatype is BSD, all of the MSV deps are known to
be 'category b' and we can redistribute them.
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/distribution/pom.xml
cxf/branches/2.3.x-fixes/distribution/src/main/release/lib/WHICH_JARS
cxf/branches/2.3.x-fixes/rt/ws/security/ (props changed)
Propchange: cxf/branches/2.3.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/pom.xml?rev=1087924&r1=1087923&r2=1087924&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/pom.xml Fri Apr 1 22:40:15 2011
@@ -227,12 +227,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>cxf-wstx-msv-validation</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>net.java.dev.msv</groupId>
- <artifactId>msv-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: cxf/branches/2.3.x-fixes/distribution/src/main/release/lib/WHICH_JARS
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/src/main/release/lib/WHICH_JARS?rev=1087924&r1=1087923&r2=1087924&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/src/main/release/lib/WHICH_JARS
(original)
+++ cxf/branches/2.3.x-fixes/distribution/src/main/release/lib/WHICH_JARS Fri
Apr 1 22:40:15 2011
@@ -103,10 +103,7 @@ For CORBA support:
For JavaScript functionality:
- js.jar
-For schema validation with the Aegis data binding,
-you must retrieve and include the following jars.
-The licenses of these jars are do not permit
-redistribution with Apache CXF releases.
+For schema validation with the Aegis data binding.
- msv-core.jar (version 2010.1)
- xsdlib:jar (version 2010.1)
Propchange: cxf/branches/2.3.x-fixes/rt/ws/security/
('svn:mergeinfo' removed)
