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/01/28 14:44:34 UTC
svn commit: r1780703 - in /axis/axis2/java/core/trunk:
modules/osgi-tests/pom.xml modules/osgi/pom.xml pom.xml
Author: veithen
Date: Sat Jan 28 14:44:34 2017
New Revision: 1780703
URL: http://svn.apache.org/viewvc?rev=1780703&view=rev
Log:
Fix OSGi bundle.
Modified:
axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml
axis/axis2/java/core/trunk/modules/osgi/pom.xml
axis/axis2/java/core/trunk/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=1780703&r1=1780702&r2=1780703&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/osgi-tests/pom.xml Sat Jan 28 14:44:34 2017
@@ -155,12 +155,10 @@
<artifact>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-osgi</artifactId>
- <version>4.2.1</version>
</artifact>
<artifact>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient-osgi</artifactId>
- <version>4.2.1</version>
</artifact>
</artifacts>
<paxExam>${exam.version}</paxExam>
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=1780703&r1=1780702&r2=1780703&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/osgi/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/osgi/pom.xml Sat Jan 28 14:44:34 2017
@@ -117,36 +117,15 @@
javax.xml.datatype.*,
org.apache.axiom.*,
org.apache.commons.fileupload.*,
- org.apache.commons.httpclient.*,
org.apache.commons.lang;resolution:=optional,
org.apache.commons.logging,
- org.apache.http;resolution:=optional,
- org.apache.http.entity;resolution:=optional,
- org.apache.http.impl;resolution:=optional,
- org.apache.http.impl.entity;resolution:=optional,
- org.apache.http.impl.io;resolution:=optional,
- org.apache.http.impl.auth;resolution:=optional,
- org.apache.http.impl.conn;resolution:=optional,
- org.apache.http.io;resolution:=optional,
- org.apache.http.message;resolution:=optional,
- org.apache.http.params;resolution:=optional,
- org.apache.http.protocol;resolution:=optional,
- org.apache.http.util;resolution:=optional,
org.apache.neethi,
org.apache.woden.*;version="0.0.0",
org.apache.ws.commons.schema.*,
org.w3c.dom;resolution:=optional,
org.w3c.dom.traversal;resolution:=optional,
org.xml.sax;resolution:=optional,
- org.apache.http.client.*,
- org.apache.http.auth;resolution:=optional,
- org.apache.http.auth.params;resolution:=optional,
- org.apache.http.conn;resolution:=optional,
- org.apache.http.conn.params;resolution:=optional,
- org.apache.http.conn.scheme;resolution:=optional,
- org.apache.http.conn.ssl;resolution:=optional,
- org.apache.http.impl.client;resolution:=optional,
- org.apache.http.impl.conn.tsccm;resolution:=optional
+ *
</Import-Package>
<Private-Package>
org.apache.axis2.osgi.internal,
Modified: axis/axis2/java/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1780703&r1=1780702&r2=1780703&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/pom.xml (original)
+++ axis/axis2/java/core/trunk/pom.xml Sat Jan 28 14:44:34 2017
@@ -519,6 +519,7 @@
<geronimo.spec.metadata.version>1.1.2</geronimo.spec.metadata.version>
<geronimo.spec.jaxws.version>1.0</geronimo.spec.jaxws.version>
<google.gson.version>2.1</google.gson.version>
+ <httpcore.version>4.4.6</httpcore.version>
<httpclient.version>4.5.3</httpclient.version>
<intellij.version>5.0</intellij.version>
<jalopy.version>1.5rc3</jalopy.version>
@@ -830,10 +831,25 @@
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${httpcore.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
+ <version>${httpcore.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ <version>${httpclient.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>${commons.fileupload.version}</version>