Skip to content

Commit

Permalink
#57: Fix imports and dependencies
Browse files Browse the repository at this point in the history
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/
  • Loading branch information
TheSnoozer committed Oct 8, 2023
1 parent 416b68c commit b9b6273
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 11 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,9 @@
<version>2.1.2</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>jakarta.json</artifactId>
<version>2.0.1</version>
<groupId>org.eclipse.parsson</groupId>
<artifactId>parsson</artifactId>
<version>1.1.4</version>
</dependency>
<!-- yaml -->
<dependency>
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/pl/project13/core/util/JsonManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@

package pl.project13.core.util;

import jakarta.json.Json;
import jakarta.json.JsonReader;
import jakarta.json.JsonString;
import jakarta.json.stream.JsonGenerator;
import jakarta.json.stream.JsonGeneratorFactory;
import nu.studer.java.util.OrderedProperties;
import pl.project13.core.CannotReadFileException;

import javax.annotation.Nonnull;
import javax.json.Json;
import javax.json.JsonReader;
import javax.json.JsonString;
import javax.json.stream.JsonGenerator;
import javax.json.stream.JsonGeneratorFactory;
import java.io.*;
import java.nio.charset.Charset;
import java.util.Collections;
Expand Down
3 changes: 0 additions & 3 deletions src/test/java/pl/project13/core/util/TestJsonManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ public void testDumpWithFlatGitProperty() throws Exception {
// then
Assert.assertEquals(
Arrays.asList(
"",
"{",
" \"git.commit.id\": \"beef4e92e9cabd043b105a14514289f331b40bf2\",",
" \"git.commit.id.abbrev\": \"beef4e9\"",
Expand Down Expand Up @@ -101,7 +100,6 @@ public void testDumpWithFullGitProperty() throws Exception {
// then
Assert.assertEquals(
Arrays.asList(
"",
"{",
" \"git.commit.id.abbrev\": \"beef4e9\",",
" \"git.commit.id.full\": \"beef4e92e9cabd043b105a14514289f331b40bf2\"",
Expand Down Expand Up @@ -150,7 +148,6 @@ public void testDumpWithUnicode() throws Exception {
// then
Assert.assertEquals(
Arrays.asList(
"",
"{",
" \"git.commit.message.full\": \"initial commit on test project with some special characters äöüàñ.\",",
" \"git.commit.user.name\": \"Александр Eliáš\"",
Expand Down

0 comments on commit b9b6273

Please sign in to comment.