Author: dkulp
Date: Thu Mar 24 17:14:33 2011
New Revision: 1085040
URL: http://svn.apache.org/viewvc?rev=1085040&view=rev
Log:
Add jibx stuff to distro
Update imports
Modified:
cxf/trunk/distribution/bundle/all/pom.xml
cxf/trunk/distribution/manifest/pom.xml
cxf/trunk/distribution/pom.xml
Modified: cxf/trunk/distribution/bundle/all/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/all/pom.xml?rev=1085040&r1=1085039&r2=1085040&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/all/pom.xml (original)
+++ cxf/trunk/distribution/bundle/all/pom.xml Thu Mar 24 17:14:33 2011
@@ -78,6 +78,30 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>cxf-rt-databinding-jibx</artifactId>
+ <version>${project.version}</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jibx</groupId>
+ <artifactId>jibx-bind</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jibx</groupId>
+ <artifactId>jibx-run</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jibx</groupId>
+ <artifactId>jibx-schema</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jibx</groupId>
+ <artifactId>jibx-tools</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>cxf-rt-databinding-sdo</artifactId>
<version>${project.version}</version>
<optional>true</optional>
@@ -324,10 +348,12 @@
org.eclipse.jetty*;resolution:=optional,
org.jaxen*;resolution:=optional,
org.jdom*;resolution:=optional,
+ org.jibx*;resolution:=optional;version="[1.2.3,2)",
org.junit*;resolution:=optional,
org.mozilla.javascript*;resolution:=optional,
org.objectweb.asm*;version="[2.0,4)",
org.omg*;resolution:=optional,
+
org.opensaml*;resolution:=optional;version="[2.0,3)",
org.slf4j*;resolution:=optional;version="[1.5,2)",
org.springframework*;resolution:=optional;version="[2.5,4)",
javax.activation;version="[0.0,2)",
Modified: cxf/trunk/distribution/manifest/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/manifest/pom.xml?rev=1085040&r1=1085039&r2=1085040&view=diff
==============================================================================
--- cxf/trunk/distribution/manifest/pom.xml (original)
+++ cxf/trunk/distribution/manifest/pom.xml Thu Mar 24 17:14:33 2011
@@ -214,6 +214,12 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>cxf-rt-databinding-jibx</artifactId>
+ <version>${project.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>cxf-rt-databinding-sdo</artifactId>
<version>${project.version}</version>
<optional>true</optional>
Modified: cxf/trunk/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/pom.xml?rev=1085040&r1=1085039&r2=1085040&view=diff
==============================================================================
--- cxf/trunk/distribution/pom.xml (original)
+++ cxf/trunk/distribution/pom.xml Thu Mar 24 17:14:33 2011
@@ -236,6 +236,30 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>cxf-rt-databinding-jibx</artifactId>
+ <version>${project.version}</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jibx</groupId>
+ <artifactId>jibx-bind</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jibx</groupId>
+ <artifactId>jibx-run</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jibx</groupId>
+ <artifactId>jibx-schema</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jibx</groupId>
+ <artifactId>jibx-tools</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>cxf-rt-databinding-sdo</artifactId>
<version>${project.version}</version>
<optional>true</optional>
