nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-617 - Show build version in UI

This commit is contained in:
Jose Ignacio Recuerda Cambil 2018-11-29 12:28:10 +01:00 committed by Holger Hagen
parent aa250c926d
commit 6a7cff5ff3
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rest/taskana-rest-spring-example/src/main/resources/application.properties
View File

@ -22,6 +22,9 @@ devMode=false
####### property that control if the database is cleaned and sample data is generated ####### property that control if the database is cleaned and sample data is generated
generateSampleData=true generateSampleData=true
####### Property that informs about the Taskana's version. This version is shown the application web
version=@project.version@
####### control LDAP usage ####### control LDAP usage
taskana.ldap.useLdap=false taskana.ldap.useLdap=false
####### properties to connect to LDAP ####### properties to connect to LDAP

4
rest/taskana-rest-spring-example/src/test/resources/application.properties
View File

@ -8,6 +8,10 @@ datasource.password=sa
taskana.schemaName=TASKANA taskana.schemaName=TASKANA
####### property that control rest api security deploy use true for no security. ####### property that control rest api security deploy use true for no security.
devMode=false devMode=false
####### Property that informs about the Taskana's version. This version is shown the application web
version=@project.version@
####### control LDAP usage ####### control LDAP usage
taskana.ldap.useLdap=false taskana.ldap.useLdap=false
####### properties to connect to LDAP ####### properties to connect to LDAP

8
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/TaskanaEngineController.java
View File

@ -3,6 +3,7 @@ package pro.taskana.rest;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
@ -28,6 +29,9 @@ public class TaskanaEngineController {
@Autowired @Autowired
TaskanaEngineImpl taskanaEngineImpl; TaskanaEngineImpl taskanaEngineImpl;
@Value("${version:Local build}")
private String version;
@GetMapping(path = "/v1/domains", produces = {MediaType.APPLICATION_JSON_VALUE}) @GetMapping(path = "/v1/domains", produces = {MediaType.APPLICATION_JSON_VALUE})
public ResponseEntity<List<String>> getDomains() { public ResponseEntity<List<String>> getDomains() {
return new ResponseEntity<>(taskanaEngineConfiguration.getDomains(), HttpStatus.OK); return new ResponseEntity<>(taskanaEngineConfiguration.getDomains(), HttpStatus.OK);
@ -66,10 +70,6 @@ public class TaskanaEngineController {
*/ */
@GetMapping(path = "/v1/version", produces = {MediaType.APPLICATION_JSON_VALUE}) @GetMapping(path = "/v1/version", produces = {MediaType.APPLICATION_JSON_VALUE})
public ResponseEntity<VersionResource> currentVersion() { public ResponseEntity<VersionResource> currentVersion() {
String version = TaskanaEngineController.class.getPackage().getImplementationVersion();
if (version == null) {
version = "1.0-DEFAULT";
}
VersionResource resource = new VersionResource(); VersionResource resource = new VersionResource();
resource.setVersion(version); resource.setVersion(version);
return new ResponseEntity<>(resource, return new ResponseEntity<>(resource,