Skip to content

Commit 51e907e

Browse files
bncummingsacoburn
andauthored
JCL 339: Upgrade JsonB module to use Jakarta EE 10 (#432)
* changed jakarta version * Use distinct version for glassfish impl --------- Co-authored-by: Aaron Coburn <aaronc@inrupt.com>
1 parent 7e49f7d commit 51e907e

File tree

5 files changed

+17
-16
lines changed

5 files changed

+17
-16
lines changed

build-tools/checkstyle/checkstyle.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<property name="sortStaticImportsAlphabetically" value="true"/>
5353
<property name="tokens" value="STATIC_IMPORT, IMPORT"/>
5454
<property name="separated" value="true"/>
55-
<property name="groups" value="com,io,jakarta,java,javax,org"/>
55+
<property name="groups" value="com,io,jakarta,java,org"/>
5656
</module>
5757

5858
<module name="ModifierOrder">

jsonb/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<dependency>
7171
<groupId>org.glassfish</groupId>
7272
<artifactId>jakarta.json</artifactId>
73-
<version>${jakarta.json.version}</version>
73+
<version>${glassfish.json.version}</version>
7474
<scope>test</scope>
7575
</dependency>
7676
</dependencies>

jsonb/src/main/java/com/inrupt/client/jsonb/JsonbService.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222

2323
import com.inrupt.client.spi.JsonService;
2424

25+
import jakarta.json.JsonException;
26+
import jakarta.json.bind.Jsonb;
27+
import jakarta.json.bind.JsonbBuilder;
28+
import jakarta.json.bind.JsonbConfig;
29+
import jakarta.json.bind.JsonbException;
30+
import jakarta.json.bind.config.PropertyNamingStrategy;
31+
2532
import java.io.IOException;
2633
import java.io.InputStream;
2734
import java.io.OutputStream;
2835
import java.lang.reflect.Type;
2936

30-
import javax.json.JsonException;
31-
import javax.json.bind.Jsonb;
32-
import javax.json.bind.JsonbBuilder;
33-
import javax.json.bind.JsonbConfig;
34-
import javax.json.bind.JsonbException;
35-
import javax.json.bind.config.PropertyNamingStrategy;
36-
3737
/**
3838
* A {@link JsonService} using the JakartaEE JSON Bind API.
3939
*/

pom.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
<commons.rdf.version>0.5.0</commons.rdf.version>
2929
<guava.version>31.1-jre</guava.version>
3030
<jackson.version>2.15.0</jackson.version>
31-
<jakarta.json.version>1.1.6</jakarta.json.version>
31+
<jakarta.json.version>2.1.1</jakarta.json.version>
3232
<jena.version>4.8.0</jena.version>
3333
<jose4j.version>0.9.3</jose4j.version>
34-
<json.bind.version>1.0.2</json.bind.version>
34+
<json.bind.version>3.0.0</json.bind.version>
3535
<okhttp.version>4.10.0</okhttp.version>
3636
<rdf4j.version>4.2.4</rdf4j.version>
3737
<slf4j.version>2.0.7</slf4j.version>
@@ -69,8 +69,9 @@
6969
<!-- testing -->
7070
<awaitility.version>4.2.0</awaitility.version>
7171
<equalsverifier.version>3.14.1</equalsverifier.version>
72+
<glassfish.json.version>2.0.1</glassfish.json.version>
7273
<junit.version>5.9.3</junit.version>
73-
<yasson.version>1.0.3</yasson.version>
74+
<yasson.version>3.0.3</yasson.version>
7475
<wiremock.version>2.35.0</wiremock.version>
7576

7677
<!-- disable by default (enabled by profile in CI) -->

src/site/apt/sessions/session-web-applications.apt.vm

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ Web Applications
4343
+---
4444
import com.inrupt.client.auth.Session;
4545
import com.inrupt.client.openid.OpenIdSession;
46-
import javax.enterprise.context.ApplicationScoped;
47-
import javax.inject.Inject;
48-
import javax.ws.rs.GET;
49-
import javax.ws.rs.Path;
46+
import jakarta.enterprise.context.ApplicationScoped;
47+
import jakarta.inject.Inject;
48+
import jakarta.ws.rs.GET;
49+
import jakarta.ws.rs.Path;
5050
import org.eclipse.microprofile.jwt.JsonWebToken;
5151
import io.quarkus.oidc.IdToken;
5252

0 commit comments

Comments
 (0)