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

Jakarta JSON Upgrades for Jakarta EE 10 #15423

Merged
merged 2 commits into from Apr 13, 2022
Merged

Jakarta JSON Upgrades for Jakarta EE 10 #15423

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
d80d2b3
[WFLY-16263 - WFLY-16264] Upgrade Jakarta JSON Processing to 2.1.0 an…
jamezp Apr 13, 2022
e0d4864
[WFLY-16200 - WFLY-16262] Upgrade Jakarta JSON Binding to 3.0.0 and Y…
jamezp Apr 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions ee-9/common/pom.xml
View file
Open in desktop
Expand Up @@ -240,8 +240,8 @@
</dependency>

<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<groupId>org.eclipse.parsson</groupId>
<artifactId>parsson</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand All @@ -252,7 +252,7 @@

<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.enterprise.concurrent</artifactId>
<artifactId>jakarta.el</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand All @@ -263,7 +263,7 @@

<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.json</artifactId>
<artifactId>jakarta.enterprise.concurrent</artifactId>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand Down
16 changes: 16 additions & 0 deletions ee-9/common/src/main/resources/license/preview-feature-pack-common-licenses.xml
View file
Open in desktop
Expand Up @@ -72,6 +72,22 @@
</license>
</licenses>
</dependency>
<dependency>
<groupId>org.eclipse.parsson</groupId>
<artifactId>parsson</artifactId>
<licenses>
<license>
<name>Eclipse Distribution License, Version 1.0</name>
<url>https://repository.jboss.org/licenses/edl-1.0.txt</url>
<distribution>repo</distribution>
</license>
<license>
<name>GNU General Public License v2.0 only, with Classpath exception</name>
<url>https://repository.jboss.org/licenses/gpl-2.0-ce.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
</dependency>
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-iiop-client-jakarta</artifactId>
Expand Down
34 changes: 34 additions & 0 deletions .../common/src/main/resources/modules/system/layers/base/org/eclipse/parsson/main/module.xml
View file
Open in desktop
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>

<!--
~ Copyright 2022 Red Hat, Inc.
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<!-- TODO Consider dropping direct dep on core-galleon-pack and instead using
a source dep, eliminating the need to re-provision this just to get a
different version. -->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is relevant to this file. IIRC I wrote it somewhere. I doubt it's relevant there any more either. ;)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. I almost removed it too. Then though what if it means something to core :) I can remove it though.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well. I'm wrong. It's relevant to this file (assuming you'll add this module in core) but I guess isn't relevant to the org.glassfish.jakarta.json one.

If this module.xml file and the alias one are going into core with the same content, I believe both of these can be removed once the core upgrade with them in it is integrated. The TODO I was talking about is done.

<module xmlns="urn:jboss:module:1.9" name="org.eclipse.parsson">

<properties>
<property name="jboss.api" value="private"/>
</properties>

<resources>
<artifact name="${org.eclipse.parsson:parsson}"/>
</resources>

<dependencies>
<module name="jakarta.json.api" />
</dependencies>
</module>
25 changes: 1 addition & 24 deletions .../src/main/resources/modules/system/layers/base/org/glassfish/jakarta/json/main/module.xml
View file
Open in desktop
Expand Up @@ -21,27 +21,4 @@
<!-- TODO Consider dropping direct dep on core-galleon-pack and instead using
a source dep, eliminating the need to re-provision this just to get a
different version. -->
<module xmlns="urn:jboss:module:1.9" name="org.glassfish.jakarta.json">

<properties>
<property name="jboss.api" value="private"/>
</properties>

<resources>
<artifact name="${org.glassfish:jakarta.json}">
<filter>
<!-- This artifact packages both the API and the impl in the same jar,
but we want to use our own API jar (see javax.json.api module).
So suppress the API packages. We suppress both javax and jakarta
so this same file can be used with artifacts that provide either
package namespace. -->
<exclude path="javax/*"/>
<exclude path="jakarta/*"/>
</filter>
</artifact>
</resources>

