From ab106dc694364cda2041a66cf70a5986ccbb8a28 Mon Sep 17 00:00:00 2001
From: Radovan Semancik <radovan.semancik@evolveum.com>
Date: Fri, 22 Apr 2016 17:30:53 +0200
Subject: [PATCH] Cleaning up the build (stax2-api, cxf, etc.)

---
 build-system/pom.xml                |  9 +++++++++
 dist/midpoint-api/pom.xml           |  5 ++++-
 infra/prism/pom.xml                 |  5 +++++
 samples/model-client-sample/pom.xml | 13 +++++++------
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/build-system/pom.xml b/build-system/pom.xml
index 37a5401344f..9a00320415f 100644
--- a/build-system/pom.xml
+++ b/build-system/pom.xml
@@ -556,6 +556,12 @@
                     </exclusion>
                 </exclusions>
 	        </dependency>
+	        <dependency>
+				<!-- make this dependency explicit to detect conflicts with older versions -->
+			  <groupId>org.codehaus.woodstox</groupId>
+			  <artifactId>stax2-api</artifactId>
+			  <version>3.1.4</version>
+			</dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.osgi.core</artifactId>
@@ -1403,6 +1409,9 @@
 										<!-- There is some kind of conflict between these. TODO: clean up -->
 										<ignoredUnusedDeclaredDependency>xml-apis:xml-apis</ignoredUnusedDeclaredDependency>
 										<ignoredUnusedDeclaredDependency>stax:stax-api</ignoredUnusedDeclaredDependency>
+										
+										<!-- We are making this dependency explicit to detect conflicts early -->
+										<ignoredUnusedDeclaredDependency>org.codehaus.woodstox:stax2-api</ignoredUnusedDeclaredDependency>
 									
 										<!-- The xjc-plugin does not compile without dependency on this -->
 										<ignoredUnusedDeclaredDependency>org.apache.cxf:cxf-tools-common</ignoredUnusedDeclaredDependency>
diff --git a/dist/midpoint-api/pom.xml b/dist/midpoint-api/pom.xml
index d86b820737e..524cadfb28e 100644
--- a/dist/midpoint-api/pom.xml
+++ b/dist/midpoint-api/pom.xml
@@ -101,16 +101,19 @@
                 <version>2.10.3</version>
                 <configuration>
                         <includeDependencySources>true</includeDependencySources>
+                        <includeTransitiveDependencySources>true</includeTransitiveDependencySources>
                         <dependencySourceIncludes>
                             <dependencySourceInclude>com.evolveum.*:*</dependencySourceInclude>
                         </dependencySourceIncludes>
+                        <quiet>false</quiet>
+                        <debug>true</debug>
                 </configuration>
                 <executions>
                   <execution>
                     <id>javadoc-jar</id>
                     <phase>package</phase> <!-- bind to the packaging phase -->
                     <goals>
-                      <goal>jar</goal>
+						<goal>jar</goal>
                     </goals>
                   </execution>
                 </executions>
diff --git a/infra/prism/pom.xml b/infra/prism/pom.xml
index 7187d2a4567..0230d6b3529 100644
--- a/infra/prism/pom.xml
+++ b/infra/prism/pom.xml
@@ -111,6 +111,11 @@
 		  <groupId>org.jvnet.jaxb2_commons</groupId>
 		  <artifactId>jaxb2-basics-runtime</artifactId>
 		</dependency>
+		<dependency>
+			<!-- make this dependency explicit to detect conflicts with older versions -->
+		  <groupId>org.codehaus.woodstox</groupId>
+		  <artifactId>stax2-api</artifactId>
+		</dependency>
 
         <!-- Xtext for schema IDE tooling (experimental) -->
 <!--        <dependency>
diff --git a/samples/model-client-sample/pom.xml b/samples/model-client-sample/pom.xml
index 0e7af376c37..eda0fa251d4 100644
--- a/samples/model-client-sample/pom.xml
+++ b/samples/model-client-sample/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright (c) 2010-2015 Evolveum
+  ~ Copyright (c) 2010-2016 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 	<version>3.4-SNAPSHOT</version>
 	<properties>
 		<project.source.version>1.7</project.source.version>
+    	<cxf.version>3.1.6</cxf.version>
 	</properties>
 	<organization>
 		<name>Evolveum</name>
@@ -41,7 +42,7 @@
         <developerConnection>git@github.com:Evolveum/midpoint.git</developerConnection>
         <url>https://fisheye.evolveum.com/browse/midPoint</url>
     </scm>
-
+    
     <distributionManagement>
       <repository>
         <id>evolveum-nexus</id>
@@ -149,22 +150,22 @@
 		<dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-core</artifactId>
-            <version>3.0.0</version>
+            <version>${cxf.version}</version>
         </dependency>
 		<dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
-            <version>3.0.0</version>
+            <version>${cxf.version}</version>
         </dependency>
         <dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-transports-http</artifactId>
-			<version>3.0.0</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-ws-security</artifactId>
-			<version>3.0.0</version>
+			<version>${cxf.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>