Skip to content

Commit 6614229

Browse files
author
TheSnoozer
committed
bump git-commit-id-plugin-core from 6.0.0-rc.4 to 6.0.0-rc.5
1 parent da4fbea commit 6614229

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>${project.groupId}</groupId>
6262
<artifactId>git-commit-id-plugin-core</artifactId>
63-
<version>6.0.0-rc.4</version>
63+
<version>6.0.0-rc.5</version>
6464
</dependency>
6565
<dependency>
6666
<groupId>com.google.code.findbugs</groupId>

src/test/java/pl/project13/maven/git/GitCommitIdMojoIntegrationTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
import org.eclipse.jgit.api.ResetCommand;
2727
import org.junit.Test;
2828
import org.junit.runner.RunWith;
29+
import pl.project13.core.CommitIdPropertiesOutputFormat;
2930
import pl.project13.core.git.GitDescribeConfig;
30-
import pl.project13.core.util.JsonManager;
31+
import pl.project13.core.util.GenericFileManager;
3132

3233
import java.io.File;
33-
import java.nio.charset.StandardCharsets;
3434
import java.text.SimpleDateFormat;
3535
import java.util.*;
3636

@@ -544,7 +544,7 @@ public void shouldGenerateCustomPropertiesFileJson(boolean useNativeGit) throws
544544

545545
// then
546546
assertThat(expectedFile).exists();
547-
Properties p = JsonManager.readJsonProperties(expectedFile, StandardCharsets.UTF_8);
547+
Properties p = GenericFileManager.readPropertiesAsUtf8(CommitIdPropertiesOutputFormat.JSON, expectedFile);
548548
assertThat(p.size() > 10);
549549
} finally {
550550
FileUtils.forceDelete(expectedFile);

src/test/java/pl/project13/maven/git/GitPropertiesFileTest.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
import junitparams.JUnitParamsRunner;
2828
import junitparams.Parameters;
2929
import org.junit.runner.RunWith;
30-
import pl.project13.core.util.PropertyManager;
30+
import pl.project13.core.CommitIdPropertiesOutputFormat;
31+
import pl.project13.core.util.GenericFileManager;
3132

3233
import static java.util.Arrays.asList;
3334
import static org.assertj.core.api.Assertions.assertThat;
@@ -76,14 +77,15 @@ public void shouldConformPropertiesFileWhenSpecialCharactersInValueString(boolea
7677
// when the properties file is conform
7778
// it does not matter if we read as UTF-8 or ISO-8859-1
7879
{
79-
80-
Properties propertiesFromFile = PropertyManager.readProperties(expectedFile, StandardCharsets.UTF_8);
80+
Properties propertiesFromFile = GenericFileManager.readProperties(
81+
CommitIdPropertiesOutputFormat.PROPERTIES, expectedFile, StandardCharsets.UTF_8);
8182
assertGitPropertiesPresentInProject(propertiesFromFile);
8283
assertThat(propertiesFromFile.get("git.commit.message.full"))
8384
.isEqualTo(propertiesInProject.get("git.commit.message.full"));
8485
}
8586
{
86-
Properties propertiesFromFile = PropertyManager.readProperties(expectedFile, StandardCharsets.ISO_8859_1);
87+
Properties propertiesFromFile = GenericFileManager.readProperties(
88+
CommitIdPropertiesOutputFormat.PROPERTIES, expectedFile, StandardCharsets.ISO_8859_1);
8789
assertGitPropertiesPresentInProject(propertiesFromFile);
8890
assertThat(propertiesFromFile.get("git.commit.message.full"))
8991
.isEqualTo(propertiesInProject.get("git.commit.message.full"));

0 commit comments

Comments
 (0)