keycloak-uncached

Merge pull request #494 from vibe13/master Alignment of

7/3/2014 5:18:34 AM

Details

diff --git a/examples/demo-template/third-party-cdi/pom.xml b/examples/demo-template/third-party-cdi/pom.xml
index b8933b0..4e0a8e0 100755
--- a/examples/demo-template/third-party-cdi/pom.xml
+++ b/examples/demo-template/third-party-cdi/pom.xml
@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>
-            <version>3.1.2.GA</version>
+            <version>${jboss.logging.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/integration/adapter-core/pom.xml b/integration/adapter-core/pom.xml
index eec05bf..4c7d75a 100755
--- a/integration/adapter-core/pom.xml
+++ b/integration/adapter-core/pom.xml
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>
-            <version>3.1.2.GA</version>
+            <version>${jboss.logging.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/integration/as7-eap6/adapter/pom.xml b/integration/as7-eap6/adapter/pom.xml
index b37dd01..20d480a 100755
--- a/integration/as7-eap6/adapter/pom.xml
+++ b/integration/as7-eap6/adapter/pom.xml
@@ -62,7 +62,7 @@
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>
-            <version>3.1.2.GA</version>
+            <version>${jboss.logging.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/integration/jboss-adapter-core/pom.xml b/integration/jboss-adapter-core/pom.xml
index ffb2a63..960fc68 100755
--- a/integration/jboss-adapter-core/pom.xml
+++ b/integration/jboss-adapter-core/pom.xml
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>
-            <version>3.1.2.GA</version>
+            <version>${jboss.logging.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/integration/undertow/pom.xml b/integration/undertow/pom.xml
index b4ab2c1..e6512ff 100755
--- a/integration/undertow/pom.xml
+++ b/integration/undertow/pom.xml
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>
-            <version>3.1.2.GA</version>
+            <version>${jboss.logging.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/integration/wildfly-adapter/pom.xml b/integration/wildfly-adapter/pom.xml
index 2d9a63e..addeda7 100755
--- a/integration/wildfly-adapter/pom.xml
+++ b/integration/wildfly-adapter/pom.xml
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>
-            <version>3.1.2.GA</version>
+            <version>${jboss.logging.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

pom.xml 5(+2 -3)

diff --git a/pom.xml b/pom.xml
index 1383a9e..a3871e1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -16,17 +16,16 @@
         <jackson.version>1.9.9</jackson.version>
         <keycloak.apache.httpcomponents.version>4.2.1</keycloak.apache.httpcomponents.version>
         <resteasy.version>2.3.7.Final</resteasy.version>
-        <resteasy.version.eap.6.3>2.3.7.Final</resteasy.version.eap.6.3>
         <resteasy.version.latest>3.0.8.Final</resteasy.version.latest>
         <undertow.version>1.0.15.Final</undertow.version>
         <picketlink.version>2.6.0.CR5</picketlink.version>
         <picketbox.ldap.version>1.0.2.Final</picketbox.ldap.version>
         <mongo.driver.version>2.11.3</mongo.driver.version>
-        <jboss.logging.version>3.1.1.GA</jboss.logging.version>
+        <jboss.logging.version>3.1.4.GA</jboss.logging.version>
         <jboss-logging-tools.version>1.2.0.Beta1</jboss-logging-tools.version>
         <hibernate.javax.persistence.version>1.0.1.Final</hibernate.javax.persistence.version>
         <hibernate.entitymanager.version>4.0.1.Final</hibernate.entitymanager.version>
-        <h2.version>1.3.161</h2.version>
+        <h2.version>1.3.168</h2.version>
         <mysql.version>5.1.29</mysql.version>
         <postgresql.version>9.3-1100-jdbc41</postgresql.version>
         <dom4j.version>1.6.1</dom4j.version>