Skip to content

Commit b9b6273

Browse files
author
TheSnoozer
committed
#57: Fix imports and dependencies
Aparently we now need to stop relying on ``` <groupId>org.glassfish</groupId> <artifactId>jakarta.json</artifactId> <version>2.0.1</version> ``` and instead use ``` <groupId>org.eclipse.parsson</groupId> <artifactId>parsson</artifactId> <version>1.1.4</version> ``` See https://github.com/elastic/elasticsearch-java/pull / 63 and https://jakarta.ee/blogs/javax-jakartaee-namespace-ecosystem-progress/
1 parent 416b68c commit b9b6273

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,9 @@
201201
<version>2.1.2</version>
202202
</dependency>
203203
<dependency>
204-
<groupId>org.glassfish</groupId>
205-
<artifactId>jakarta.json</artifactId>
206-
<version>2.0.1</version>
204+
<groupId>org.eclipse.parsson</groupId>
205+
<artifactId>parsson</artifactId>
206+
<version>1.1.4</version>
207207
</dependency>
208208
<!-- yaml -->
209209
<dependency>

src/main/java/pl/project13/core/util/JsonManager.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717

1818
package pl.project13.core.util;
1919

20+
import jakarta.json.Json;
21+
import jakarta.json.JsonReader;
22+
import jakarta.json.JsonString;
23+
import jakarta.json.stream.JsonGenerator;
24+
import jakarta.json.stream.JsonGeneratorFactory;
2025
import nu.studer.java.util.OrderedProperties;
2126
import pl.project13.core.CannotReadFileException;
2227

2328
import javax.annotation.Nonnull;
24-
import javax.json.Json;
25-
import javax.json.JsonReader;
26-
import javax.json.JsonString;
27-
import javax.json.stream.JsonGenerator;
28-
import javax.json.stream.JsonGeneratorFactory;
2929
import java.io.*;
3030
import java.nio.charset.Charset;
3131
import java.util.Collections;

src/test/java/pl/project13/core/util/TestJsonManager.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ public void testDumpWithFlatGitProperty() throws Exception {
5252
// then
5353
Assert.assertEquals(
5454
Arrays.asList(
55-
"",
5655
"{",
5756
" \"git.commit.id\": \"beef4e92e9cabd043b105a14514289f331b40bf2\",",
5857
" \"git.commit.id.abbrev\": \"beef4e9\"",
@@ -101,7 +100,6 @@ public void testDumpWithFullGitProperty() throws Exception {
101100
// then
102101
Assert.assertEquals(
103102
Arrays.asList(
104-
"",
105103
"{",
106104
" \"git.commit.id.abbrev\": \"beef4e9\",",
107105
" \"git.commit.id.full\": \"beef4e92e9cabd043b105a14514289f331b40bf2\"",
@@ -150,7 +148,6 @@ public void testDumpWithUnicode() throws Exception {
150148
// then
151149
Assert.assertEquals(
152150
Arrays.asList(
153-
"",
154151
"{",
155152
" \"git.commit.message.full\": \"initial commit on test project with some special characters äöüàñ.\",",
156153
" \"git.commit.user.name\": \"Александр Eliáš\"",

0 commit comments

Comments
 (0)