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

#57: Use relocated json dependencies #58

Merged
merged 2 commits into from
Oct 8, 2023
Merged

#57: Use relocated json dependencies #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
416b68c
https://github.com/git-commit-id/git-commit-id-plugin-core/issues/57:…
Oct 8, 2023
b9b6273
https://github.com/git-commit-id/git-commit-id-plugin-core/issues/57:…
Oct 8, 2023
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
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,13 @@
</dependency>
<!-- json stuff -->
<dependency>
<groupId>javax.json</groupId>
<artifactId>javax.json-api</artifactId>
<version>1.1.4</version>
<groupId>jakarta.json</groupId>
<artifactId>jakarta.json-api</artifactId>
<version>2.1.2</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<groupId>org.eclipse.parsson</groupId>
<artifactId>parsson</artifactId>
<version>1.1.4</version>
</dependency>
<!-- yaml -->
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/pl/project13/core/util/JsonManager.java
View file
Open in desktop
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
View file
Open in desktop
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