From a36ca1b7e96aa539047146350a638e62df73deed Mon Sep 17 00:00:00 2001
From: luosolo <sandro.labruzzo@gmail.com>
Date: Wed, 2 Oct 2019 14:59:02 +0200
Subject: [PATCH] fixed poms

---
 dhp-applications/dhp-collector-worker/pom.xml |  1 -
 .../dhp-mdstore-manager-app/pom.xml           | 39 ++++++++++++-------
 dhp-applications/pom.xml                      |  7 ++++
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/dhp-applications/dhp-collector-worker/pom.xml b/dhp-applications/dhp-collector-worker/pom.xml
index a39eed2b0..e0ca0f554 100644
--- a/dhp-applications/dhp-collector-worker/pom.xml
+++ b/dhp-applications/dhp-collector-worker/pom.xml
@@ -130,7 +130,6 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>3.0.0</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/dhp-applications/dhp-mdstore-manager-app/pom.xml b/dhp-applications/dhp-mdstore-manager-app/pom.xml
index c90b4224d..92350e6f8 100644
--- a/dhp-applications/dhp-mdstore-manager-app/pom.xml
+++ b/dhp-applications/dhp-mdstore-manager-app/pom.xml
@@ -4,26 +4,28 @@
          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>
     <artifactId>dhp-mdstore-manager-app</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
 
     <!-- Inherit defaults from Spring Boot -->
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.3.RELEASE</version>
+        <groupId>eu.dnetlib.dhp</groupId>
+        <artifactId>dhp-applications</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
         <relativePath>../</relativePath>
     </parent>
 
-    <!-- <repositories> <repository> <id>dnet-deps</id> <name>dnet-dependencies</name>
-        <url>http://maven.research-infrastructures.eu/nexus/content/repositories/dnet-deps</url>
-        <layout>default</layout> </repository> <repository> <id>dnet45-releases</id>
-        <name>D-Net 45 Releases</name> <url>http://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-releases</url>
-        <layout>default</layout> <snapshots> <enabled>true</enabled> </snapshots>
-        </repository> <repository> <id>dnet45-snapshots</id> <name>D-Net 45 Snapshots</name>
-        <url>http://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-snapshots</url>
-        <layout>default</layout> <snapshots> <enabled>true</enabled> </snapshots>
-        </repository> </repositories> -->
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-starter-parent</artifactId>
+                <version>2.1.3.RELEASE</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
 
     <!-- Add typical dependencies for a web application -->
     <dependencies>
@@ -58,7 +60,6 @@
         <dependency>
             <groupId>eu.dnetlib.dhp</groupId>
             <artifactId>dhp-common</artifactId>
-            <version>1.0.0-SNAPSHOT</version>
         </dependency>
 
         <!-- Swagger -->
@@ -88,8 +89,16 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <executable>true</executable>
+                    <fork>true</fork>
+                    <skip>false</skip>
                 </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/dhp-applications/pom.xml b/dhp-applications/pom.xml
index 15a241e6e..c1f4b11f5 100644
--- a/dhp-applications/pom.xml
+++ b/dhp-applications/pom.xml
@@ -24,6 +24,13 @@
                 <artifactId>dhp-common</artifactId>
                 <version>1.0.0-SNAPSHOT</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.mockito</groupId>
+                <artifactId>mockito-core</artifactId>
+                <version>2.7.22</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>