Do not try to collect git commit info on build, because Heroku doesn't support it.
This commit is contained in:
@@ -52,10 +52,6 @@
|
|||||||
<groupId>org.springframework.boot</groupId>
|
<groupId>org.springframework.boot</groupId>
|
||||||
<artifactId>spring-boot-maven-plugin</artifactId>
|
<artifactId>spring-boot-maven-plugin</artifactId>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
|
||||||
<groupId>pl.project13.maven</groupId>
|
|
||||||
<artifactId>git-commit-id-plugin</artifactId>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
|||||||
@@ -24,8 +24,6 @@
|
|||||||
package rs.in.zivanovic.share.a.secret.api.controllers;
|
package rs.in.zivanovic.share.a.secret.api.controllers;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.MissingResourceException;
|
|
||||||
import java.util.ResourceBundle;
|
|
||||||
import javax.validation.Valid;
|
import javax.validation.Valid;
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.http.ResponseEntity;
|
import org.springframework.http.ResponseEntity;
|
||||||
@@ -72,14 +70,7 @@ public class SasController {
|
|||||||
|
|
||||||
@RequestMapping(method = RequestMethod.GET, value = "/version")
|
@RequestMapping(method = RequestMethod.GET, value = "/version")
|
||||||
public ResponseEntity version() {
|
public ResponseEntity version() {
|
||||||
String commitId = "<N/A>";
|
|
||||||
String buildTime = "<N/A>";
|
String buildTime = "<N/A>";
|
||||||
try {
|
return SasResponse.ok().withData(new Version(version, buildTime)).build();
|
||||||
ResourceBundle rb = ResourceBundle.getBundle("git");
|
|
||||||
commitId = rb.getString("git.commit.id.abbrev");
|
|
||||||
buildTime = rb.getString("git.build.time");
|
|
||||||
} catch (MissingResourceException ex) {
|
|
||||||
}
|
|
||||||
return SasResponse.ok().withData(new Version(String.format("%s.%s", version, commitId), buildTime)).build();
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -93,7 +93,7 @@
|
|||||||
<footer>
|
<footer>
|
||||||
<hr/>
|
<hr/>
|
||||||
<small class="text-muted">
|
<small class="text-muted">
|
||||||
Share-a-secret service version {{version.frontendVersion}} built at {{version.buildTime}}.<br/>
|
Share-a-secret service version {{version.frontendVersion}}.<br/>
|
||||||
Full source code available under <a href="http://opensource.org/licenses/MIT">MIT license</a> at <a href="https://github.com/zmarko/share-a-secret-api">GitHub</a>.<br/>
|
Full source code available under <a href="http://opensource.org/licenses/MIT">MIT license</a> at <a href="https://github.com/zmarko/share-a-secret-api">GitHub</a>.<br/>
|
||||||
Copyright © 2014 Marko Zivanovic.<br/>
|
Copyright © 2014 Marko Zivanovic.<br/>
|
||||||
This web site uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Secret_sharing">"Secret sharing"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.
|
This web site uses material from the Wikipedia article <a href="https://en.wikipedia.org/wiki/Secret_sharing">"Secret sharing"</a>, which is released under the <a href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-Share-Alike License 3.0</a>.
|
||||||
|
|||||||
Reference in New Issue
Block a user