Author: dkulp
Date: Tue Apr 22 10:38:31 2008
New Revision: 650589
URL: http://svn.apache.org/viewvc?rev=650589&view=rev
Log:
Update the notice supplements with the latest information that is needed
Modified:
incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml
incubator/cxf/trunk/parent/pom.xml
Modified:
incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml?rev=650589&r1=650588&r2=650589&view=diff
==============================================================================
--- incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml
(original)
+++ incubator/cxf/trunk/buildtools/src/main/resources/notice-supplements.xml
Tue Apr 22 10:38:31 2008
@@ -36,6 +36,23 @@
</supplement>
<supplement>
<project>
+ <groupId>com.sun.xml.fastinfoset</groupId>
+ <artifactId>FastInfoset</artifactId>
+ <name>Sun FastInfoset Implementation</name>
+ <organization>
+ <name>Sun Microsystems</name>
+ <url>http://www.sun.com/</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>com.sun.xml.messaging.saaj</groupId>
<artifactId>saaj-impl</artifactId>
<name>Sun SAAJ Reference Implementation</name>
@@ -70,9 +87,9 @@
</supplement>
<supplement>
<project>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- <name>Neethi</name>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j</artifactId>
+ <name>Apache WSS4J</name>
<organization>
<name>The Apache Software Foundation</name>
<url>http://www.apache.org/</url>
@@ -87,23 +104,6 @@
</supplement>
<supplement>
<project>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <name>Java API for XML-Based Web Services (JAX-WS API)</name>
- <organization>
- <name>Sun Microsystems</name>
- <url>http://www.sun.com/</url>
- </organization>
- <licenses>
- <license>
- <name>COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version
1.0</name>
- <url>http://www.sun.com/cddl/cddl.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<name>Java Architecture for XML Binding (JAXB API)</name>
@@ -145,23 +145,6 @@
</supplement>
<supplement>
<project>
- <groupId>wss4j</groupId>
- <artifactId>wss4j</artifactId>
- <name>Apache WSS4J</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>jdom</groupId>
<artifactId>jdom</artifactId>
<name>JDOM</name>
@@ -182,74 +165,6 @@
<groupId>xml-security</groupId>
<artifactId>xmlsec</artifactId>
<name>XML Security</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>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <name>XML APIs</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>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
- <name>Bouncy Castle Crypto APIs for Java</name>
- <organization>
- <name>The Legion of the Bouncy Castle</name>
- <url>http://www.bouncycastle.org</url>
- </organization>
- <licenses>
- <license>
- <name>Bouncy Castle License</name>
- <url>http://www.bouncycastle.org/licence.html</url>
- </license>
- </licenses>
- </project>
- </supplement>
- <supplement>
- <project>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <name>Apache Ant</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>ant</groupId>
- <artifactId>ant-nodeps</artifactId>
- <name>Apache Ant (nodeps)</name>
<organization>
<name>The Apache Software Foundation</name>
<url>http://www.apache.org</url>
Modified: incubator/cxf/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/trunk/parent/pom.xml?rev=650589&r1=650588&r2=650589&view=diff
==============================================================================
--- incubator/cxf/trunk/parent/pom.xml (original)
+++ incubator/cxf/trunk/parent/pom.xml Tue Apr 22 10:38:31 2008
@@ -909,6 +909,17 @@
</dependency>
<dependency>
<groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-extensions-json</artifactId>
+ <version>${abdera.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.abdera</groupId>
<artifactId>abdera-parser</artifactId>
<version>${abdera.version}</version>
<exclusions>
