Prosoft Git

keycloak-uncached

Exclude stax-api and replace relaxngDataType with redhat …

11/16/2015 1:31:43 PM
Lukas Kubik

Lukas Kubik

Commit: 46f73d9

Tree: 7bc6c59

Parents: ab19f37

Changes

examples/fuse/camel/pom.xml 4(+4 -0)

examples/fuse/cxf-jaxws/pom.xml 4(+4 -0)

pom.xml 31(+31 -0)

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

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

testsuite/integration/pom.xml 5(+5 -0)

testsuite/integration-arquillian/tests/pom.xml 4(+4 -0)

testsuite/jetty/jetty81/pom.xml 4(+4 -0)

testsuite/jetty/jetty91/pom.xml 4(+4 -0)

testsuite/jetty/jetty92/pom.xml 4(+4 -0)

testsuite/proxy/pom.xml 4(+4 -0)

testsuite/tomcat6/pom.xml 4(+4 -0)

testsuite/tomcat7/pom.xml 4(+4 -0)

testsuite/tomcat8/pom.xml 4(+4 -0)

testsuite/wildfly/pom.xml 4(+4 -0)

Details

examples/fuse/camel/pom.xml 4(+4 -0) 

diff --git a/examples/fuse/camel/pom.xml b/examples/fuse/camel/pom.xml
index 4d7682f..2798167 100755
--- a/examples/fuse/camel/pom.xml
+++ b/examples/fuse/camel/pom.xml
@@ -49,6 +49,10 @@
             <artifactId>camel-jetty</artifactId>
             <version>${camel.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.relaxng</groupId>
+            <artifactId>relaxngDatatype</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

examples/fuse/cxf-jaxws/pom.xml 4(+4 -0) 

diff --git a/examples/fuse/cxf-jaxws/pom.xml b/examples/fuse/cxf-jaxws/pom.xml
index 744d0f4..f5a1137 100755
--- a/examples/fuse/cxf-jaxws/pom.xml
+++ b/examples/fuse/cxf-jaxws/pom.xml
@@ -71,6 +71,10 @@
             <artifactId>cxf-rt-transports-http-jetty</artifactId>
             <version>${cxf.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.relaxng</groupId>
+            <artifactId>relaxngDatatype</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

pom.xml 31(+31 -0) 

diff --git a/pom.xml b/pom.xml
index c418a63..a227892 100755
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,9 @@
         <!--<xmlsec.version>1.5.1</xmlsec.version>-->
         <aesh.version>0.65.1</aesh.version>
         <commons.logging.version>1.1.1-redhat-2</commons.logging.version>
+        <!-- txw2 and istack versions have to be in sync with eap6-supported-artifacts bom -->
+        <com.sun.xml.txw2.version>20110809.0.0.redhat-5</com.sun.xml.txw2.version>
+        <version.com.sun.istack>2.6.1.redhat-3</version.com.sun.istack>
 
         <enforcer.plugin.version>1.4</enforcer.plugin.version>
         <jboss.as.plugin.version>7.5.Final</jboss.as.plugin.version>
@@ -387,6 +390,34 @@
                 <artifactId>commons-logging</artifactId>
                 <version>${commons.logging.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.sun.xml.txw2</groupId>
+                <artifactId>txw2</artifactId>
+                <version>${com.sun.xml.txw2.version}</version>
+                <exclusions>
+                    <!--Part of Java SE from version 6-->
+                    <exclusion>
+                        <groupId>javax.xml.stream</groupId>
+                        <artifactId>stax-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>relaxngDatatype</groupId>
+                        <artifactId>relaxngDatatype</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.istack</groupId>
+                <artifactId>istack-commons-runtime</artifactId>
+                <version>${version.com.sun.istack}</version>
+                <exclusions>
+                    <!--Part of Java SE from version 6-->
+                    <exclusion>
+                        <groupId>javax.xml.stream</groupId>
+                        <artifactId>stax-api</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
 
             <!-- Twitter -->
             <dependency>

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

diff --git a/saml/saml-protocol/pom.xml b/saml/saml-protocol/pom.xml
index 30c6f9b..8801752 100755
--- a/saml/saml-protocol/pom.xml
+++ b/saml/saml-protocol/pom.xml
@@ -29,6 +29,11 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
+            <groupId>com.github.relaxng</groupId>
+            <artifactId>relaxngDatatype</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-common</artifactId>
             <scope>provided</scope>

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

diff --git a/services/pom.xml b/services/pom.xml
index 3f4cd8b..3e6f849 100755
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -127,6 +127,10 @@
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
         <dependency>
+            <groupId>com.github.relaxng</groupId>
+            <artifactId>relaxngDatatype</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-core-asl</artifactId>
         </dependency>

testsuite/integration/pom.xml 5(+5 -0) 

diff --git a/testsuite/integration/pom.xml b/testsuite/integration/pom.xml
index af417a9..40ac56e 100755
--- a/testsuite/integration/pom.xml
+++ b/testsuite/integration/pom.xml
@@ -109,6 +109,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>com.github.relaxng</groupId>
+            <artifactId>relaxngDatatype</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jackson-provider</artifactId>
             <version>3.0.10.Final</version>

testsuite/integration-arquillian/tests/pom.xml 4(+4 -0) 

diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml
index a5a7e0c..6152e5e 100644
--- a/testsuite/integration-arquillian/tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/pom.xml
@@ -316,6 +316,10 @@
                     <artifactId>resteasy-multipart-provider</artifactId>
                 </dependency>
                 <dependency>
+                    <groupId>com.github.relaxng</groupId>
+                    <artifactId>relaxngDatatype</artifactId>
+                </dependency>
+                <dependency>
                     <groupId>org.jboss.resteasy</groupId>
                     <artifactId>resteasy-jackson-provider</artifactId>
                 </dependency>

testsuite/jetty/jetty81/pom.xml 4(+4 -0) 

diff --git a/testsuite/jetty/jetty81/pom.xml b/testsuite/jetty/jetty81/pom.xml
index e8a30f4..871e74a 100755
--- a/testsuite/jetty/jetty81/pom.xml
+++ b/testsuite/jetty/jetty81/pom.xml
@@ -75,6 +75,10 @@
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
         <dependency>
+            <groupId>com.github.relaxng</groupId>
+            <artifactId>relaxngDatatype</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jackson-provider</artifactId>
         </dependency>

testsuite/jetty/jetty91/pom.xml 4(+4 -0) 

diff --git a/testsuite/jetty/jetty91/pom.xml b/testsuite/jetty/jetty91/pom.xml
index dbf3b52..f589b95 100755
--- a/testsuite/jetty/jetty91/pom.xml
+++ b/testsuite/jetty/jetty91/pom.xml
@@ -75,6 +75,10 @@
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
         <dependency>
+            <groupId>com.github.relaxng</groupId>
+            <artifactId>relaxngDatatype</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jackson-provider</artifactId>
         </dependency>

testsuite/jetty/jetty92/pom.xml 4(+4 -0) 

diff --git a/testsuite/jetty/jetty92/pom.xml b/testsuite/jetty/jetty92/pom.xml
index 41cbb1c..49cd2a3 100755
--- a/testsuite/jetty/jetty92/pom.xml
+++ b/testsuite/jetty/jetty92/pom.xml
@@ -79,6 +79,10 @@
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
         <dependency>
+            <groupId>com.github.relaxng</groupId>
+            <artifactId>relaxngDatatype</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jackson-provider</artifactId>
         </dependency>

testsuite/proxy/pom.xml 4(+4 -0) 

diff --git a/testsuite/proxy/pom.xml b/testsuite/proxy/pom.xml
index 70ef80a..266b789 100755
--- a/testsuite/proxy/pom.xml
+++ b/testsuite/proxy/pom.xml
@@ -70,6 +70,10 @@
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
         <dependency>
+            <groupId>com.github.relaxng</groupId>
+            <artifactId>relaxngDatatype</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jackson-provider</artifactId>
         </dependency>

testsuite/tomcat6/pom.xml 4(+4 -0) 

diff --git a/testsuite/tomcat6/pom.xml b/testsuite/tomcat6/pom.xml
index 449db87..aedb72a 100755
--- a/testsuite/tomcat6/pom.xml
+++ b/testsuite/tomcat6/pom.xml
@@ -69,6 +69,10 @@
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
         <dependency>
+            <groupId>com.github.relaxng</groupId>
+            <artifactId>relaxngDatatype</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jackson-provider</artifactId>
         </dependency>

testsuite/tomcat7/pom.xml 4(+4 -0) 

diff --git a/testsuite/tomcat7/pom.xml b/testsuite/tomcat7/pom.xml
index 9dc317f..a4d2392 100755
--- a/testsuite/tomcat7/pom.xml
+++ b/testsuite/tomcat7/pom.xml
@@ -99,6 +99,10 @@
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
         <dependency>
+            <groupId>com.github.relaxng</groupId>
+            <artifactId>relaxngDatatype</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jackson-provider</artifactId>
         </dependency>

testsuite/tomcat8/pom.xml 4(+4 -0) 

diff --git a/testsuite/tomcat8/pom.xml b/testsuite/tomcat8/pom.xml
index eb46bdc..bc5c037 100755
--- a/testsuite/tomcat8/pom.xml
+++ b/testsuite/tomcat8/pom.xml
@@ -83,6 +83,10 @@
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
         <dependency>
+            <groupId>com.github.relaxng</groupId>
+            <artifactId>relaxngDatatype</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jackson-provider</artifactId>
         </dependency>

testsuite/wildfly/pom.xml 4(+4 -0) 

diff --git a/testsuite/wildfly/pom.xml b/testsuite/wildfly/pom.xml
index fd5c195..b56be88 100644
--- a/testsuite/wildfly/pom.xml
+++ b/testsuite/wildfly/pom.xml
@@ -72,6 +72,10 @@
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
         <dependency>
+            <groupId>com.github.relaxng</groupId>
+            <artifactId>relaxngDatatype</artifactId>
+        </dependency>
+        <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jackson-provider</artifactId>
         </dependency>

Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github