Skip to content

Commit

Permalink
Initial removal of Abdera (apache#894)
Browse files Browse the repository at this point in the history 
* Initial removal of Abdera

* Removed Abdera usage from the CDI system tests

Co-authored-by: Andriy Redko <[email protected]>
  • Loading branch information
@coheigea @reta
coheigea and reta authored Jan 21, 2022
1 parent 8c04dd2 commit b740e0a
Show file tree
Hide file tree
Showing 40 changed files with 134 additions and 2,970 deletions.
12 changes: 0 additions & 12 deletions distribution/javadoc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,18 +389,6 @@
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
</dependency>
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-core</artifactId>
</dependency>
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-parser</artifactId>
</dependency>
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-extensions-json</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
15 changes: 0 additions & 15 deletions distribution/manifest/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -317,21 +317,6 @@
<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>
<dependency>
<groupId>jakarta.xml.ws</groupId>
<artifactId>jakarta.xml.ws-api</artifactId>
Expand Down
1 change: 0 additions & 1 deletion osgi/bundle/compatible/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@
javax.xml.soap,
junit.framework*;resolution:=optional,
net.sf.cglib*;resolution:=optional;version="${cxf.cglib.osgi.version}",
org.apache.abdera*;resolution:=optional;version="[1.0,2)",
org.apache.aries*;resolution:=optional;version="${cxf.aries.version.range}",
org.apache.commons.lang3*;resolution:=optional;version="[3,4)",
org.apache.commons.codec*;resolution:=optional,
Expand Down
14 changes: 0 additions & 14 deletions osgi/karaf/features/src/main/resources/features.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,20 +44,6 @@
<bundle start-level="20">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${cxf.jaxb.bundle.version}</bundle>
<bundle start-level="20">mvn:com.sun.istack/istack-commons-runtime/${cxf.istack.bundle.version}</bundle>
</feature>
<!-- Current the abdera bundle is not working as we expect -->
<feature name="cxf-abdera" version="${project.version}">
<feature version="${project.version}">cxf-specs</feature>
<bundle start-level="25" dependency="true">mvn:commons-codec/commons-codec/${cxf.commons-codec.version}</bundle>
<bundle start-level="35">mvn:org.apache.abdera/abdera-core/${cxf.abdera.version}</bundle>
<bundle start-level="35">mvn:org.apache.abdera/abdera-extensions-main/${cxf.abdera.version}</bundle>
<bundle start-level="35">mvn:org.apache.abdera/abdera-i18n/${cxf.abdera.version}</bundle>
<bundle start-level="35">mvn:org.apache.james/apache-mime4j-core/${cxf.james.mim4j.version}</bundle>
<bundle start-level="35">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.abdera-parser/${cxf.abdera.osgi.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${cxf.jdom.bundle.version}</bundle>
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${cxf.dom4j.bundle.version}</bundle>
<!--bundle start-level='35'>mvn:org.apache.abdera/abdera-extensions-html/${cxf.abdera.version}</bundle>
<bundle start-level='35'>mvn:org.apache.abdera/abdera-extensions-json/${cxf.abdera.version}</bundle>-->
</feature>
<feature name="saaj-impl" version="${cxf.saaj-impl.version}">
<bundle start-level="25">mvn:org.jvnet.staxex/stax-ex/${cxf.stax-ex.version}</bundle>
<bundle start-level="25">mvn:com.sun.xml.messaging.saaj/saaj-impl/${cxf.saaj-impl.version}</bundle>
Expand Down
107 changes: 0 additions & 107 deletions parent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@
<cxf.osgi.javax.xml.ws.version>[0,3)</cxf.osgi.javax.xml.ws.version>

<!-- please maintain alphabetical order here -->
<cxf.abdera.osgi.version>1.1.3_2</cxf.abdera.osgi.version>
<cxf.abdera.version>1.1.3</cxf.abdera.version>
<cxf.activemq.version>5.16.3</cxf.activemq.version>
<cxf.ahc.version>2.12.3</cxf.ahc.version>
<cxf.apacheds.version>2.0.0.AM26</cxf.apacheds.version>
Expand Down Expand Up @@ -1740,111 +1738,6 @@
<artifactId>bcprov-jdk15on</artifactId>
<version>${cxf.bcprov.version}</version>
</dependency>
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-core</artifactId>
<version>${cxf.abdera.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.0.2_spec</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-extensions-json</artifactId>
<version>${cxf.abdera.version}</version>
<exclusions>
<exclusion>
<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>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-parser</artifactId>
<version>${cxf.abdera.version}</version>
<exclusions>
<exclusion>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>woodstox-core-asl</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.1_spec</artifactId>
</exclusion>
<exclusion>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
</exclusion>
<exclusion>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
</exclusion>
<exclusion>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</exclusion>
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<exclusion>
<artifactId>xmlParserAPIs</artifactId>
<groupId>xerces</groupId>
</exclusion>
<exclusion>
<artifactId>xercesImpl</artifactId>
<groupId>xerces</groupId>
</exclusion>
<exclusion>
<artifactId>xom</artifactId>
<groupId>xom</groupId>
</exclusion>
<exclusion>
<artifactId>xalan</artifactId>
<groupId>xalan</groupId>
</exclusion>
<exclusion>
<artifactId>xml-apis</artifactId>
<groupId>xml-apis</groupId>
</exclusion>
<exclusion>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
Expand Down
18 changes: 0 additions & 18 deletions rt/rs/extensions/providers/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,24 +92,6 @@
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-core</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-parser</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.apache.abdera</groupId>
<artifactId>abdera-extensions-json</artifactId>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
Expand Down
120 changes: 0 additions & 120 deletions ...roviders/src/main/java/org/apache/cxf/jaxrs/provider/atom/AbstractAtomElementBuilder.java
View file

This file was deleted.

Loading

0 comments on commit b740e0a

Please sign in to comment.