Jakartified versions update (#5304)

Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>

.github/workflows/maven.yml

@@ -24,7 +24,7 @@ jobs:
  strategy:
  matrix:
  java_version: [ 11 ]
- verify_profiles: [ '-Plicense_check' ]
+ verify_profiles: [ '-Plicense_check,staging' ]
  continue-on-error: false
 
  steps:
@@ -42,4 +42,4 @@ jobs:
  secLoc=`find $JAVA_HOME -name java.security`
  sed -i 's/jdk.tls.disabledAlgorithms/# jdk.tls.disabledAlgorithms/g' -i $secLoc
  - name: Build
- run: mvn -V -U -B ${{matrix.verify_profiles}} org.eclipse.dash:license-tool-plugin:license-check -DexcludeArtifactIds=bsh,jmh-core,jmh-generator-annprocess,swing-layout
+ run: mvn -V -U -B ${{matrix.verify_profiles}} org.eclipse.dash:license-tool-plugin:license-check -DexcludeArtifactIds=bsh,jmh-core,jmh-generator-annprocess,swing-layout

core-client/pom.xml

@@ -120,8 +120,8 @@
 
  <dependency>
  <!-- not to warn about missing activation -->
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-activation</artifactId>
  <scope>test</scope>
  </dependency>
 

core-common/pom.xml

@@ -215,8 +215,8 @@
  <artifactId>jakarta.annotation-api</artifactId>
  </dependency>
  <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-activation</artifactId>
  <scope>provided</scope>
  <optional>true</optional>
  </dependency>

examples/extended-wadl-webapp/pom.xml

@@ -139,8 +139,8 @@
  <artifactId>jakarta.xml.bind-api</artifactId>
  </dependency>
  <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-activation</artifactId>
  </dependency>
  </dependencies>
 
@@ -177,7 +177,7 @@
  <dependency>
  <groupId>jakarta.activation</groupId>
  <artifactId>jakarta.activation-api</artifactId>
- <version>${jakarta.activation.version}</version>
+ <version>${jakarta.activation-api.version}</version>
  </dependency>
  <dependency>
  <groupId>jakarta.xml.bind</groupId>

examples/osgi-helloworld-webapp/functional-test/pom.xml

@@ -145,8 +145,8 @@
  <scope>test</scope>
  </dependency>
  <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-activation</artifactId>
  </dependency>
  <!-- uncomment the following dependency to get ability
  to run felix console in the test -->

examples/osgi-http-service/functional-test/pom.xml

@@ -238,8 +238,8 @@
  </activation>
  <dependencies>
  <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-activation</artifactId>
  </dependency>
  </dependencies>
  </profile>

media/moxy/pom.xml

@@ -104,6 +104,11 @@
  <groupId>org.eclipse.parsson</groupId>
  <artifactId>parsson</artifactId>
  </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>${asm.version}</version>
+ </dependency>
 
  <dependency>
  <groupId>org.eclipse.persistence</groupId>

pom.xml

@@ -1617,8 +1617,8 @@
  </dependency>
 
  <dependency>
- <groupId>com.sun.activation</groupId>
- <artifactId>jakarta.activation</artifactId>
+ <groupId>org.eclipse.angus</groupId>
+ <artifactId>angus-activation</artifactId>
  <version>${jakarta.activation.version}</version>
  </dependency>
 
@@ -2316,16 +2316,16 @@
  <grizzly2.version>4.0.0</grizzly2.version>
  <grizzly.client.version>1.16</grizzly.client.version>
  <grizzly.npn.version>2.0.0</grizzly.npn.version>
- <hk2.version>3.0.3</hk2.version>
+ <hk2.version>3.0.4</hk2.version>
  <hk2.osgi.version>org.glassfish.hk2.*;version="[3.0,4)"</hk2.osgi.version>
  <hk2.jvnet.osgi.version>org.jvnet.hk2.*;version="[3.0,4)"</hk2.jvnet.osgi.version>
- <hk2.config.version>7.0.0-M2</hk2.config.version>
- <jsp.version>3.1.0</jsp.version>
+ <hk2.config.version>7.0.3</hk2.config.version>
+ <jsp.version>3.1.1</jsp.version>
  <jstl.version>3.0.0</jstl.version>
  <jta.api.version>2.0.1</jta.api.version>
  <istack.commons.runtime.version>4.1.1</istack.commons.runtime.version>
- <jakarta.activation-api.version>2.1.0</jakarta.activation-api.version>
- <jakarta.activation.version>2.0.1</jakarta.activation.version>
+ <jakarta.activation-api.version>2.1.1</jakarta.activation-api.version>
+ <jakarta.activation.version>2.0.0</jakarta.activation.version>
  <jakarta.el.version>5.0.1</jakarta.el.version>
  <jakarta.el.impl.version>5.0.0-M1</jakarta.el.impl.version>
  <jakarta.annotation.osgi.version>jakarta.annotation.*;version="[2.0,3)"</jakarta.annotation.osgi.version>
@@ -2346,8 +2346,8 @@
  <jsonb.api.version>3.0.0</jsonb.api.version>
  <jsonp.ri.version>1.1.1</jsonp.ri.version>
  <jsonp.jaxrs.version>1.1.1</jsonp.jaxrs.version>
- <moxy.version>4.0.0</moxy.version>
- <yasson.version>3.0.2</yasson.version>
+ <moxy.version>4.0.1</moxy.version>
+ <yasson.version>3.0.3</yasson.version>
  <!-- END of Jakartified -->
 
  <javax.annotation.version>1.3.2</javax.annotation.version> <!--Deprecated, used only for @generated annotation in perf tests -->

tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonMoxyTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2022 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 2023 Oracle and/or its affiliates. All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v. 2.0, which is available at
@@ -56,7 +56,7 @@ public static Option[] configuration() {
  mavenBundle().groupId("org.glassfish.jersey.ext").artifactId("jersey-entity-filtering").versionAsInProject(),
  mavenBundle().groupId("org.eclipse.persistence").artifactId("org.eclipse.persistence.moxy").versionAsInProject(),
  mavenBundle().groupId("org.eclipse.persistence").artifactId("org.eclipse.persistence.core").versionAsInProject(),
- mavenBundle().groupId("org.eclipse.persistence").artifactId("org.eclipse.persistence.asm").versionAsInProject(),
+ mavenBundle().groupId("org.ow2.asm").artifactId("asm").versionAsInProject(),
  mavenBundle().groupId("jakarta.json").artifactId("jakarta.json-api").versionAsInProject(),
 
  // validation