[Trunk | Admin Tools Service]:

1. pom.xml: 
	a. Updated version of "uoa-admin-tools-library" from 1.0.1 to 1.0.2
	b. Added <repositories> tag with http://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-releases url for released libraries.
2. GlobalVars.java: Added field "version" (version of project in pom).
3. AdminToolsCheckDeployController.java: Expose globalBars.version in /health_check/advanced.
4. admintools.properties: Added admintool.globalVars.version=@version@ (initialized by pom version).
This commit is contained in:
Konstantina Galouni 2021-11-17 23:11:44 +00:00
parent 8989707b79
commit 9412df30a0
4 changed files with 28 additions and 1 deletions

16
pom.xml
View File

@ -101,7 +101,7 @@
<dependency> <dependency>
<groupId>eu.dnetlib</groupId> <groupId>eu.dnetlib</groupId>
<artifactId>uoa-admin-tools-library</artifactId> <artifactId>uoa-admin-tools-library</artifactId>
<version>1.0.1</version> <version>1.0.2</version>
</dependency> </dependency>
<!--<dependency> <!--<dependency>
<groupId>eu.dnetlib</groupId> <groupId>eu.dnetlib</groupId>
@ -147,5 +147,19 @@
</resources> </resources>
</build> </build>
<repositories>
<repository>
<id>dnet45-releases</id>
<name>D-Net 45 Releases</name>
<url>http://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-releases</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
<layout>default</layout>
</repository>
</repositories>
</project> </project>

View File

@ -8,6 +8,7 @@ import java.util.Date;
public class GlobalVars { public class GlobalVars {
public static Date date = new Date(); public static Date date = new Date();
private Date buildDate; private Date buildDate;
private String version;
public String getBuildDate() { public String getBuildDate() {
if(buildDate == null) { if(buildDate == null) {
@ -19,4 +20,12 @@ public class GlobalVars {
public void setBuildDate(Date buildDate) { public void setBuildDate(Date buildDate) {
this.buildDate = buildDate; this.buildDate = buildDate;
} }
public String getVersion() {
return version;
}
public void setVersion(String version) {
this.version = version;
}
} }

View File

@ -73,6 +73,9 @@ public class AdminToolsCheckDeployController {
if(globalVars.getBuildDate() != null) { if(globalVars.getBuildDate() != null) {
response.put("Date of build", globalVars.getBuildDate()); response.put("Date of build", globalVars.getBuildDate());
} }
if(globalVars.getVersion() != null) {
response.put("Version", globalVars.getVersion());
}
return response; return response;
} }

View File

@ -15,6 +15,7 @@ admintool.mongodb.database=openaire_admin
admintool.managers.api.id = http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/community/{community}/managers/id admintool.managers.api.id = http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/community/{community}/managers/id
admintool.managers.api.email = http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/community/{community}/managers/email admintool.managers.api.email = http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/community/{community}/managers/email
admintool.globalVars.buildDate=@timestamp@ admintool.globalVars.buildDate=@timestamp@
admintool.globalVars.version=@project.version@
#beta #beta
#admintool.security.userInfoUrl = https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken= #admintool.security.userInfoUrl = https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=