<dependencies>
<module name="javax.json.api" />
</dependencies>
</module>
<module-alias xmlns="urn:jboss:module:1.9" name="org.glassfish.jakarta.json" target-name="org.eclipse.parsson"/>
2 changes: 1 addition & 1 deletion ee-9/ee-9-api/src/main/resources/modules/system/layers/base/jakarta/json/api/main/module.xml
View file
Open in desktop
Expand Up @@ -38,6 +38,6 @@
It must also be exported so that modules that depend on the API, e.g. deployments, will be able to see the
implementation.
-->
<module name="org.glassfish.jakarta.json" export="true"/>
<module name="org.eclipse.parsson" export="true" services="export"/>
</dependencies>
</module>
23 changes: 12 additions & 11 deletions ee-9/pom.xml
View file
Open in desktop
Expand Up @@ -59,8 +59,8 @@
<version.jakarta.interceptor.jakarta-interceptors-api>2.1.0-RC3</version.jakarta.interceptor.jakarta-interceptors-api>
<version.jakarta.jms.jakarta-jms-api>3.0.0</version.jakarta.jms.jakarta-jms-api>
<version.jakarta.mail-api>2.1.0</version.jakarta.mail-api>
<version.jakarta.json.bind.api>2.0.0</version.jakarta.json.bind.api>
<version.jakarta.json.jakarta-json-api>2.0.0</version.jakarta.json.jakarta-json-api>
<version.jakarta.json.bind.api>3.0.0</version.jakarta.json.bind.api>
<version.jakarta.json.jakarta-json-api>2.1.0</version.jakarta.json.jakarta-json-api>
<version.jakarta.jws.jakarta-jws-api>3.0.0</version.jakarta.jws.jakarta-jws-api>
<version.jakarta.persistence>3.0.0</version.jakarta.persistence>
<version.jakarta.resource.jakarta-resource-api>2.0.0</version.jakarta.resource.jakarta-resource-api>
Expand All @@ -76,6 +76,7 @@
<version.org.apache.myfaces.core>3.0.1</version.org.apache.myfaces.core>
<version.org.eclipse.angus.angus-activation>1.0.0</version.org.eclipse.angus.angus-activation>
<version.org.eclipse.angus.angus-mail>1.0.0</version.org.eclipse.angus.angus-mail>
<version.org.eclipse.parsson>1.1.0</version.org.eclipse.parsson>
<!--
Overrides for MP5. Also make sure to update these in testsuite/integration/microprofile-tck/pom.xml
-->
Expand All @@ -97,11 +98,10 @@
<version.io.smallrye.smallrye-metrics>4.0.0-RC1</version.io.smallrye.smallrye-metrics>
<version.io.smallrye.smallrye-opentracing>3.0.0-RC1</version.io.smallrye.smallrye-opentracing>
<!-- MP5 - END -->
<version.org.eclipse.yasson>2.0.3</version.org.eclipse.yasson>
<version.org.eclipse.yasson>3.0.0-RC1</version.org.eclipse.yasson>
<version.org.eclipselink.version>3.0.2</version.org.eclipselink.version>
<version.org.glassfish.jakarta.el>5.0.0-M1</version.org.glassfish.jakarta.el>
<version.org.glassfish.jakarta.enterprise.concurrent>2.0.0</version.org.glassfish.jakarta.enterprise.concurrent>
<version.org.glassfish.jakarta.json>2.0.0</version.org.glassfish.jakarta.json>
<!-- WFLY-14723 For XJC we use a jbossorg variant in WF Preview. Use the version expression from the root
pom here so we detect if the base version changes there and we didn't do a -jbossorg of that version -->
<version.org.glassfish.jaxb.jaxb-xjc>${version.sun.jaxb}-jbossorg-1</version.org.glassfish.jaxb.jaxb-xjc>
Expand Down Expand Up @@ -750,10 +750,11 @@
</exclusions>
</dependency>

<!-- JSON Processing RI -->
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.el</artifactId>
<version>${version.org.glassfish.jakarta.el}</version>
<groupId>org.eclipse.parsson</groupId>
<artifactId>parsson</artifactId>
<version>${version.org.eclipse.parsson}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand All @@ -764,8 +765,8 @@

<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.enterprise.concurrent</artifactId>
<version>${version.org.glassfish.jakarta.enterprise.concurrent}</version>
<artifactId>jakarta.el</artifactId>
<version>${version.org.glassfish.jakarta.el}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand All @@ -776,8 +777,8 @@

<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.json</artifactId>
<version>${version.org.glassfish.jakarta.json}</version>
<artifactId>jakarta.enterprise.concurrent</artifactId>
<version>${version.org.glassfish.jakarta.enterprise.concurrent}</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
Expand Down
4 changes: 2 additions & 2 deletions ee-9/source-transform/undertow/pom.xml
View file
Open in desktop
Expand Up @@ -183,8 +183,8 @@
</dependency>
<!-- Required implementation for the org.wildfly.core:event-logger which is initialized in the subsystem tests -->
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.json</artifactId>
<groupId>org.eclipse.parsson</groupId>
<artifactId>parsson</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Expand Down