Add version to global vars. Update authorization library

pom.xml

@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-
-<!--    <groupId>eu.dnetlib</groupId>-->
     <artifactId>uoa-admin-tools-library</artifactId>
     <version>1.0.2-SNAPSHOT</version>
     <packaging>jar</packaging>
-
     <name>uoa-admin-tools-library</name>
-
     <parent>
         <groupId>eu.dnetlib</groupId>
         <artifactId>dnet45-parent</artifactId>
         <version>1.0.0</version>
     </parent>
-
     <scm>
         <developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet45/modules/uoa-admin-tools-library/trunk</developerConnection>
     </scm>
-
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -26,7 +20,6 @@
         <timestampAdminToolsLibrary>${maven.build.timestamp}</timestampAdminToolsLibrary>
         <maven.build.timestamp.format>E MMM dd HH:mm:ss z yyyy</maven.build.timestamp.format>
     </properties>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -53,7 +46,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>
@@ -64,57 +56,29 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
-
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <version>1.2.17</version>
         </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.8.2</version>
-        </dependency>
         <dependency>
             <groupId>javax.mail</groupId>
             <artifactId>mail</artifactId>
             <version>1.5.0-b01</version>
         </dependency>
-        <dependency>
-            <groupId>commons-io</groupId>
-            <artifactId>commons-io</artifactId>
-            <version>20030203.000550</version>
-        </dependency>
-
         <dependency>
             <groupId>eu.dnetlib</groupId>
             <artifactId>uoa-authorization-library</artifactId>
-            <version>1.0.0</version>
+            <version>2.0.1</version>
         </dependency>
     </dependencies>
 
     <build>
         <plugins>
-            <!--			<plugin>-->
-            <!--				<groupId>org.springframework.boot</groupId>-->
-            <!--				<artifactId>spring-boot-maven-plugin</artifactId>-->
-            <!--			</plugin>-->
-            <!--3d answer: https://stackoverflow.com/questions/23260057/the-forked-vm-terminated-without-saying-properly-goodbye-vm-crash-or-system-exi-->
-            <!--If you use openjdk there might be a problem with surfire plugin - uncomment following lines-->
-            <!--<plugin>-->
-            <!--<groupId>org.apache.maven.plugins</groupId>-->
-            <!--<artifactId>maven-surefire-plugin</artifactId>-->
-            <!--<version>2.19.1</version>-->
-            <!--<configuration>-->
-            <!--&lt;!&ndash;<testFailureIgnore>true</testFailureIgnore>&ndash;&gt;-->
-            <!--<useSystemClassLoader>false</useSystemClassLoader>-->
-            <!--</configuration>-->
-            <!--</plugin>-->
         </plugins>
         <finalName>uoa-admin-tools-library</finalName>
         <resources>
@@ -124,6 +88,4 @@
             </resource>
         </resources>
     </build>
-
-
 </project>

src/main/java/eu/dnetlib/uoaadmintoolslibrary/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,20 @@ public class GlobalVars {
     public void setBuildDate(Date buildDate) {
         this.buildDate = buildDate;
     }
+
+    public static Date getDate() {
+        return date;
+    }
+
+    public static void setDate(Date date) {
+        GlobalVars.date = date;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
 }

src/main/java/eu/dnetlib/uoaadmintoolslibrary/controllers/AdminToolsLibraryCheckDeployController.java

@@ -48,14 +48,15 @@ public class AdminToolsLibraryCheckDeployController {
         response.put("admintoolslibrary.mail.password", mailConfig.getPassword() == null ? null : "[unexposed value]");
         response.put("admintoolslibrary.google.secret", googleConfig.getSecret() == null ? null : "[unexposed value]");
 
-        if(globalVars.date != null) {
+        if(GlobalVars.date != null) {
-            response.put("Date of deploy", globalVars.date.toString());
+            response.put("Date of deploy", GlobalVars.date.toString());
         }
         if(globalVars.getBuildDate() != null) {
             response.put("Date of build", globalVars.getBuildDate());
         }
-//        response.put("Define also", "admintoolslibrary.mail.username, " +
+        if (globalVars.getVersion() != null) {
-//                "admintoolslibrary.mail.password, admintoolslibrary.google.secret");
+            response.put("Version", globalVars.getVersion());
+        }
         return response;
     }
 }

src/main/resources/admintoolslibrary.properties

@@ -1 +1,2 @@
-admintoolslibrary.globalVars.buildDate=@timestampAdminToolsLibrary@
+admintoolslibrary.globalVars.buildDate=@timestampAdminToolsLibrary@
+admintoolslibrary.globalVars.version=${project.version}