From 9412df30a04f042b11316a403c475a97d9cb3b53 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Wed, 17 Nov 2021 23:11:44 +0000
Subject: [PATCH] [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).

---
 pom.xml                                          | 16 +++++++++++++++-
 .../uoaadmintools/configuration/GlobalVars.java  |  9 +++++++++
 .../AdminToolsCheckDeployController.java         |  3 +++
 src/main/resources/admintools.properties         |  1 +
 4 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 86c9bb1..195706c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
         <dependency>
             <groupId>eu.dnetlib</groupId>
             <artifactId>uoa-admin-tools-library</artifactId>
-            <version>1.0.1</version>
+            <version>1.0.2</version>
         </dependency>
         <!--<dependency>
             <groupId>eu.dnetlib</groupId>
@@ -147,5 +147,19 @@
         </resources>
 	</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>
diff --git a/src/main/java/eu/dnetlib/uoaadmintools/configuration/GlobalVars.java b/src/main/java/eu/dnetlib/uoaadmintools/configuration/GlobalVars.java
index 647c860..9d2914e 100644
--- a/src/main/java/eu/dnetlib/uoaadmintools/configuration/GlobalVars.java
+++ b/src/main/java/eu/dnetlib/uoaadmintools/configuration/GlobalVars.java
@@ -8,6 +8,7 @@ import java.util.Date;
 public class GlobalVars {
     public static Date date = new Date();
     private Date buildDate;
+    private String version;
 
     public String getBuildDate() {
         if(buildDate == null) {
@@ -19,4 +20,12 @@ public class GlobalVars {
     public void setBuildDate(Date buildDate) {
         this.buildDate = buildDate;
     }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
 }
diff --git a/src/main/java/eu/dnetlib/uoaadmintools/controllers/AdminToolsCheckDeployController.java b/src/main/java/eu/dnetlib/uoaadmintools/controllers/AdminToolsCheckDeployController.java
index 2b913dc..cd91dd8 100644
--- a/src/main/java/eu/dnetlib/uoaadmintools/controllers/AdminToolsCheckDeployController.java
+++ b/src/main/java/eu/dnetlib/uoaadmintools/controllers/AdminToolsCheckDeployController.java
@@ -73,6 +73,9 @@ public class AdminToolsCheckDeployController {
         if(globalVars.getBuildDate() != null) {
             response.put("Date of build", globalVars.getBuildDate());
         }
+        if(globalVars.getVersion() != null) {
+            response.put("Version", globalVars.getVersion());
+        }
 
         return response;
     }
diff --git a/src/main/resources/admintools.properties b/src/main/resources/admintools.properties
index 69faac8..bec2f29 100644
--- a/src/main/resources/admintools.properties
+++ b/src/main/resources/admintools.properties
@@ -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.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.version=@project.version@
 
 #beta
 #admintool.security.userInfoUrl =  https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=