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

Switch to Jakarta JSON API with Parsson implementation #361

Merged
merged 1 commit into from
Apr 22, 2022
Merged

Switch to Jakarta JSON API with Parsson implementation #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
</dependency>
<!-- JSON implementation -->
<dependency>
<groupId>org.glassfish</groupId>
<groupId>org.eclipse.parsson</groupId>
<artifactId>jakarta.json</artifactId>
<scope>test</scope>
</dependency>
Expand Down
10 changes: 5 additions & 5 deletions core/src/test/java/org/jboss/logmanager/SystemLoggerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
import java.util.List;
import java.util.Locale;
import java.util.concurrent.TimeUnit;
import javax.json.Json;
import javax.json.JsonArray;
import javax.json.JsonArrayBuilder;
import javax.json.JsonObject;
import javax.json.JsonReader;
import jakarta.json.Json;
import jakarta.json.JsonArray;
import jakarta.json.JsonArrayBuilder;
import jakarta.json.JsonObject;
import jakarta.json.JsonReader;

import org.junit.After;
import org.junit.Assert;
Expand Down
4 changes: 2 additions & 2 deletions core/src/test/java/org/jboss/logmanager/TestLogContextConfigurator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.json.Json;
import javax.json.stream.JsonGenerator;
import jakarta.json.Json;
import jakarta.json.stream.JsonGenerator;

import org.jboss.logmanager.handlers.FileHandler;

Expand Down
3 changes: 2 additions & 1 deletion ext/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@
<artifactId>jakarta.json-api</artifactId>
<!-- only required for the JsonFormatter -->
<optional>true</optional>
<scope>provided</scope>
</dependency>
<!-- JSON implementation -->
<dependency>
<groupId>org.glassfish</groupId>
<groupId>org.eclipse.parsson</groupId>
<artifactId>jakarta.json</artifactId>
<!-- only required for the JsonFormatter, another implementation of the JSON-P API may be used as well -->
<optional>true</optional>
Expand Down
10 changes: 5 additions & 5 deletions ext/src/main/java/org/jboss/logmanager/ext/formatters/JsonFormatter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
import java.math.BigInteger;
import java.util.HashMap;
import java.util.Map;
import javax.json.Json;
import javax.json.JsonValue;
import javax.json.stream.JsonGenerator;
import javax.json.stream.JsonGeneratorFactory;
import jakarta.json.Json;
import jakarta.json.JsonValue;
import jakarta.json.stream.JsonGenerator;
import jakarta.json.stream.JsonGeneratorFactory;

import org.jboss.logmanager.ext.PropertyValues;

Expand Down Expand Up @@ -94,7 +94,7 @@ public JsonFormatter(final Map<Key, String> keyOverrides) {
*/
public boolean isPrettyPrint() {
synchronized (config) {
return (config.containsKey(javax.json.stream.JsonGenerator.PRETTY_PRINTING) ? (Boolean) config.get(javax.json.stream.JsonGenerator.PRETTY_PRINTING) : false);
return (config.containsKey(jakarta.json.stream.JsonGenerator.PRETTY_PRINTING) ? (Boolean) config.get(jakarta.json.stream.JsonGenerator.PRETTY_PRINTING) : false);
}
}

Expand Down
10 changes: 5 additions & 5 deletions ext/src/test/java/org/jboss/logmanager/ext/formatters/JsonFormatterTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
import javax.json.Json;
import javax.json.JsonObject;
import javax.json.JsonReader;
import javax.json.JsonValue;
import javax.json.JsonValue.ValueType;
import jakarta.json.Json;
import jakarta.json.JsonObject;
import jakarta.json.JsonReader;
import jakarta.json.JsonValue;
import jakarta.json.JsonValue.ValueType;

import org.jboss.logmanager.ExtFormatter;
import org.jboss.logmanager.ExtLogRecord;
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
<version.io.smallrye.common.smallrye-common>1.11.0</version.io.smallrye.common.smallrye-common>
<version.jakarta.json.jakarta-json-api>1.1.6</version.jakarta.json.jakarta-json-api>
<version.org.byteman>4.0.18</version.org.byteman>
<version.org.glassfish.jakarta.json>1.1.6</version.org.glassfish.jakarta.json>
<version.org.eclipse.parsson.jakarta.json>1.1.0</version.org.eclipse.parsson.jakarta.json>
<version.org.jboss.logging.jboss-logging>3.4.0.Final</version.org.jboss.logging.jboss-logging>
<version.org.jboss.modules.jboss-modules>1.10.1.Final</version.org.jboss.modules.jboss-modules>
<version.org.kohsuke.metainf-services>1.8</version.org.kohsuke.metainf-services>
Expand Down Expand Up @@ -113,9 +113,9 @@
</dependency>
<!-- JSON implementation -->
<dependency>
<groupId>org.glassfish</groupId>
<groupId>org.eclipse.parsson</groupId>
<artifactId>jakarta.json</artifactId>
<version>${version.org.glassfish.jakarta.json}</version>
<version>${version.org.eclipse.parsson.jakarta.json}</version>
</dependency>

<!-- test dependencies -->
Expand Down