Skip to content

Commit 8ed5c89

Browse files
committed
Use ObjectMapper's PrettyPrintWriter for JSON output.
1 parent 469d497 commit 8ed5c89

File tree

1 file changed

+30
-23
lines changed

1 file changed

+30
-23
lines changed

src/main/java/pl/project13/maven/git/GitCommitIdMojo.java

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

1818
package pl.project13.maven.git;
1919

20-
import com.fasterxml.jackson.core.type.TypeReference;
21-
import com.fasterxml.jackson.databind.ObjectMapper;
22-
import com.google.common.annotations.VisibleForTesting;
23-
import com.google.common.base.Function;
24-
import com.google.common.base.Predicate;
25-
import com.google.common.base.Predicates;
26-
import com.google.common.collect.Lists;
27-
import com.google.common.io.Closeables;
28-
import com.google.common.io.Files;
20+
import java.io.Closeable;
21+
import java.io.File;
22+
import java.io.FileInputStream;
23+
import java.io.FileOutputStream;
24+
import java.io.IOException;
25+
import java.io.InputStreamReader;
26+
import java.io.OutputStreamWriter;
27+
import java.io.Writer;
28+
import java.net.InetAddress;
29+
import java.net.UnknownHostException;
30+
import java.nio.charset.Charset;
31+
import java.nio.charset.StandardCharsets;
32+
import java.text.SimpleDateFormat;
33+
import java.util.Date;
34+
import java.util.HashMap;
35+
import java.util.List;
36+
import java.util.Map;
37+
import java.util.Properties;
38+
import java.util.TimeZone;
2939

3040
import org.apache.maven.execution.MavenSession;
3141
import org.apache.maven.plugin.AbstractMojo;
@@ -37,23 +47,20 @@
3747
import org.jetbrains.annotations.NotNull;
3848
import org.jetbrains.annotations.Nullable;
3949

50+
import com.fasterxml.jackson.core.type.TypeReference;
51+
import com.fasterxml.jackson.databind.ObjectMapper;
52+
import com.google.common.annotations.VisibleForTesting;
53+
import com.google.common.base.Function;
54+
import com.google.common.base.Predicate;
55+
import com.google.common.base.Predicates;
56+
import com.google.common.collect.Lists;
57+
import com.google.common.io.Closeables;
58+
import com.google.common.io.Files;
59+
4060
import pl.project13.maven.git.log.LoggerBridge;
4161
import pl.project13.maven.git.log.MavenLoggerBridge;
4262
import pl.project13.maven.git.util.PropertyManager;
4363

44-
import java.io.*;
45-
import java.net.InetAddress;
46-
import java.net.UnknownHostException;
47-
import java.nio.charset.Charset;
48-
import java.nio.charset.StandardCharsets;
49-
import java.text.SimpleDateFormat;
50-
import java.util.Date;
51-
import java.util.HashMap;
52-
import java.util.List;
53-
import java.util.Map;
54-
import java.util.Properties;
55-
import java.util.TimeZone;
56-
5764
/**
5865
* Puts git build-time information into property files or maven's properties.
5966
*
@@ -634,7 +641,7 @@ void maybeGeneratePropertiesFile(@NotNull Properties localProperties, File base,
634641
if (isJsonFormat) {
635642
log.info("Writing json file to [{}] (for module {})...", gitPropsFile.getAbsolutePath(), project.getName());
636643
ObjectMapper mapper = new ObjectMapper();
637-
mapper.writeValue(outputWriter, localProperties);
644+
mapper.writerWithDefaultPrettyPrinter().writeValue(outputWriter, localProperties);
638645
} else {
639646
log.info("Writing properties file to [{}] (for module {})...", gitPropsFile.getAbsolutePath(), project.getName());
640647
localProperties.store(outputWriter, "Generated by Git-Commit-Id-Plugin");

0 commit comments

Comments
 (0)