From 91fe8ec701d93817abc9a91b75393a8ce778b1a7 Mon Sep 17 00:00:00 2001
From: Viliam Repan <vilo.repan@evolveum.com>
Date: Wed, 23 Aug 2017 18:45:42 +0200
Subject: [PATCH] fixing pom files, removed warnings

---
 dist/pom.xml                           |  2 +-
 gui/admin-gui/pom.xml                  |  1 +
 model/model-client/pom.xml             | 10 ----------
 model/model-common/pom.xml             |  6 ------
 model/model-impl/pom.xml               |  6 ------
 model/notifications-impl/pom.xml       |  6 ------
 model/report-impl/pom.xml              |  6 ------
 provisioning/provisioning-impl/pom.xml |  6 ------
 repo/repo-common/pom.xml               |  6 ------
 samples/model-client-sample/pom.xml    |  1 +
 10 files changed, 3 insertions(+), 47 deletions(-)

diff --git a/dist/pom.xml b/dist/pom.xml
index 6fae1713377..aca59e787a1 100644
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -117,7 +117,7 @@
 		          <descriptors>
 		            <descriptor>src/main/assembly/dist.xml</descriptor>
 		          </descriptors>
-		          <finalName>midpoint-${version}</finalName>
+		          <finalName>midpoint-${project.version}</finalName>
 		        </configuration>
 		        <executions>
 		          <execution>
diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
index 86d179a2055..821782bb560 100644
--- a/gui/admin-gui/pom.xml
+++ b/gui/admin-gui/pom.xml
@@ -99,6 +99,7 @@
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
+               <version>${spring.boot.version}</version>
            </plugin>
        </plugins>
     </build>
diff --git a/model/model-client/pom.xml b/model/model-client/pom.xml
index d8bd82310ff..107ef5c2889 100644
--- a/model/model-client/pom.xml
+++ b/model/model-client/pom.xml
@@ -81,16 +81,6 @@
             <groupId>org.apache.cxf.xjc-utils</groupId>
             <artifactId>cxf-xjc-runtime</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.cxf</groupId>
-            <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-impl</artifactId>
-                <scope>runtime</scope>
-        </dependency>
         <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-core</artifactId>
diff --git a/model/model-common/pom.xml b/model/model-common/pom.xml
index e95757dd3d5..06dfe1a2d28 100644
--- a/model/model-common/pom.xml
+++ b/model/model-common/pom.xml
@@ -175,11 +175,5 @@
 			<version>3.7-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.evolveum.midpoint.repo</groupId>
-			<artifactId>repo-test-util</artifactId>
-			<version>3.7-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
     </dependencies>
 </project>
diff --git a/model/model-impl/pom.xml b/model/model-impl/pom.xml
index 3654860c2f0..f08951101f7 100644
--- a/model/model-impl/pom.xml
+++ b/model/model-impl/pom.xml
@@ -387,12 +387,6 @@
 			<artifactId>spring-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.evolveum.midpoint.repo</groupId>
-			<artifactId>system-init</artifactId>
-			<version>3.7-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
diff --git a/model/notifications-impl/pom.xml b/model/notifications-impl/pom.xml
index 8c7c5bd5108..90ec2cac9f4 100644
--- a/model/notifications-impl/pom.xml
+++ b/model/notifications-impl/pom.xml
@@ -175,12 +175,6 @@
             <version>3.7-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.repo</groupId>
-            <artifactId>repo-cache</artifactId>
-            <version>3.7-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.repo</groupId>
             <artifactId>repo-test-util</artifactId>
diff --git a/model/report-impl/pom.xml b/model/report-impl/pom.xml
index 8e8454dd744..678fd2ab1bb 100644
--- a/model/report-impl/pom.xml
+++ b/model/report-impl/pom.xml
@@ -192,12 +192,6 @@
             <version>3.7-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>com.evolveum.midpoint.model</groupId>
-            <artifactId>model-impl</artifactId>
-            <version>3.7-SNAPSHOT</version>
-<!--             <scope>test</scope> -->
-        </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.provisioning</groupId>
             <artifactId>provisioning-impl</artifactId>
diff --git a/provisioning/provisioning-impl/pom.xml b/provisioning/provisioning-impl/pom.xml
index 57501f10f12..a9aee619290 100644
--- a/provisioning/provisioning-impl/pom.xml
+++ b/provisioning/provisioning-impl/pom.xml
@@ -245,12 +245,6 @@
 			<artifactId>persistence-api</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.evolveum.midpoint.repo</groupId>
-			<artifactId>system-init</artifactId>
-			<version>3.7-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.apache.derby</groupId>
 			<artifactId>derbyclient</artifactId>
diff --git a/repo/repo-common/pom.xml b/repo/repo-common/pom.xml
index 99cd68b8dd0..1a8e659c4d5 100644
--- a/repo/repo-common/pom.xml
+++ b/repo/repo-common/pom.xml
@@ -122,11 +122,5 @@
 			<version>3.7-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.evolveum.midpoint.repo</groupId>
-			<artifactId>repo-test-util</artifactId>
-			<version>3.7-SNAPSHOT</version>
-			<scope>test</scope>
-		</dependency>
     </dependencies>
 </project>
diff --git a/samples/model-client-sample/pom.xml b/samples/model-client-sample/pom.xml
index e998546038e..46026b21fab 100644
--- a/samples/model-client-sample/pom.xml
+++ b/samples/model-client-sample/pom.xml
@@ -134,6 +134,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.20</version>
                 <configuration>
                     <skipTests>true</skipTests> <!-- there are tests but we don't want them to be executed automatically -->
                 </configuration>