You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/10/04 18:29:19 UTC
svn commit: r1004310 - in /cxf/trunk: distribution/manifest/pom.xml
distribution/pom.xml distribution/src/main/release/lib/WHICH_JARS
parent/pom.xml rt/frontend/jaxrs/pom.xml rt/management-web/pom.xml
systests/jaxrs/pom.xml
Author: dkulp
Date: Mon Oct 4 16:29:18 2010
New Revision: 1004310
URL: http://svn.apache.org/viewvc?rev=1004310&view=rev
Log:
Mark abdera optional
Update WHICH_JARS
Remove some other unused jars
Modified:
cxf/trunk/distribution/manifest/pom.xml
cxf/trunk/distribution/pom.xml
cxf/trunk/distribution/src/main/release/lib/WHICH_JARS
cxf/trunk/parent/pom.xml
cxf/trunk/rt/frontend/jaxrs/pom.xml
cxf/trunk/rt/management-web/pom.xml
cxf/trunk/systests/jaxrs/pom.xml
Modified: cxf/trunk/distribution/manifest/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/manifest/pom.xml?rev=1004310&r1=1004309&r2=1004310&view=diff
==============================================================================
--- cxf/trunk/distribution/manifest/pom.xml (original)
+++ cxf/trunk/distribution/manifest/pom.xml Mon Oct 4 16:29:18 2010
@@ -285,16 +285,10 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- </dependency>
<dependency>
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
</dependency>
-
</dependencies>
<build>
Modified: cxf/trunk/distribution/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/pom.xml?rev=1004310&r1=1004309&r2=1004310&view=diff
==============================================================================
--- cxf/trunk/distribution/pom.xml (original)
+++ cxf/trunk/distribution/pom.xml Mon Oct 4 16:29:18 2010
@@ -317,11 +317,6 @@
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.ant</groupId>
- <artifactId>ant</artifactId>
- </dependency>
</dependencies>
<build>
Modified: cxf/trunk/distribution/src/main/release/lib/WHICH_JARS
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/lib/WHICH_JARS?rev=1004310&r1=1004309&r2=1004310&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/lib/WHICH_JARS (original)
+++ cxf/trunk/distribution/src/main/release/lib/WHICH_JARS Mon Oct 4 16:29:18 2010
@@ -37,6 +37,8 @@ For Java2WSDL and WSDL2Java:
- oro.jar
- commons-collections.jar
- commons-lang.jar
+- cxf-xjc*.jar (optional, these are xjc extensions for providing enhanced
+ JAXB code generation)
For JAX-WS support:
- geronimo-ws-metadata.jar [6]
@@ -63,6 +65,9 @@ For standalone HTTP support:
For Aegis support:
- jdom.jar (optional, if you want to map xsd:anyType to JDOM)
+For XmlBeans databinding support:
+- xmlbeans.jar
+
For WS-Security support:
- bcprov-jdk15.jar
- xalan.jar
@@ -75,8 +80,11 @@ For HTTP Binding support:
- jettison.jar (Needed for JSON services only)
For JAX-RS support:
-- abdera*
-- axiom*
+- abdera* (optional: for AtomPub support, but also needed for the
+ Management log browser console)
+- commons-codec.jar (Needed for Abdera)
+- jaxen.jar (Needed for Abdera)
+- axiom* (Needed for Abdera)
- jsr311-api.jar
- jettison.jar (Needed for JSON services only)
@@ -84,7 +92,10 @@ For JMS transport
- geronimo-jms.jar (Or the Sun equivalent)
- spring-jms.jar
- spring-tx.jar
+- commons-pool.jar
For CORBA support:
- antlr.jar
+For JavaScript functionality:
+- js.jar
Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1004310&r1=1004309&r2=1004310&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Mon Oct 4 16:29:18 2010
@@ -809,8 +809,13 @@
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <version>2.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
<artifactId>spring-security-core-tiger</artifactId>
- <version>2.0.5.RELEASE</version>
+ <version>2.0.4</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -837,7 +842,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-acl</artifactId>
- <version>3.0.3.RELEASE</version>
+ <version>2.0.4</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
@@ -891,12 +896,6 @@
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
<version>3.1</version>
- <exclusions>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
@@ -1083,6 +1082,26 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-extensions-html</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.0.2_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
Modified: cxf/trunk/rt/frontend/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/pom.xml?rev=1004310&r1=1004309&r2=1004310&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/trunk/rt/frontend/jaxrs/pom.xml Mon Oct 4 16:29:18 2010
@@ -95,42 +95,19 @@
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-core</artifactId>
<version>${abdera.version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-parser</artifactId>
<version>${abdera.version}</version>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-extensions-json</artifactId>
<version>${abdera.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.abdera</groupId>
- <artifactId>abdera-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.abdera</groupId>
- <artifactId>abdera-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.abdera</groupId>
- <artifactId>abdera-extensions-html</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.0.2_spec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- </exclusions>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>${servlet-api.group}</groupId>
Modified: cxf/trunk/rt/management-web/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/management-web/pom.xml?rev=1004310&r1=1004309&r2=1004310&view=diff
==============================================================================
--- cxf/trunk/rt/management-web/pom.xml (original)
+++ cxf/trunk/rt/management-web/pom.xml Mon Oct 4 16:29:18 2010
@@ -42,6 +42,24 @@
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-core</artifactId>
+ <version>${abdera.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-parser</artifactId>
+ <version>${abdera.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-extensions-json</artifactId>
+ <version>${abdera.version}</version>
+ <optional>true</optional>
+ </dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-common-utilities</artifactId>
Modified: cxf/trunk/systests/jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/pom.xml?rev=1004310&r1=1004309&r2=1004310&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/pom.xml (original)
+++ cxf/trunk/systests/jaxrs/pom.xml Mon Oct 4 16:29:18 2010
@@ -65,6 +65,21 @@
</profiles>
<dependencies>
<dependency>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-core</artifactId>
+ <version>${abdera.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-parser</artifactId>
+ <version>${abdera.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-extensions-json</artifactId>
+ <version>${abdera.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
</dependency>
@@ -266,6 +281,11 @@
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
+ <artifactId>spring-security-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.security</groupId>
<artifactId>spring-security-core-tiger</artifactId>
<scope>test</scope>
</dependency>