loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-09 16:06:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[cli][build] Relax the git id plugin (#6094)

Browse Source 
* [cli][build] Relax the git id plugin

* Guard against null on missing build properties
This commit is contained in:
Jim Schubert
2020-04-30 08:49:07 -04:00
committed by GitHub
parent 3e2c933dec
commit cc623ba429
2 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
modules/openapi-generator-cli/src/main/java/org/openapitools/codegen/cmd/BuildInfo.java
View File

@@ -2,6 +2,7 @@ package org.openapitools.codegen.cmd;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.time.DateTimeException;
import java.time.OffsetDateTime; import java.time.OffsetDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException; import java.time.format.DateTimeParseException;
@@ -23,15 +24,19 @@ public class BuildInfo {
static { static {
try (InputStream is = BuildInfo.class.getResourceAsStream("/version.properties")) { try (InputStream is = BuildInfo.class.getResourceAsStream("/version.properties")) {
Properties versionProps = new Properties(); if (is != null) {
versionProps.load(is); Properties versionProps = new Properties();
properties.putAll(versionProps); versionProps.load(is);
properties.putAll(versionProps);
}
} catch (IOException ignored) { } catch (IOException ignored) {
} }
try (InputStream is = BuildInfo.class.getResourceAsStream("/openapi-generator-git.properties")) { try (InputStream is = BuildInfo.class.getResourceAsStream("/openapi-generator-git.properties")) {
Properties gitProps = new Properties(); if (is != null) {
gitProps.load(is); Properties gitProps = new Properties();
properties.putAll(gitProps); gitProps.load(is);
properties.putAll(gitProps);
}
} catch (IOException ignored) { } catch (IOException ignored) {
} }
} }
@@ -82,7 +87,13 @@ public class BuildInfo {
StringBuilder sb = new StringBuilder(CLI_NAME); StringBuilder sb = new StringBuilder(CLI_NAME);
sb.append(" ").append(this.getVersion()).append(System.lineSeparator()); sb.append(" ").append(this.getVersion()).append(System.lineSeparator());
sb.append(" commit : ").append(this.getSha()).append(System.lineSeparator()); sb.append(" commit : ").append(this.getSha()).append(System.lineSeparator());
sb.append(" built : ").append(this.getBuildTime().format(DateTimeFormatter.ISO_OFFSET_DATE_TIME)).append(System.lineSeparator()); sb.append(" built : ");
try {
sb.append(this.getBuildTime().format(DateTimeFormatter.ISO_OFFSET_DATE_TIME));
} catch (DateTimeException e) {
sb.append(UNKNOWN);
}
sb.append(System.lineSeparator());
sb.append(" source : ").append(GIT_REPO).append(System.lineSeparator()); sb.append(" source : ").append(GIT_REPO).append(System.lineSeparator());
sb.append(" docs : ").append(SITE).append(System.lineSeparator()); sb.append(" docs : ").append(SITE).append(System.lineSeparator());
return sb.toString(); return sb.toString();

2
modules/openapi-generator/pom.xml
View File

@@ -65,6 +65,8 @@
</includeOnlyProperties> </includeOnlyProperties>
<commitIdGenerationMode>full</commitIdGenerationMode> <commitIdGenerationMode>full</commitIdGenerationMode>
<dotGitDirectory>${project.parent.basedir}${file.separator}.git</dotGitDirectory> <dotGitDirectory>${project.parent.basedir}${file.separator}.git</dotGitDirectory>
<failOnNoGitDirectory>false</failOnNoGitDirectory>
<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>