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 2018/10/17 22:38:23 UTC
svn commit: r1844183 - in /axis/axis2/java/core/trunk:
databinding-tests/jaxbri-tests/pom.xml modules/distribution/pom.xml
modules/osgi-tests/pom.xml modules/osgi-tests/src/test/java/OSGiTest.java
modules/webapp/pom.xml pom.xml
Author: veithen
Date: Wed Oct 17 22:38:22 2018
New Revision: 1844183
URL: http://svn.apache.org/viewvc?rev=1844183&view=rev
Log:
Adapt to changes in Axiom.
Modified:
axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml
axis/axis2/java/core/trunk/modules/distribution/pom.xml
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/webapp/pom.xml
axis/axis2/java/core/trunk/pom.xml
Modified: axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml?rev=1844183&r1=1844182&r2=1844183&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml (original)
+++ axis/axis2/java/core/trunk/databinding-tests/jaxbri-tests/pom.xml Wed Oct 17 22:38:22 2018
@@ -29,6 +29,11 @@
<url>http://axis.apache.org/axis2/java/core/</url>
<dependencies>
<dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-jaxb</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>axis2-transport-http</artifactId>
<version>${project.version}</version>
Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=1844183&r1=1844182&r2=1844183&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Wed Oct 17 22:38:22 2018
@@ -165,6 +165,10 @@
<artifactId>axis2-transport-local</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-jaxb</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
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=1844183&r1=1844182&r2=1844183&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml Wed Oct 17 22:38:22 2018
@@ -126,6 +126,10 @@
<version>1.2</version>
</artifact>
<artifact>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ </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=1844183&r1=1844182&r2=1844183&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 Oct 17 22:38:22 2018
@@ -61,6 +61,7 @@ public class OSGiTest {
url("link:classpath:org.apache.felix.configadmin.link"),
url("link:classpath:org.apache.servicemix.bundles.wsdl4j.link"),
url("link:classpath:org.apache.geronimo.specs.geronimo-ws-metadata_2.0_spec.link"),
+ url("link:classpath:com.sun.activation.javax.activation.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.james.apache-mime4j-core.link"),
Modified: axis/axis2/java/core/trunk/modules/webapp/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/pom.xml?rev=1844183&r1=1844182&r2=1844183&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/webapp/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/webapp/pom.xml Wed Oct 17 22:38:22 2018
@@ -232,6 +232,10 @@
<artifactId>taglibs-standard-impl</artifactId>
<version>1.2.5</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-jaxb</artifactId>
+ </dependency>
</dependencies>
<build>
<finalName>axis2-${project.version}</finalName>
Modified: axis/axis2/java/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1844183&r1=1844182&r2=1844183&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Wed Oct 17 22:38:22 2018
@@ -601,6 +601,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>${jaxbri.version}</version>