Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Jul 22, 2014 · 5de985c · 5de985c
2 parents c24009a + 0d558bc
commit 5de985c
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 6 deletions.
diff --git a/build-system/pom.xml b/build-system/pom.xml
@@ -48,8 +48,9 @@
         <cxf.version>3.0.1.e1</cxf.version>
         <cxf-xjc.version>3.0.1</cxf-xjc.version>
         <dbunit.version>2.4.7</dbunit.version>
-        <jaxb.version>2.2.7</jaxb.version>
-        <jaxb-xjc.version>2.2.7</jaxb-xjc.version>
+        <jaxb-api.version>2.2.9</jaxb-api.version>
+        <jaxb.version>2.2.10-b140310.1920</jaxb.version>
+        <jaxb-xjc.version>2.2.10-b140310.1920</jaxb-xjc.version>
         <junit.version>4.8.2</junit.version>
         <opendj.version>2.4.3</opendj.version>
         <mockito.version>1.8.5</mockito.version>
@@ -178,11 +179,21 @@
                 <artifactId>je</artifactId>
                 <version>4.1.10</version>
             </dependency>
+            <dependency>
+                    <artifactId>jaxb-api</artifactId>
+                    <groupId>javax.xml.bind</groupId>
+                    <version>${jaxb-api.version}</version>
+            </dependency>          
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-impl</artifactId>
                 <version>${jaxb.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-core</artifactId>
+                <version>${jaxb.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.sun.xsom</groupId>
                 <artifactId>xsom</artifactId>

diff --git a/gui/admin-gui/pom.xml b/gui/admin-gui/pom.xml
@@ -594,12 +594,10 @@
                 <dependency>
                         <artifactId>jaxb-api</artifactId>
                         <groupId>javax.xml.bind</groupId>
-			<version>${jaxb.version}</version>
                 </dependency>
                 <dependency>
                         <artifactId>jaxb-core</artifactId>
                         <groupId>com.sun.xml.bind</groupId>
-			<version>${jaxb.version}</version>
 		</dependency>
 	    </dependencies>
 

diff --git a/infra/ws-util/pom.xml b/infra/ws-util/pom.xml
@@ -60,11 +60,11 @@
 			<groupId>xml-resolver</groupId>
 			<artifactId>xml-resolver</artifactId>
 		</dependency>
-		<dependency> 
+<!-- 		<dependency> 
             <groupId>org.jvnet.jaxb2_commons</groupId>
             <artifactId>jaxb2-basics-runtime</artifactId>
             <version>0.6.3</version>
-        </dependency>
+        </dependency>  -->
         <dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-ws-security</artifactId>
@@ -77,6 +77,12 @@
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-simple</artifactId>
         </dependency>
+        <dependency>
+        	<!-- NOT needed specifically for this module. But it will be needed for any
+        	     dependent module that generates the classes. -->
+            <groupId>org.apache.cxf.xjc-utils</groupId>
+            <artifactId>cxf-xjc-runtime</artifactId>
+        </dependency>
         <!-- Test -->
 		<dependency>
 			<groupId>org.testng</groupId>

diff --git a/model/model-client/pom.xml b/model/model-client/pom.xml
@@ -72,6 +72,18 @@
 		<dependency>
             <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>
+        </dependency>
+        <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+        </dependency>
+        <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-core</artifactId>
         </dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>