Author: dkulp
Date: Thu Nov 18 19:26:19 2010
New Revision: 1036582
URL: http://svn.apache.org/viewvc?rev=1036582&view=rev
Log:
Merged revisions 1036581 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1036581 | dkulp | 2010-11-18 14:21:59 -0500 (Thu, 18 Nov 2010) | 2 lines
Make sure abdera/axiom are in the manifest jar so just adding the jars
to lib should work
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/distribution/manifest/pom.xml
cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/pom.xml
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/manifest/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/distribution/manifest/pom.xml?rev=1036582&r1=1036581&r2=1036582&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/distribution/manifest/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/distribution/manifest/pom.xml Thu Nov 18 19:26:19
2010
@@ -289,6 +289,22 @@
<groupId>com.sun.xml.fastinfoset</groupId>
<artifactId>FastInfoset</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-core</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-parser</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.abdera</groupId>
+ <artifactId>abdera-extensions-json</artifactId>
+ <optional>true</optional>
+ </dependency>
</dependencies>
<build>
Modified: cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/pom.xml?rev=1036582&r1=1036581&r2=1036582&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/pom.xml (original)
+++ cxf/branches/2.3.x-fixes/rt/frontend/jaxrs/pom.xml Thu Nov 18 19:26:19 2010
@@ -94,19 +94,16 @@
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-core</artifactId>
- <version>${cxf.abdera.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-parser</artifactId>
- <version>${cxf.abdera.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-extensions-json</artifactId>
- <version>${cxf.abdera.version}</version>
<optional>true</optional>
</dependency>
<dependency>
