keycloak-uncached

Change jaxb-impl for substitution used in EAP 7

1/21/2016 5:00:20 PM

Lukas Kubik

Commit: bdf9a55

Tree: c4dc394

Parents: 794bd48

Changes

pom.xml 11(+11 -0)

saml/saml-protocol/pom.xml 16(+16 -0)

services/pom.xml 14(+14 -0)

Details

pom.xml 11(+11 -0)

diff --git a/pom.xml b/pom.xml
index 502a5b8..fb929a6 100755
--- a/pom.xml
+++ b/pom.xml
@@ -279,6 +279,17 @@
                 <artifactId>commons-logging</artifactId>
                 <version>${commons.logging.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.jboss.resteasy</groupId>
+                <artifactId>resteasy-multipart-provider</artifactId>
+                <version>${resteasy.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-impl</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
 
             <!-- Twitter -->
             <dependency>

saml/saml-protocol/pom.xml 16(+16 -0)

diff --git a/saml/saml-protocol/pom.xml b/saml/saml-protocol/pom.xml
index ba7d0ca..24e046e 100755
--- a/saml/saml-protocol/pom.xml
+++ b/saml/saml-protocol/pom.xml
@@ -29,6 +29,22 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <scope>provided</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.xml.bind</groupId>
+            <artifactId>jboss-jaxb-api_2.2_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-common</artifactId>
             <scope>provided</scope>

services/pom.xml 14(+14 -0)

diff --git a/services/pom.xml b/services/pom.xml
index 007f0ad..2207f6e 100755
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -123,6 +123,20 @@
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
         <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.spec.javax.xml.bind</groupId>
+            <artifactId>jboss-jaxb-api_2.2_spec</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-core-asl</artifactId>
         </dependency>