From 8dfa17b984580f4003824e18dc3895f403c20bdc Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 30 Jan 2024 13:54:21 +0100
Subject: [PATCH] OZG-4717 Removed old refernece to BuildUrl, added buildnumber
from Jenkins
---
Jenkinsfile | 1 +
pom.xml | 8 ++++++++
src/main/java/de/ozgcloud/admin/RootService.java | 8 ++------
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 5a866ccc..89df2663 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -47,6 +47,7 @@ pipeline {
}
configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
+ sh 'mvn -s $MAVEN_SETTINGS versions:set-property -Dproperty="build.number" -DnewVersion=${currentBuild.number}'
sh 'mvn -s $MAVEN_SETTINGS clean install -Dmaven.wagon.http.retryHandler.count=3 -DelasticTests.disabled=true'
}
}
diff --git a/pom.xml b/pom.xml
index 44a9a2d3..2bd6904b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,6 +14,9 @@
<version>1.0.0-SNAPSHOT</version>
<name>Administration</name>
<description>Administration Backend Project</description>
+ <properties>
+ <build.number>?</build.number>
+ </properties>
<dependencies>
<!-- Spring -->
<dependency>
@@ -79,6 +82,11 @@
<goals>
<goal>build-info</goal>
</goals>
+ <configuration>
+ <additionalProperties>
+ <number>${build.number}</number>
+ </additionalProperties>
+ </configuration>
</execution>
</executions>
</plugin>
diff --git a/src/main/java/de/ozgcloud/admin/RootService.java b/src/main/java/de/ozgcloud/admin/RootService.java
index c72ccf2f..a78e230b 100644
--- a/src/main/java/de/ozgcloud/admin/RootService.java
+++ b/src/main/java/de/ozgcloud/admin/RootService.java
@@ -18,18 +18,14 @@ class RootService {
}
public Instant getBuildTime() {
- return buildProperties.map(BuildProperties::getTime).orElse(Instant.now());
+ return buildProperties.map(BuildProperties::getTime).orElse(null);
}
public String getJavaVersion() {
- return System.getProperty("java.version", "?");
+ return System.getProperty("java.version");
}
public String getBuildNumber() {
return buildProperties.map(p -> p.get("number")).orElse("?");
}
-
- public String getBuildUrl() {
- return buildProperties.map(p -> p.get("url")).orElse("?");
- }
}
--
GitLab