Revert "Cleans up maven warnings"

This reverts commit 5dd54c5.
Evolveum · Sep 20, 2017 · b7111ad · b7111ad
1 parent 5d534c7
commit b7111ad
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 2 deletions.
diff --git a/dist/pom.xml b/dist/pom.xml
@@ -117,7 +117,7 @@
 		          <descriptors>
 		            <descriptor>src/main/assembly/dist.xml</descriptor>
 		          </descriptors>
-		          <finalName>midpoint-${project.version}</finalName>
+		          <finalName>midpoint-${version}</finalName>
 		        </configuration>
 		        <executions>
 		          <execution>

diff --git a/model/model-client/pom.xml b/model/model-client/pom.xml
@@ -81,6 +81,16 @@
             <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
@@ -175,5 +175,11 @@
 			<version>3.6.1-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.evolveum.midpoint.repo</groupId>
+			<artifactId>repo-test-util</artifactId>
+			<version>3.6.1-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
     </dependencies>
 </project>
diff --git a/model/model-impl/pom.xml b/model/model-impl/pom.xml
@@ -387,6 +387,12 @@
 			<artifactId>spring-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.evolveum.midpoint.repo</groupId>
+			<artifactId>system-init</artifactId>
+			<version>3.6.1-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
@@ -175,6 +175,12 @@
             <version>3.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.repo</groupId>
+            <artifactId>repo-cache</artifactId>
+            <version>3.6.1-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
@@ -192,6 +192,12 @@
             <version>3.6.1-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.evolveum.midpoint.model</groupId>
+            <artifactId>model-impl</artifactId>
+            <version>3.6.1-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
@@ -245,6 +245,12 @@
 			<artifactId>persistence-api</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.evolveum.midpoint.repo</groupId>
+			<artifactId>system-init</artifactId>
+			<version>3.6.1-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
@@ -122,5 +122,11 @@
 			<version>3.6.1-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.evolveum.midpoint.repo</groupId>
+			<artifactId>repo-test-util</artifactId>
+			<version>3.6.1-SNAPSHOT</version>
+			<scope>test</scope>
+		</dependency>
     </dependencies>
 </project>
diff --git a/samples/model-client-sample/pom.xml b/samples/model-client-sample/pom.xml
@@ -134,7 +134,6 @@
             <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>