fixed build

Evolveum · Sep 2, 2017 · 09cd116 · 09cd116
1 parent dee536f
commit 09cd116
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 3 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -150,7 +150,7 @@
                 <exclusions>
                     <exclusion>
                         <groupId>org.springframework</groupId>
-                        <artifactId>spring</artifactId>
+                        <artifactId>*</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
@@ -1339,6 +1339,7 @@
 						</manifestEntries>
 					</archive>
 					<attachClasses>true</attachClasses>
+                    <failOnMissingWebXml>false</failOnMissingWebXml>
 				</configuration>
 			</plugin>
 			<!--plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> 

diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -19,7 +19,7 @@
     <name>midPoint User Interface - admin web gui</name>
     <groupId>com.evolveum.midpoint.gui</groupId>
     <artifactId>admin-gui</artifactId>
-    <packaging>jar</packaging>
+    <packaging>war</packaging>
     <version>3.7-SNAPSHOT</version>
     <parent>
         <artifactId>gui</artifactId>
@@ -557,7 +557,7 @@
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework</groupId>
-                    <artifactId>spring</artifactId>
+                    <artifactId>*</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>

diff --git a/model/model-client/pom.xml b/model/model-client/pom.xml
@@ -66,6 +66,7 @@
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
+            <scope>test</scope>
         </dependency>
         <dependency>
 			<groupId>org.apache.cxf</groupId>

diff --git a/model/model-impl/pom.xml b/model/model-impl/pom.xml
@@ -86,6 +86,7 @@
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>system-init</artifactId>
 			<version>3.7-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>

diff --git a/model/notifications-impl/pom.xml b/model/notifications-impl/pom.xml
@@ -86,6 +86,7 @@
             <groupId>com.evolveum.midpoint.repo</groupId>
             <artifactId>repo-cache</artifactId>
             <version>3.7-SNAPSHOT</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.evolveum.midpoint.provisioning</groupId>

diff --git a/provisioning/provisioning-impl/pom.xml b/provisioning/provisioning-impl/pom.xml
@@ -76,6 +76,7 @@
 			<groupId>com.evolveum.midpoint.repo</groupId>
 			<artifactId>system-init</artifactId>
 			<version>3.7-SNAPSHOT</version>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.evolveum.midpoint.repo</groupId>