Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Jakartified versions update #5304

Merged
merged 2 commits into from
May 10, 2023
Merged

Jakartified versions update #5304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c297d26
Jakartified versions update
senivam Apr 4, 2023
f68b7f5
Add staging profile to the license check gh action
senivam Apr 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/maven.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
strategy:
matrix:
java_version: [ 11 ]
verify_profiles: [ '-Plicense_check' ]
verify_profiles: [ '-Plicense_check,staging' ]
continue-on-error: false

steps:
Expand All @@ -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
4 changes: 2 additions & 2 deletions core-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions core-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions examples/extended-wadl-webapp/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions examples/osgi-helloworld-webapp/functional-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down
4 changes: 2 additions & 2 deletions examples/osgi-http-service/functional-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 5 additions & 0 deletions media/moxy/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
26 changes: 13 additions & 13 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1585,8 +1585,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>

Expand Down Expand Up @@ -2284,16 +2284,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>
Expand All @@ -2304,18 +2304,18 @@
<jakarta.persistence.version>3.1.0</jakarta.persistence.version>
<jakarta.validation.api.version>3.0.2</jakarta.validation.api.version>
<jakarta.jaxb.api.version>4.0.0</jakarta.jaxb.api.version>
<jaxb.ri.version>4.0.0</jaxb.ri.version>
<jaxb.ri.version>4.0.2</jaxb.ri.version>
<jaxrs.api.spec.version>3.1</jaxrs.api.spec.version>
<jaxrs.api.impl.version>3.1.0</jaxrs.api.impl.version>
<jetty.osgi.version>org.eclipse.jetty.*;version="[11,15)"</jetty.osgi.version>
<jetty.version>11.0.13</jetty.version>
<jetty9.version>9.4.50.v20221201</jetty9.version>
<jetty.plugin.version>11.0.13</jetty.plugin.version>
<jetty.version>11.0.14</jetty.version>
<jetty9.version>9.4.51.v20230217</jetty9.version>
<jetty.plugin.version>11.0.14</jetty.plugin.version>
<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 -->
Expand Down
4 changes: 2 additions & 2 deletions tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/basic/JsonMoxyTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down