From c297d26eca1826f174789f8bc1551ce67ba1fb30 Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Tue, 4 Apr 2023 11:34:15 +0200 Subject: [PATCH 1/2] Jakartified versions update Signed-off-by: Maxim Nesen --- core-client/pom.xml | 4 +-- core-common/pom.xml | 4 +-- examples/extended-wadl-webapp/pom.xml | 6 ++--- .../functional-test/pom.xml | 4 +-- .../osgi-http-service/functional-test/pom.xml | 4 +-- media/moxy/pom.xml | 5 ++++ pom.xml | 26 +++++++++---------- .../jersey/osgi/test/basic/JsonMoxyTest.java | 4 +-- 8 files changed, 31 insertions(+), 26 deletions(-) diff --git a/core-client/pom.xml b/core-client/pom.xml index bbd8a1168e..fcd0987c8e 100644 --- a/core-client/pom.xml +++ b/core-client/pom.xml @@ -120,8 +120,8 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation test diff --git a/core-common/pom.xml b/core-common/pom.xml index f60e3ba46a..ee6da37598 100644 --- a/core-common/pom.xml +++ b/core-common/pom.xml @@ -215,8 +215,8 @@ jakarta.annotation-api - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation provided true diff --git a/examples/extended-wadl-webapp/pom.xml b/examples/extended-wadl-webapp/pom.xml index e82c293ab3..378341c093 100644 --- a/examples/extended-wadl-webapp/pom.xml +++ b/examples/extended-wadl-webapp/pom.xml @@ -139,8 +139,8 @@ jakarta.xml.bind-api - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation @@ -177,7 +177,7 @@ jakarta.activation jakarta.activation-api - ${jakarta.activation.version} + ${jakarta.activation-api.version} jakarta.xml.bind diff --git a/examples/osgi-helloworld-webapp/functional-test/pom.xml b/examples/osgi-helloworld-webapp/functional-test/pom.xml index 040f3a7a06..b5ff14d945 100644 --- a/examples/osgi-helloworld-webapp/functional-test/pom.xml +++ b/examples/osgi-helloworld-webapp/functional-test/pom.xml @@ -145,8 +145,8 @@ test - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation diff --git a/examples/osgi-http-service/functional-test/pom.xml b/examples/osgi-http-service/functional-test/pom.xml index d07c87f4de..0dedbf4c2c 100644 --- a/examples/osgi-http-service/functional-test/pom.xml +++ b/examples/osgi-http-service/functional-test/pom.xml @@ -238,8 +238,8 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation diff --git a/media/moxy/pom.xml b/media/moxy/pom.xml index 88039989f9..fa6def3995 100644 --- a/media/moxy/pom.xml +++ b/media/moxy/pom.xml @@ -104,6 +104,11 @@ org.eclipse.parsson parsson + + org.ow2.asm + asm + ${asm.version} + org.eclipse.persistence diff --git a/pom.xml b/pom.xml index b8eba1e41b..a52933cc04 100644 --- a/pom.xml +++ b/pom.xml @@ -1585,8 +1585,8 @@ - com.sun.activation - jakarta.activation + org.eclipse.angus + angus-activation ${jakarta.activation.version} @@ -2284,16 +2284,16 @@ 4.0.0 1.16 2.0.0 - 3.0.3 + 3.0.4 org.glassfish.hk2.*;version="[3.0,4)" org.jvnet.hk2.*;version="[3.0,4)" - 7.0.0-M2 - 3.1.0 + 7.0.3 + 3.1.1 3.0.0 2.0.1 4.1.1 - 2.1.0 - 2.0.1 + 2.1.1 + 2.0.0 5.0.1 5.0.0-M1 jakarta.annotation.*;version="[2.0,3)" @@ -2304,18 +2304,18 @@ 3.1.0 3.0.2 4.0.0 - 4.0.0 + 4.0.2 3.1 3.1.0 org.eclipse.jetty.*;version="[11,15)" - 11.0.13 - 9.4.50.v20221201 - 11.0.13 + 11.0.14 + 9.4.51.v20230217 + 11.0.14 3.0.0 1.1.1 1.1.1 - 4.0.0 - 3.0.2 + 4.0.1 + 3.0.3 1.3.2 diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonMoxyTest.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonMoxyTest.java index c4558a8c4c..4b2876bf0a 100644 --- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonMoxyTest.java +++ b/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 From f68b7f51225133b191eeb9321931eb05ca6d285a Mon Sep 17 00:00:00 2001 From: Maxim Nesen Date: Tue, 4 Apr 2023 13:13:36 +0200 Subject: [PATCH 2/2] Add staging profile to the license check gh action Signed-off-by: Maxim Nesen --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index ffc049293c..7c676edbbb 100644 --- a/.github/workflows/maven.yml +++ b/.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 \ No newline at end of file + 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