This is an automated email from the ASF dual-hosted git repository.
robertlazarski pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git
The following commit(s) were added to refs/heads/master by this push:
new 8a83cf2fdb AXIS2-6076 some updates on OSGi support however the unit
tests are broken and there may not be further development without community
support due to the complexity and lack of users
8a83cf2fdb is described below
commit 8a83cf2fdbcfd8826967e6784675a2fdcb38d015
Author: Robert Lazarski <[email protected]>
AuthorDate: Thu Nov 28 09:52:33 2024 -1000
AXIS2-6076 some updates on OSGi support however the unit tests are broken
and there may not be further development without community support due to the
complexity and lack of users
---
modules/osgi-tests/pom.xml | 30 ++++++++++++--------------
modules/osgi-tests/src/test/java/OSGiTest.java | 16 +++++++-------
pom.xml | 27 +++++++++--------------
3 files changed, 32 insertions(+), 41 deletions(-)
diff --git a/modules/osgi-tests/pom.xml b/modules/osgi-tests/pom.xml
index 8bd7202925..714cbf54c2 100644
--- a/modules/osgi-tests/pom.xml
+++ b/modules/osgi-tests/pom.xml
@@ -56,9 +56,12 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-fileupload2-jakarta-servlet6</artifactId>
</dependency>
<dependency>
<groupId>com.sun.activation</groupId>
@@ -118,45 +121,40 @@
<artifact>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.jetty</artifactId>
- <version>2.2.2</version>
+ <version>5.1.26</version>
</artifact>
<artifact>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.whiteboard</artifactId>
- <version>2.2.2</version>
+ <version>4.0.0</version>
</artifact>
<artifact>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>1.8.0</version>
+ <version>1.9.26</version>
</artifact>
<artifact>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
- <version>1.6.2_6</version>
+ <version>1.6.3_1</version>
</artifact>
<artifact>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-servlet_2.5_spec</artifactId>
<version>1.2</version>
</artifact>
- <artifact>
-
<groupId>org.apache.servicemix.bundles</groupId>
-
<artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
- <version>3.1_7</version>
- </artifact>
<artifact>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
<version>1.3_5</version>
</artifact>
<artifact>
-
<groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-osgi</artifactId>
+
<groupId>org.apache.httpcomponents.core5</groupId>
+ <artifactId>httpcore5-osgi</artifactId>
</artifact>
<artifact>
-
<groupId>org.apache.httpcomponents</groupId>
-
<artifactId>httpclient-osgi</artifactId>
+
<groupId>org.apache.httpcomponents.client5</groupId>
+
<artifactId>httpclient5-osgi</artifactId>
</artifact>
</artifacts>
</artifactSet>
diff --git a/modules/osgi-tests/src/test/java/OSGiTest.java
b/modules/osgi-tests/src/test/java/OSGiTest.java
index f58b3283ac..a1bc0bab01 100644
--- a/modules/osgi-tests/src/test/java/OSGiTest.java
+++ b/modules/osgi-tests/src/test/java/OSGiTest.java
@@ -61,20 +61,20 @@ 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.jakata.activation.link"),
- url("link:classpath:com.sun.mail.jakarta.mail.link"), // TODO:
should no longer be necessary
-
url("link:classpath:org.apache.geronimo.specs.geronimo-servlet_2.5_spec.link"),
+ url("link:classpath:jakarta.activation.link"),
+ url("link:classpath:jakarta.mail.link"), // TODO: should no
longer be necessary
+ // no obvious replacement in Maven Central ?
url("link:classpath:org.apache.geronimo.specs.geronimo-servlet_2.5_spec.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.ws.commons.axiom.axiom-javax-activation.link"),
+
url("link:classpath:org.apache.ws.commons.axiom.axiom-jakarta-activation.link"),
url("link:classpath:org.apache.ws.commons.axiom.axiom-legacy-attachments.link"),
-
url("link:classpath:org.apache.commons.commons-fileupload.link"),
+ url("link:classpath:commons-fileupload2-core.link"),
url("link:classpath:org.apache.commons.commons-io.link"),
-
url("link:classpath:org.apache.servicemix.bundles.commons-httpclient.link"), //
TODO: still necessary???
+ //
url("link:classpath:org.apache.servicemix.bundles.commons-httpclient.link"), //
TODO: still necessary???
url("link:classpath:org.apache.servicemix.bundles.commons-codec.link"), //
TODO: still necessary???
- url("link:classpath:org.apache.httpcomponents.httpcore.link"),
-
url("link:classpath:org.apache.httpcomponents.httpclient.link"),
+ url("link:classpath:org.apache.hc.core5.link"),
+ url("link:classpath:org.apache.hc.client5.link"),
url("link:classpath:org.apache.neethi.link"),
url("link:classpath:org.apache.woden.core.link"),
url("link:classpath:org.apache.ws.xmlschema.core.link"),
diff --git a/pom.xml b/pom.xml
index 46718270b7..742995ed22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -425,7 +425,7 @@
<module>modules/clustering</module>
<module>modules/corba</module>
<module>modules/osgi</module>
- <!-- FIXME AXIS2-6051, need to figure out OSGI
+ <!-- FIXME AXIS2-6076, need to figure out OSGI
in the transition to jakarta
<module>modules/osgi-tests</module>
-->
@@ -776,18 +776,18 @@
<artifactId>httpclient5</artifactId>
<version>${httpclient.version}</version>
</dependency>
- <!-- FIXME
+ <!--
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-osgi</artifactId>
- <version>${httpcore.version}</version>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5-osgi</artifactId>
+ <version>5.0-beta2</version>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-osgi</artifactId>
- <version>${httpclient.version}</version>
+ <groupId>org.apache.httpcomponents.core5</groupId>
+ <artifactId>httpcore5-osgi</artifactId>
+ <version>5.0-beta5</version>
</dependency>
- -->
+ -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-fileupload2-core</artifactId>
@@ -931,13 +931,6 @@
<artifactId>org.eclipse.ui.ide</artifactId>
<version>3.22.300</version>
</dependency>
- <!--
- <dependency>
- <groupId>osgi.bundle</groupId>
- <artifactId>org.eclipse.ui.ide</artifactId>
- <version>3.17.100.v20200530-0835</version>
- </dependency>
- -->
<dependency>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.ui.workbench</artifactId>
@@ -1169,7 +1162,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.9</version>
+ <version>6.0.0</version>
</plugin>
<plugin>
<groupId>net.nicoulaj.maven.plugins</groupId>
