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 ro...@apache.org on 2025/11/15 18:01:30 UTC
(axis-axis2-java-core) 01/01: Merge pull request #1027 from apache/bugfix/remove-geronimo-api
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
commit 0f4d12d2c563e41a235596ce7daf4a1f6ef72bb8
Merge: 1b24496842 fb24cef21e
Author: robertlazarski <58...@users.noreply.github.com>
AuthorDate: Sat Nov 15 08:01:24 2025 -1000
Merge pull request #1027 from apache/bugfix/remove-geronimo-api
fix: remove old geronimo javax APIs
modules/distribution/pom.xml | 6 ------
modules/jaxws-integration/pom.xml | 12 ++++-------
.../axis2/jaxws/context/MessageContextImpl.java | 4 ++--
.../sample/addnumbers/AddNumbersPortTypeImpl.java | 2 +-
.../AddNumbersHandlerPortTypeImpl.java | 2 +-
.../AddNumbersLogicalHandler2.java | 2 +-
.../AddNumbersProtocolHandler.java | 2 +-
.../FaultsServiceSoapBindingImpl.java | 6 +++---
.../headershandler/HeadersHandlerPortTypeImpl.java | 2 +-
.../ResourceInjectionPortTypeImpl.java | 6 +++---
.../datasource/XMessageDataSourceProvider.java | 2 +-
.../message/source/XMessageSourceProvider.java | 2 +-
modules/jaxws/pom.xml | 8 --------
.../jaxws/lifecycle/BaseLifecycleManager.java | 4 ++--
...eInjectionServiceRuntimeDescriptionBuilder.java | 6 +++---
.../impl/WebServiceContextInjectorImpl.java | 2 +-
.../axis2/jaxws/spi/handler/LifecycleManager.java | 4 ++--
.../sample/addnumbers/AddNumbersPortTypeImpl.java | 2 +-
.../injection/ResourceInjectionTestImpl1.java | 6 +++---
.../injection/ResourceInjectionTestImpl2.java | 6 +++---
.../injection/ResourceInjectionTestImpl3.java | 6 +++---
.../injection/ResourceInjectionTestImpl4.java | 6 +++---
.../injection/ResourceInjectionTestImpl5.java | 6 +++---
.../jaxws/spi/handler/DummyLogicalHandler.java | 2 +-
modules/json/pom.xml | 4 ++++
.../org/apache/axis2/json/moshi/rpc/JsonUtils.java | 4 +---
modules/kernel/pom.xml | 4 ----
modules/metadata/pom.xml | 4 ----
modules/samples/book/pom.xml | 10 ----------
modules/samples/jaxws-addressbook/pom.xml | 6 +++++-
.../axis2/jaxws/addressbook/AddressBookClient.java | 4 +---
modules/samples/jaxws-calculator/pom.xml | 11 ++++++++++-
.../axis2/jaxws/calculator/CalculatorServer.java | 2 +-
.../axis2/jaxws/calculator/CalculatorService.java | 2 +-
.../sample/dynamic/DynamicServiceProvider.java | 2 +-
modules/samples/jaxws-interop/pom.xml | 11 ++++++++---
.../userguide/src/userguide/springbootdemo/pom.xml | 10 ----------
.../axis2-idea-plugin/idea-plugin-aseembly.xml | 2 --
modules/webapp/pom.xml | 6 ------
pom.xml | 23 +++++-----------------
40 files changed, 81 insertions(+), 130 deletions(-)
diff --cc pom.xml
index 41265fbf3c,e4f9b781cc..bfce9f19bd
--- a/pom.xml
+++ b/pom.xml
@@@ -472,18 -472,15 +472,15 @@@
<commons.fileupload.version>2.0.0-M4</commons.fileupload.version>
<commons.logging.version>1.3.5</commons.logging.version>
<fi.version>2.1.1</fi.version>
- <geronimo.spec.annotation.version>1.1.1</geronimo.spec.annotation.version>
- <geronimo.spec.metadata.version>1.1.3</geronimo.spec.metadata.version>
- <geronimo.spec.jaxws.version>1.2</geronimo.spec.jaxws.version>
<google.gson.version>2.13.1</google.gson.version>
- <groovy.version>5.0.1</groovy.version>
+ <groovy.version>5.0.2</groovy.version>
<httpcore.version>5.3.4</httpcore.version>
- <httpclient.version>5.5</httpclient.version>
+ <httpclient.version>5.5.1</httpclient.version>
<intellij.version>5.0</intellij.version>
<jaxbri.version>4.0.3</jaxbri.version>
- <jetty.version>12.1.1</jetty.version>
- <jibx.version>1.4.2</jibx.version>
- <maven.archiver.version>3.6.4</maven.archiver.version>
+ <jetty.version>12.1.4</jetty.version>
+ <jibx.version>1.4.5</jibx.version>
+ <maven.archiver.version>3.6.5</maven.archiver.version>
<maven.version>3.9.11</maven.version>
<rhino.version>1.8.0</rhino.version>
<slf4j.version>2.0.17</slf4j.version>
@@@ -744,23 -741,8 +741,8 @@@
<dependency>
<groupId>org.eclipse.angus</groupId>
<artifactId>angus-mail</artifactId>
- <version>2.0.4</version>
+ <version>2.0.5</version>
</dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>${geronimo.spec.annotation.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- <version>${geronimo.spec.metadata.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.2_spec</artifactId>
- <version>${geronimo.spec.jaxws.version}</version>
- </dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
@@@ -1035,8 -1017,13 +1017,13 @@@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
- <version>1.81</version>
+ <version>1.82</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>3.0.0</version>
+ </dependency>
</dependencies>
</dependencyManagement>