You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/05/03 22:24:07 UTC
svn commit: r1793728 - in /axis/axis2/java/core/trunk/modules:
osgi-tests/pom.xml osgi-tests/src/test/java/OSGiTest.java osgi/pom.xml
Author: veithen
Date: Wed May 3 22:24:07 2017
New Revision: 1793728
URL: http://svn.apache.org/viewvc?rev=1793728&view=rev
Log:
AXIS2-4947: Make the javax.ws.rs import optional and let BND determine the version.
Modified:
axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml
axis/axis2/java/core/trunk/modules/osgi-tests/src/test/java/OSGiTest.java
axis/axis2/java/core/trunk/modules/osgi/pom.xml
Modified: axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml?rev=1793728&r1=1793727&r2=1793728&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml Wed May 3 22:24:07 2017
@@ -126,11 +126,6 @@
<version>1.2</version>
</artifact>
<artifact>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxrs_1.1_spec</artifactId>
- <version>1.0</version>
- </artifact>
- <artifact>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
<version>3.1_7</version>
Modified: axis/axis2/java/core/trunk/modules/osgi-tests/src/test/java/OSGiTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/osgi-tests/src/test/java/OSGiTest.java?rev=1793728&r1=1793727&r2=1793728&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/osgi-tests/src/test/java/OSGiTest.java (original)
+++ axis/axis2/java/core/trunk/modules/osgi-tests/src/test/java/OSGiTest.java Wed May 3 22:24:07 2017
@@ -63,7 +63,6 @@ public class OSGiTest {
url("link:classpath:org.apache.geronimo.specs.geronimo-ws-metadata_2.0_spec.link"),
url("link:classpath:com.sun.mail.javax.mail.link"), // TODO: should no longer be necessary
url("link:classpath:org.apache.geronimo.specs.geronimo-servlet_2.5_spec.link"),
- url("link:classpath:org.apache.geronimo.specs.geronimo-jaxrs_1.1_spec.link"), // TODO: shouldn't this be optional???
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"),
Modified: axis/axis2/java/core/trunk/modules/osgi/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/osgi/pom.xml?rev=1793728&r1=1793727&r2=1793728&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/osgi/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/osgi/pom.xml Wed May 3 22:24:07 2017
@@ -82,7 +82,7 @@
<Import-Package>
javax.xml.namespace,
!org.apache.axis2.*,
- javax.ws.rs; version=1.0,
+ javax.ws.rs; resolution:=optional,
javax.servlet; version=2.4.0,
javax.servlet.http; version=2.4.0,
javax.transaction,