Merge remote-tracking branch 'origin/master' into production

pom.xml

@@ -1,102 +1,100 @@
 <?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"
+<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">
-         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>
-    <modelVersion>4.0.0</modelVersion>
+<artifactId>irish-monitor-service</artifactId>
-    <artifactId>irish-monitor-service</artifactId>
+<version>1.0.9-SNAPSHOT</version>
-    <version>1.0.5-SNAPSHOT</version>
+<packaging>war</packaging>
-    <packaging>war</packaging>
+<name>irish-monitor-service</name>
-    <name>irish-monitor-service</name>
+<scm>
-    <scm>
+    <developerConnection>scm:git:gitea@code-repo.d4science.org:MaDgIK/irish-monitor-service.git</developerConnection>
-        <developerConnection>scm:git:gitea@code-repo.d4science.org:MaDgIK/irish-monitor-service.git</developerConnection>
+    <tag>HEAD</tag>
-        <tag>HEAD</tag>
+</scm>
-    </scm>
+<parent>
-    <parent>
+    <groupId>eu.dnetlib</groupId>
+    <artifactId>uoa-spring-boot-parent</artifactId>
+    <version>1.0.0</version>
+</parent>
+<properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <timestamp>${maven.build.timestamp}</timestamp>
+    <maven.build.timestamp.format>E MMM dd HH:mm:ss z yyyy</maven.build.timestamp.format>
+</properties>
+<dependencies>
+    <dependency> <!-- this dependency includes dependency to uoa-monitor-service-library -->
         <groupId>eu.dnetlib</groupId>
-        <artifactId>uoa-spring-boot-parent</artifactId>
+        <artifactId>uoa-monitor-service</artifactId>
-        <version>1.0.0</version>
+        <version>1.1.15</version>
-    </parent>
+        <classifier>library</classifier>
-    <properties>
+    </dependency>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <timestamp>${maven.build.timestamp}</timestamp>
-        <maven.build.timestamp.format>E MMM dd HH:mm:ss z yyyy</maven.build.timestamp.format>
-    </properties>
-    <dependencies>
 
-        <dependency> <!-- this dependency includes dependency to uoa-monitor-service-library -->
+    <dependency>
-            <groupId>eu.dnetlib</groupId>
+        <groupId>eu.dnetlib</groupId>
-            <artifactId>uoa-monitor-service</artifactId>
+        <artifactId>uoa-login-core</artifactId>
-            <version>1.1.15</version>
+        <version>2.1.1</version>
-            <classifier>library</classifier>
+    </dependency>
-        </dependency>
 
-        <dependency>
+    <!--swagger-->
-            <groupId>eu.dnetlib</groupId>
+    <dependency>
-            <artifactId>uoa-login-core</artifactId>
+        <groupId>io.springfox</groupId>
-            <version>2.1.1</version>
+        <artifactId>springfox-swagger2</artifactId>
-        </dependency>
+        <version>${swagger-version}</version>
-
+    </dependency>
-        <!--swagger-->
+    <!--swagger official ui-->
-        <dependency>
+    <dependency>
-            <groupId>io.springfox</groupId>
+        <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger2</artifactId>
+        <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger-version}</version>
+        <version>${swagger-version}</version>
-        </dependency>
+    </dependency>
-        <!--swagger official ui-->
+</dependencies>
-        <dependency>
+<repositories>
-            <groupId>io.springfox</groupId>
+    <repository>
-            <artifactId>springfox-swagger-ui</artifactId>
+        <id>dnet45-releases</id>
-            <version>${swagger-version}</version>
+        <name>D-Net 45 Releases</name>
-        </dependency>
+        <url>https://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-releases/</url>
-    </dependencies>
+        <releases>
-    <repositories>
+            <enabled>true</enabled>
-        <repository>
+        </releases>
-            <id>dnet45-releases</id>
+        <snapshots>
-            <name>D-Net 45 Releases</name>
+            <enabled>false</enabled>
-            <url>https://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-releases/</url>
+        </snapshots>
-            <releases>
+        <layout>default</layout>
-                <enabled>true</enabled>
+    </repository>
-            </releases>
+</repositories>
-            <snapshots>
+<build>
-                <enabled>false</enabled>
+    <plugins>
-            </snapshots>
+        <plugin>
-            <layout>default</layout>
+            <groupId>org.springframework.boot</groupId>
-        </repository>
+            <artifactId>spring-boot-maven-plugin</artifactId>
-    </repositories>
+            <version>${spring-boot-version}</version>
-    <build>
+            <configuration>
-        <plugins>
+                <mainClass>eu.dnetlib.irishmonitorservice.IrishMonitorServiceApplication</mainClass>
-            <plugin>
+                <executable>true</executable>
-                <groupId>org.springframework.boot</groupId>
+            </configuration>
-                <artifactId>spring-boot-maven-plugin</artifactId>
+            <executions>
-                <version>${spring-boot-version}</version>
+                <execution>
-                <configuration>
+                    <goals>
-                    <mainClass>eu.dnetlib.irishmonitorservice.IrishMonitorServiceApplication</mainClass>
+                        <goal>repackage</goal>
-                    <executable>true</executable>
+                    </goals>
-                </configuration>
+                </execution>
-                <executions>
+            </executions>
-                    <execution>
+        </plugin>
-                        <goals>
+        <plugin>
-                            <goal>repackage</goal>
+            <groupId>org.apache.maven.plugins</groupId>
-                        </goals>
+            <artifactId>maven-war-plugin</artifactId>
-                    </execution>
+            <version>2.6</version>
-                </executions>
+            <configuration>
-            </plugin>
+                <failOnMissingWebXml>false</failOnMissingWebXml>
-            <plugin>
+            </configuration>
-                <groupId>org.apache.maven.plugins</groupId>
+        </plugin>
-                <artifactId>maven-war-plugin</artifactId>
+    </plugins>
-                <version>2.6</version>
+    <finalName>irish-monitor-service</finalName>
-                <configuration>
+    <resources>
-                    <failOnMissingWebXml>false</failOnMissingWebXml>
+        <resource>
-                </configuration>
+            <directory>src/main/resources</directory>
-            </plugin>
+            <filtering>true</filtering>
-        </plugins>
+        </resource>
-        <finalName>irish-monitor-service</finalName>
+    </resources>
-        <resources>
+</build>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-    </build>
 </project>