FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

JCL 339: Upgrade JsonB module to use Jakarta EE 10 by bncummings · Pull Request #432 · inrupt/solid-client-java · GitHub

  1. inrupt
  2. solid-client-java

Repository navigation

JCL 339: Upgrade JsonB module to use Jakarta EE 10 #432

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

Merged
acoburn merged 5 commits into from
May 1, 2023
Conversation 1 Commits 5 Checks 0 Files changed
Merged

JCL 339: Upgrade JsonB module to use Jakarta EE 10 #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7572050
changed jakarta version
Apr 24, 2023
077d73c
Use distinct version for glassfish impl
acoburn May 1, 2023
f9be36a
Merge branch 'main' into JCL-339-upgrade-json-b-module-to-use-jakarta…
acoburn May 1, 2023
3534c65
Merge branch 'main' into JCL-339-upgrade-json-b-module-to-use-jakarta…
acoburn May 1, 2023
46665ce
Merge branch 'main' into JCL-339-upgrade-json-b-module-to-use-jakarta…
acoburn May 1, 2023
File filter

Filter by extension

Filter by extension .java  (1) .vm  (1) .xml  (3) All 3 file types selected
Only manifest files
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
2 changes: 1 addition & 1 deletion build-tools/checkstyle/checkstyle.xml
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<property name="sortStaticImportsAlphabetically" value="true"/>
<property name="tokens" value="STATIC_IMPORT, IMPORT"/>
<property name="separated" value="true"/>
<property name="groups" value="com,io,jakarta,java,javax,org"/>
<property name="groups" value="com,io,jakarta,java,org"/>
</module>

<module name="ModifierOrder">
Expand Down
2 changes: 1 addition & 1 deletion jsonb/pom.xml
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.json</artifactId>
<version>${jakarta.json.version}</version>
<version>${glassfish.json.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
14 changes: 7 additions & 7 deletions jsonb/src/main/java/com/inrupt/client/jsonb/JsonbService.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@

import com.inrupt.client.spi.JsonService;

import jakarta.json.JsonException;
import jakarta.json.bind.Jsonb;
import jakarta.json.bind.JsonbBuilder;
import jakarta.json.bind.JsonbConfig;
import jakarta.json.bind.JsonbException;
import jakarta.json.bind.config.PropertyNamingStrategy;

import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.reflect.Type;

import javax.json.JsonException;
import javax.json.bind.Jsonb;
import javax.json.bind.JsonbBuilder;
import javax.json.bind.JsonbConfig;
import javax.json.bind.JsonbException;
import javax.json.bind.config.PropertyNamingStrategy;

/**
* A {@link JsonService} using the JakartaEE JSON Bind API.
*/
Expand Down
7 changes: 4 additions & 3 deletions pom.xml
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
<commons.rdf.version>0.5.0</commons.rdf.version>
<guava.version>31.1-jre</guava.version>
<jackson.version>2.15.0</jackson.version>
<jakarta.json.version>1.1.6</jakarta.json.version>
<jakarta.json.version>2.1.1</jakarta.json.version>
<jena.version>4.8.0</jena.version>
<jose4j.version>0.9.3</jose4j.version>
<json.bind.version>1.0.2</json.bind.version>
<json.bind.version>3.0.0</json.bind.version>
<okhttp.version>4.10.0</okhttp.version>
<rdf4j.version>4.2.4</rdf4j.version>
<slf4j.version>2.0.7</slf4j.version>
Expand Down Expand Up @@ -69,8 +69,9 @@
<!-- testing -->
<awaitility.version>4.2.0</awaitility.version>
<equalsverifier.version>3.14.1</equalsverifier.version>
<glassfish.json.version>2.0.1</glassfish.json.version>
<junit.version>5.9.3</junit.version>
<yasson.version>1.0.3</yasson.version>
<yasson.version>3.0.3</yasson.version>
<wiremock.version>2.35.0</wiremock.version>

<!-- disable by default (enabled by profile in CI) -->
Expand Down
8 changes: 4 additions & 4 deletions src/site/apt/sessions/session-web-applications.apt.vm
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ Web Applications
+---
import com.inrupt.client.auth.Session;
import com.inrupt.client.openid.OpenIdSession;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import jakarta.enterprise.context.ApplicationScoped;
import jakarta.inject.Inject;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import org.eclipse.microprofile.jwt.JsonWebToken;
import io.quarkus.oidc.IdToken;

Expand Down
Back | FazBrowse Home | New Git URL