Skip to content

Commit 8a83cf2

Browse files
robertlazarskirobertlazarski
committed
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
1 parent a389e4f commit 8a83cf2

File tree

3 files changed

+32
-41
lines changed

3 files changed

+32
-41
lines changed

‎modules/osgi-tests/pom.xml‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,12 @@
5656
<scope>test</scope>
5757
</dependency>
5858
<dependency>
59-
<groupId>commons-fileupload</groupId>
60-
<artifactId>commons-fileupload</artifactId>
61-
<scope>test</scope>
59+
<groupId>org.apache.commons</groupId>
60+
<artifactId>commons-fileupload2-core</artifactId>
61+
</dependency>
62+
<dependency>
63+
<groupId>org.apache.commons</groupId>
64+
<artifactId>commons-fileupload2-jakarta-servlet6</artifactId>
6265
</dependency>
6366
<dependency>
6467
<groupId>com.sun.activation</groupId>
@@ -118,45 +121,40 @@
118121
<artifact>
119122
<groupId>org.apache.felix</groupId>
120123
<artifactId>org.apache.felix.http.jetty</artifactId>
121-
<version>2.2.2</version>
124+
<version>5.1.26</version>
122125
</artifact>
123126
<artifact>
124127
<groupId>org.apache.felix</groupId>
125128
<artifactId>org.apache.felix.http.whiteboard</artifactId>
126-
<version>2.2.2</version>
129+
<version>4.0.0</version>
127130
</artifact>
128131
<artifact>
129132
<groupId>org.apache.felix</groupId>
130133
<artifactId>org.apache.felix.configadmin</artifactId>
131-
<version>1.8.0</version>
134+
<version>1.9.26</version>
132135
</artifact>
133136
<artifact>
134137
<groupId>org.apache.servicemix.bundles</groupId>
135138
<artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
136-
<version>1.6.2_6</version>
139+
<version>1.6.3_1</version>
137140
</artifact>
138141
<artifact>
139142
<groupId>org.apache.geronimo.specs</groupId>
140143
<artifactId>geronimo-servlet_2.5_spec</artifactId>
141144
<version>1.2</version>
142145
</artifact>
143-
<artifact>
144-
<groupId>org.apache.servicemix.bundles</groupId>
145-
<artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
146-
<version>3.1_7</version>
147-
</artifact>
148146
<artifact>
149147
<groupId>org.apache.servicemix.bundles</groupId>
150148
<artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
151149
<version>1.3_5</version>
152150
</artifact>
153151
<artifact>
154-
<groupId>org.apache.httpcomponents</groupId>
155-
<artifactId>httpcore-osgi</artifactId>
152+
<groupId>org.apache.httpcomponents.core5</groupId>
153+
<artifactId>httpcore5-osgi</artifactId>
156154
</artifact>
157155
<artifact>
158-
<groupId>org.apache.httpcomponents</groupId>
159-
<artifactId>httpclient-osgi</artifactId>
156+
<groupId>org.apache.httpcomponents.client5</groupId>
157+
<artifactId>httpclient5-osgi</artifactId>
160158
</artifact>
161159
</artifacts>
162160
</artifactSet>

