You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2016/01/24 13:13:46 UTC
svn commit: r1726481 - in /webservices/axiom/trunk: ./ axiom-api/
axiom-jaxb/ distribution/src/main/assembly/ legal/ src/site/apt/
src/site/markdown/release-notes/ systests/eclipse-tests/
systests/old-tests/ systests/osgi-tests/ systests/osgi-tests/src...
Author: veithen
Date: Sun Jan 24 12:13:45 2016
New Revision: 1726481
URL: http://svn.apache.org/viewvc?rev=1726481&view=rev
Log:
Upgrade to Java 6 and remove explicit dependencies on Activation, StAX API and JAXB.
Removed:
webservices/axiom/trunk/legal/geronimo-activation-LICENSE.txt
webservices/axiom/trunk/legal/geronimo-stax-api-LICENSE.txt
Modified:
webservices/axiom/trunk/axiom-api/pom.xml
webservices/axiom/trunk/axiom-jaxb/pom.xml
webservices/axiom/trunk/distribution/src/main/assembly/bin.xml
webservices/axiom/trunk/pom.xml
webservices/axiom/trunk/src/site/apt/roadmap.apt
webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md
webservices/axiom/trunk/systests/eclipse-tests/pom.xml
webservices/axiom/trunk/systests/old-tests/pom.xml
webservices/axiom/trunk/systests/osgi-tests/pom.xml
webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java
webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/JAXBTest.java
webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SJSXPTest.java
webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SystemDepsTest.java
webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml
webservices/axiom/trunk/userguide/src/docbkx/userguide.xml
Modified: webservices/axiom/trunk/axiom-api/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/pom.xml?rev=1726481&r1=1726480&r2=1726481&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/pom.xml (original)
+++ webservices/axiom/trunk/axiom-api/pom.xml Sun Jan 24 12:13:45 2016
@@ -35,10 +35,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
@@ -47,10 +43,6 @@
<artifactId>jaxen</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-core</artifactId>
</dependency>
Modified: webservices/axiom/trunk/axiom-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-jaxb/pom.xml?rev=1726481&r1=1726480&r2=1726481&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-jaxb/pom.xml (original)
+++ webservices/axiom/trunk/axiom-jaxb/pom.xml Sun Jan 24 12:13:45 2016
@@ -40,20 +40,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>axiom-impl</artifactId>
<version>${project.version}</version>
@@ -98,7 +89,6 @@
<configuration>
<instructions>
<Export-Package>*;-noimport:=true</Export-Package>
- <Import-Package>javax.xml.bind;version="[2.1,3)",javax.xml.bind.attachment;version="[2.1,3)",*</Import-Package>
</instructions>
</configuration>
</plugin>
Modified: webservices/axiom/trunk/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/distribution/src/main/assembly/bin.xml?rev=1726481&r1=1726480&r2=1726481&view=diff
==============================================================================
--- webservices/axiom/trunk/distribution/src/main/assembly/bin.xml (original)
+++ webservices/axiom/trunk/distribution/src/main/assembly/bin.xml Sun Jan 24 12:13:45 2016
@@ -56,8 +56,6 @@
<excludes>
<exclude>*:axiom-all</exclude>
<exclude>org.apache.abdera:*</exclude>
- <!-- This dependency should be considered as provided by the application code -->
- <exclude>javax.xml.bind:jaxb-api</exclude>
</excludes>
<useProjectArtifact>false</useProjectArtifact>
<useTransitiveFiltering>true</useTransitiveFiltering>
Modified: webservices/axiom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1726481&r1=1726480&r2=1726481&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Sun Jan 24 12:13:45 2016
@@ -304,16 +304,6 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
<version>1.7.1</version>
</dependency>
@@ -390,26 +380,6 @@
<version>2.2</version>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>2.1</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.stream</groupId>
- <artifactId>stax-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.1.9</version>
- </dependency>
- <dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>stax2-api</artifactId>
<version>3.1.1</version>
@@ -968,8 +938,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<inherited>true</inherited>
<configuration>
- <source>1.5</source>
- <target>1.5</target>
+ <source>1.6</source>
+ <target>1.6</target>
</configuration>
</plugin>
<plugin>
@@ -988,8 +958,8 @@
<configuration>
<signature>
<groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java15</artifactId>
- <version>1.0</version>
+ <artifactId>java16</artifactId>
+ <version>1.1</version>
</signature>
</configuration>
</plugin>
Modified: webservices/axiom/trunk/src/site/apt/roadmap.apt
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/src/site/apt/roadmap.apt?rev=1726481&r1=1726480&r2=1726481&view=diff
==============================================================================
--- webservices/axiom/trunk/src/site/apt/roadmap.apt (original)
+++ webservices/axiom/trunk/src/site/apt/roadmap.apt Sun Jan 24 12:13:45 2016
@@ -28,9 +28,7 @@ Introduction
The overall goals for the 1.3 are:
- * Upgrade the API to use Java 5 features, in particular generics. Make Java 6 the minimum
- supported version and get rid of the dependencies on Activation and the StAX API (which
- are included in the JRE in Java 6).
+ * Upgrade the API to use Java 5 features, in particular generics.
* Eliminate deprecated APIs and utility classes.
Modified: webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md?rev=1726481&r1=1726480&r2=1726481&view=diff
==============================================================================
--- webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md (original)
+++ webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md Sun Jan 24 12:13:45 2016
@@ -4,6 +4,9 @@ Apache Axiom 1.3.0 Release Note
Changes in this release
-----------------------
+* Axiom now requires at least Java 6. Explicit dependencies on APIs that were
+ not part of the JRE in Java 5 (Activation, StAX and JAXB) have been removed.
+
* The public API now uses generics. Note that this should in general not have
impact on binary compatibility with Axiom 1.2.x.
Modified: webservices/axiom/trunk/systests/eclipse-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/eclipse-tests/pom.xml?rev=1726481&r1=1726480&r2=1726481&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/eclipse-tests/pom.xml (original)
+++ webservices/axiom/trunk/systests/eclipse-tests/pom.xml Sun Jan 24 12:13:45 2016
@@ -43,12 +43,6 @@
<groupId>${project.groupId}</groupId>
<artifactId>axiom-api</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: webservices/axiom/trunk/systests/old-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/old-tests/pom.xml?rev=1726481&r1=1726480&r2=1726481&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/old-tests/pom.xml (original)
+++ webservices/axiom/trunk/systests/old-tests/pom.xml Sun Jan 24 12:13:45 2016
@@ -69,11 +69,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>${stax.impl.groupid}</groupId>
<artifactId>${stax.impl.artifact}</artifactId>
</dependency>
Modified: webservices/axiom/trunk/systests/osgi-tests/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/osgi-tests/pom.xml?rev=1726481&r1=1726480&r2=1726481&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/osgi-tests/pom.xml (original)
+++ webservices/axiom/trunk/systests/osgi-tests/pom.xml Sun Jan 24 12:13:45 2016
@@ -123,16 +123,6 @@
<artifactId>org.apache.servicemix.bundles.jaxp-ri</artifactId>
<version>1.4.5_1</version>
</artifact>
- <artifact>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jaxb-api-2.1</artifactId>
- <version>2.0.0</version>
- </artifact>
- <artifact>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
- <version>2.1.13_2</version>
- </artifact>
</artifacts>
</configuration>
</execution>
Modified: webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java?rev=1726481&r1=1726480&r2=1726481&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java (original)
+++ webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/FactoryTest.java Sun Jan 24 12:13:45 2016
@@ -47,7 +47,6 @@ public class FactoryTest {
@Configuration
public static Option[] configuration() {
return options(
- url("link:classpath:org.apache.geronimo.specs.geronimo-activation_1.1_spec.link"),
url("link:classpath:org.apache.servicemix.specs.stax-api-1.0.link"),
url("link:classpath:stax2-api.link"),
url("link:classpath:woodstox-core-asl.link"),
Modified: webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/JAXBTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/JAXBTest.java?rev=1726481&r1=1726480&r2=1726481&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/JAXBTest.java (original)
+++ webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/JAXBTest.java Sun Jan 24 12:13:45 2016
@@ -47,15 +47,9 @@ public class JAXBTest {
@Configuration
public static Option[] configuration() {
return options(
- url("link:classpath:org.apache.geronimo.specs.geronimo-activation_1.1_spec.link"),
- url("link:classpath:org.apache.servicemix.specs.stax-api-1.0.link"),
- url("link:classpath:stax2-api.link"),
- url("link:classpath:woodstox-core-asl.link"),
url("link:classpath:org.apache.james.apache-mime4j-core.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-impl.link"),
- url("link:classpath:org.apache.servicemix.specs.jaxb-api-2.1.link"),
- url("link:classpath:org.apache.servicemix.bundles.jaxb-impl.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-jaxb.link"),
junitBundles());
}
Modified: webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SJSXPTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SJSXPTest.java?rev=1726481&r1=1726480&r2=1726481&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SJSXPTest.java (original)
+++ webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SJSXPTest.java Sun Jan 24 12:13:45 2016
@@ -48,7 +48,6 @@ public class SJSXPTest {
@Configuration
public static Option[] configuration() {
return options(
- url("link:classpath:org.apache.geronimo.specs.geronimo-activation_1.1_spec.link"),
url("link:classpath:org.apache.servicemix.specs.stax-api-1.0.link"),
url("link:classpath:org.apache.servicemix.bundles.jaxp-ri.link"),
url("link:classpath:org.apache.james.apache-mime4j-core.link"),
Modified: webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SystemDepsTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SystemDepsTest.java?rev=1726481&r1=1726480&r2=1726481&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SystemDepsTest.java (original)
+++ webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/SystemDepsTest.java Sun Jan 24 12:13:45 2016
@@ -36,11 +36,7 @@ import org.ops4j.pax.exam.spi.reactors.E
import org.ops4j.pax.exam.spi.reactors.PerClass;
/**
- * Tests that Axiom works properly if the Activation and StAX APIs are resolved from the framework
- * bundle (i.e. from the JRE). This also tests that Axiom works with the StAX implementation from
- * the JRE.
- * <p>
- * Note that this test relies on the fact that the Maven build requires at least Java 1.6.
+ * Tests that Axiom works properly with the StAX implementation from the JRE.
*/
@RunWith(PaxExam.class)
@ExamReactorStrategy(PerClass.class)
Modified: webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java?rev=1726481&r1=1726480&r2=1726481&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java (original)
+++ webservices/axiom/trunk/systests/osgi-tests/src/test/java/org/apache/axiom/test/UsesConstraintsTest.java Sun Jan 24 12:13:45 2016
@@ -103,7 +103,6 @@ public class UsesConstraintsTest {
context.addFrameworkListener(listener);
List<Bundle> bundles = new ArrayList<Bundle>();
bundles.add(context.installBundle("link:classpath:META-INF/links/org.ops4j.pax.logging.api.link"));
- bundles.add(context.installBundle("link:classpath:org.apache.geronimo.specs.geronimo-activation_1.1_spec.link"));
bundles.add(context.installBundle("link:classpath:org.apache.servicemix.specs.stax-api-1.0.link"));
bundles.add(context.installBundle("link:classpath:stax2-api.link"));
bundles.add(context.installBundle("link:classpath:woodstox-core-asl.link"));
Modified: webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml?rev=1726481&r1=1726480&r2=1726481&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml (original)
+++ webservices/axiom/trunk/testing/spring-ws-testsuite/pom.xml Sun Jan 24 12:13:45 2016
@@ -75,14 +75,6 @@
<artifactId>jaxen</artifactId>
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-oxm</artifactId>
</dependency>
Modified: webservices/axiom/trunk/userguide/src/docbkx/userguide.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/userguide/src/docbkx/userguide.xml?rev=1726481&r1=1726480&r2=1726481&view=diff
==============================================================================
--- webservices/axiom/trunk/userguide/src/docbkx/userguide.xml (original)
+++ webservices/axiom/trunk/userguide/src/docbkx/userguide.xml Sun Jan 24 12:13:45 2016
@@ -821,13 +821,11 @@ try {
<title>Integrating Axiom into your project</title>
<section xml:id="using-maven2">
<title>Using Axiom in a Maven 2 project</title>
- <section>
- <title>Adding Axiom as a dependency</title>
- <para>
- If your project uses Maven 2, it is fairly easy to add Axiom to your project.
- Simply add the following entries to the <tag class="element">dependencies</tag>
- section of <filename>pom.xml</filename>:
- </para>
+ <para>
+ If your project uses Maven 2, it is fairly easy to add Axiom to your project.
+ Simply add the following entries to the <tag class="element">dependencies</tag>
+ section of <filename>pom.xml</filename>:
+ </para>
<programlisting><![CDATA[<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-api</artifactId>
@@ -839,12 +837,12 @@ try {
<version>]]>&version;<![CDATA[</version>
<scope>runtime</scope>
</dependency>]]></programlisting>
- <para>
- All Axiom releases are deployed to the Maven central repository and there is no need
- to add an entry to the <tag class="element">repositories</tag> section.
- However, if you want to work with the development (snapshot) version of Axiom, it
- is necessary to add the Apache Snapshot Repository:
- </para>
+ <para>
+ All Axiom releases are deployed to the Maven central repository and there is no need
+ to add an entry to the <tag class="element">repositories</tag> section.
+ However, if you want to work with the development (snapshot) version of Axiom, it
+ is necessary to add the Apache Snapshot Repository:
+ </para>
<programlisting><![CDATA[<repository>
<id>apache.snapshots</id>
<name>Apache Snapshot Repository</name>
@@ -853,50 +851,13 @@ try {
<enabled>false</enabled>
</releases>
</repository>]]></programlisting>
- <tip>
- <para>
- If you are working on another Apache project, you don't need to add the snapshot repository
- in the POM file since it is already declared in the <literal>org.apache:apache</literal>
- parent POM.
- </para>
- </tip>
- </section>
- <section>
- <title>Managing the JAF dependency</title>
- <para>
- Axiom requires the Java Activation Framework (JAF) to work. There are two
- commonly used incarnations of this library: one is Sun's reference implementation, the other
- is part of the <link xlink:href="http://geronimo.apache.org/">Geronimo</link> project. Axiom declares
- a dependency on the Geronimo version.
- If your project uses another library that depends on JAF, but that refers
- to Sun's implementation, your project will end up with dependencies on two different
- artifacts implementing the same API.
- </para>
- <para>
- If you prefer Sun's implementations, then you should change the declaration of the
- Axiom dependencies in your POM file as follow:
- </para>
-<programlisting><![CDATA[
-<dependency>
- <groupId>org.apache.ws.commons.axiom</groupId>
- <artifactId>axiom-]]><replaceable>xxx</replaceable><![CDATA[</artifactId>
- <version>]]>&version;<![CDATA[</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </exclusion>
- </exclusions>
-</dependency>
-]]></programlisting>
+ <tip>
<para>
- If you prefer Geronimo's implementation, then you need to identify the libraries
- depending on Sun's artifact (<literal>javax.activation:activation</literal>)
- and add the relevant exclusions. You can use
- <userinput>mvn dependency:tree</userinput> to easily identify where a transitive dependency
- comes from.
+ If you are working on another Apache project, you don't need to add the snapshot repository
+ in the POM file since it is already declared in the <literal>org.apache:apache</literal>
+ parent POM.
</para>
- </section>
+ </tip>
</section>
<section>
<title>Applying application wide configuration</title>