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/04 20:23:47 UTC
svn commit: r1793895 - in /axis/axis2/java/core/branches/1_7: ./
modules/osgi-tests/pom.xml modules/osgi-tests/src/test/java/OSGiTest.java
modules/osgi/pom.xml
Author: veithen
Date: Thu May 4 20:23:47 2017
New Revision: 1793895
URL: http://svn.apache.org/viewvc?rev=1793895&view=rev
Log:
AXIS2-4947: Merge r1793728 to the 1.7 branch.
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/osgi-tests/pom.xml
axis/axis2/java/core/branches/1_7/modules/osgi-tests/src/test/java/OSGiTest.java
axis/axis2/java/core/branches/1_7/modules/osgi/pom.xml
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu May 4 20:23:47 2017
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057,1752039,1765132,1765183,1765188,1765193,1775081,1775102,1776253,1776585,1776594,1778204,1780290,1787632,1789029,1792353,1792376,1792650,1792655,1792802,1792804,1793723-1793724
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773,1733850,1734176,1735331,1735795,1736512,1736543,1737030,1737567,1739001,1739186,1739343,1739346,1739348,1739493,1739592,1739594-1739595,1739815,1739826,1740693-1740694,1741976,1742201,1743824,1745826,1745860,1745869,1745875,1745912,1745924,1745929,1745941,1746001,1746028,1746109,1746782,1746784,1746787,1746813,1746842,1746880,1746883,1746889,1746894,1747448,1747466,1747503,1747575,1747578,1747601,1747773,1747920,1751057,1752039,1765132,1765183,1765188,1765193,1775081,1775102,1776253,1776585,1776594,1778204,1780290,1787632,1789029,1792353,1792376,1792650,1792655,1792802,1792804,1793723-1793724,1793728
Modified: axis/axis2/java/core/branches/1_7/modules/osgi-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/osgi-tests/pom.xml?rev=1793895&r1=1793894&r2=1793895&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/osgi-tests/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/osgi-tests/pom.xml Thu May 4 20:23:47 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.specs</groupId>
<artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
<version>2.2.0</version>
Modified: axis/axis2/java/core/branches/1_7/modules/osgi-tests/src/test/java/OSGiTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/osgi-tests/src/test/java/OSGiTest.java?rev=1793895&r1=1793894&r2=1793895&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/osgi-tests/src/test/java/OSGiTest.java (original)
+++ axis/axis2/java/core/branches/1_7/modules/osgi-tests/src/test/java/OSGiTest.java Thu May 4 20:23:47 2017
@@ -64,7 +64,6 @@ public class OSGiTest {
url("link:classpath:org.apache.geronimo.specs.geronimo-ws-metadata_2.0_spec.link"),
url("link:classpath:org.apache.geronimo.specs.geronimo-javamail_1.4_spec.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.servicemix.specs.stax-api-1.0.link"),
url("link:classpath:stax2-api.link"),
url("link:classpath:woodstox-core-asl.link"),
Modified: axis/axis2/java/core/branches/1_7/modules/osgi/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/osgi/pom.xml?rev=1793895&r1=1793894&r2=1793895&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/osgi/pom.xml (original)
+++ axis/axis2/java/core/branches/1_7/modules/osgi/pom.xml Thu May 4 20:23:47 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,