‎modules/osgi-tests/src/test/java/OSGiTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,20 @@ public void test() throws Throwable {
6161
url("link:classpath:org.apache.felix.configadmin.link"),
6262
url("link:classpath:org.apache.servicemix.bundles.wsdl4j.link"),
6363
url("link:classpath:org.apache.geronimo.specs.geronimo-ws-metadata_2.0_spec.link"),
64-
url("link:classpath:com.sun.activation.jakata.activation.link"),
65-
url("link:classpath:com.sun.mail.jakarta.mail.link"), // TODO: should no longer be necessary
66-
url("link:classpath:org.apache.geronimo.specs.geronimo-servlet_2.5_spec.link"),
64+
url("link:classpath:jakarta.activation.link"),
65+
url("link:classpath:jakarta.mail.link"), // TODO: should no longer be necessary
66+
// no obvious replacement in Maven Central ? url("link:classpath:org.apache.geronimo.specs.geronimo-servlet_2.5_spec.link"),
6767
url("link:classpath:org.apache.james.apache-mime4j-core.link"),
6868
url("link:classpath:org.apache.ws.commons.axiom.axiom-api.link"),
6969
url("link:classpath:org.apache.ws.commons.axiom.axiom-impl.link"),
70-
url("link:classpath:org.apache.ws.commons.axiom.axiom-javax-activation.link"),
70+
url("link:classpath:org.apache.ws.commons.axiom.axiom-jakarta-activation.link"),
7171
url("link:classpath:org.apache.ws.commons.axiom.axiom-legacy-attachments.link"),
72-
url("link:classpath:org.apache.commons.commons-fileupload.link"),
72+
url("link:classpath:commons-fileupload2-core.link"),
7373
url("link:classpath:org.apache.commons.commons-io.link"),
74-
url("link:classpath:org.apache.servicemix.bundles.commons-httpclient.link"), // TODO: still necessary???
74+
// url("link:classpath:org.apache.servicemix.bundles.commons-httpclient.link"), // TODO: still necessary???
7575
url("link:classpath:org.apache.servicemix.bundles.commons-codec.link"), // TODO: still necessary???
76-
url("link:classpath:org.apache.httpcomponents.httpcore.link"),
77-
url("link:classpath:org.apache.httpcomponents.httpclient.link"),
76+
url("link:classpath:org.apache.hc.core5.link"),
77+
url("link:classpath:org.apache.hc.client5.link"),
7878
url("link:classpath:org.apache.neethi.link"),
7979
url("link:classpath:org.apache.woden.core.link"),
8080
url("link:classpath:org.apache.ws.xmlschema.core.link"),

‎pom.xml‎

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@
425425
<module>modules/clustering</module>
426426
<module>modules/corba</module>
427427
<module>modules/osgi</module>
428-
<!-- FIXME AXIS2-6051, need to figure out OSGI
428+
<!-- FIXME AXIS2-6076, need to figure out OSGI
429429
in the transition to jakarta
430430
<module>modules/osgi-tests</module>
431431
-->
@@ -776,18 +776,18 @@
776776
<artifactId>httpclient5</artifactId>
777777
<version>${httpclient.version}</version>
778778
</dependency>
779-
<!-- FIXME
779+
<!--
780780
<dependency>
781-
<groupId>org.apache.httpcomponents</groupId>
782-
<artifactId>httpcore-osgi</artifactId>
783-
<version>${httpcore.version}</version>
781+
<groupId>org.apache.httpcomponents.client5</groupId>
782+
<artifactId>httpclient5-osgi</artifactId>
783+
<version>5.0-beta2</version>
784784
</dependency>
785785
<dependency>
786-
<groupId>org.apache.httpcomponents</groupId>
787-
<artifactId>httpclient-osgi</artifactId>
788-
<version>${httpclient.version}</version>
786+
<groupId>org.apache.httpcomponents.core5</groupId>
787+
<artifactId>httpcore5-osgi</artifactId>
788+
<version>5.0-beta5</version>
789789
</dependency>
790-
-->
790+
-->
791791
<dependency>
792792
<groupId>org.apache.commons</groupId>
793793
<artifactId>commons-fileupload2-core</artifactId>
@@ -931,13 +931,6 @@
931931
<artifactId>org.eclipse.ui.ide</artifactId>
932932
<version>3.22.300</version>
933933
</dependency>
934-
<!--
935-
<dependency>
936-
<groupId>osgi.bundle</groupId>
937-
<artifactId>org.eclipse.ui.ide</artifactId>
938-
<version>3.17.100.v20200530-0835</version>
939-
</dependency>
940-
-->
941934
<dependency>
942935
<groupId>org.eclipse.platform</groupId>
943936
<artifactId>org.eclipse.ui.workbench</artifactId>
@@ -1169,7 +1162,7 @@
11691162
<plugin>
11701163
<groupId>org.apache.felix</groupId>
11711164
<artifactId>maven-bundle-plugin</artifactId>
1172-
<version>5.1.9</version>
1165+
<version>6.0.0</version>
11731166
</plugin>
11741167
<plugin>
11751168
<groupId>net.nicoulaj.maven.plugins</groupId>

0 commit comments

Comments
 (0)