From 91e29d97104a3be8e9ceac787432d6513c8393c9 Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stianst@gmail.com>
Date: Thu, 5 Jun 2014 12:54:02 +0100
Subject: [PATCH] KEYCLOAK-496 Dependency jira alignments with other JBoss
 projects

---
 pom.xml                                       | 14 +++++---------
 project-integrations/aerogear-ups/app/pom.xml |  2 +-
 testsuite/integration/pom.xml                 |  4 ++--
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 169a745994..6279df5e46 100755
--- a/pom.xml
+++ b/pom.xml
@@ -13,8 +13,8 @@
 
     <properties>
         <bouncycastle.version>1.46</bouncycastle.version>
-        <jackson.version>1.9.12</jackson.version>
-        <keycloak.apache.httpcomponents.version>4.1.2</keycloak.apache.httpcomponents.version>
+        <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>
@@ -35,13 +35,14 @@
         <slf4j.version>1.5.10</slf4j.version>
         <jboss.version>7.1.1.Final</jboss.version>
         <wildfly.version>8.1.0.Final</wildfly.version>
-        <servlet.api.30.version>1.0.1.Final</servlet.api.30.version>
+        <servlet.api.30.version>1.0.2.Final</servlet.api.30.version>
         <google.zxing.version>2.2</google.zxing.version>
         <google.client.version>1.14.1-beta</google.client.version>
         <winzipaes.version>1.0.1</winzipaes.version>
         <freemarker.version>2.3.20</freemarker.version>
         <twitter4j.version>3.0.5</twitter4j.version>
         <selenium.version>2.35.0</selenium.version>
+        <javax.mail.version>1.4.5</javax.mail.version>
 
         <!-- maven-compiler-plugin -->
         <maven.compiler.target>1.6</maven.compiler.target>
@@ -133,7 +134,7 @@
             <dependency>
                 <groupId>javax.mail</groupId>
                 <artifactId>mail</artifactId>
-                <version>1.4.7</version>
+                <version>${javax.mail.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.jboss.resteasy</groupId>
@@ -210,11 +211,6 @@
                 <artifactId>jboss-servlet-api_3.0_spec</artifactId>
                 <version>${servlet.api.30.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.jboss.spec.javax.servlet</groupId>
-                <artifactId>jboss-servlet-api_3.1_spec</artifactId>
-                <version>1.0.0.Beta1</version>
-            </dependency>
             <dependency>
                 <groupId>org.picketlink</groupId>
                 <artifactId>picketlink-common</artifactId>
diff --git a/project-integrations/aerogear-ups/app/pom.xml b/project-integrations/aerogear-ups/app/pom.xml
index ff5fabedc2..2b7b3a186e 100755
--- a/project-integrations/aerogear-ups/app/pom.xml
+++ b/project-integrations/aerogear-ups/app/pom.xml
@@ -78,7 +78,7 @@
         <dependency>
             <groupId>javax.enterprise</groupId>
             <artifactId>cdi-api</artifactId>
-            <version>1.1</version>
+            <version>1.0-SP4</version>
             <scope>provided</scope>
         </dependency>
 
diff --git a/testsuite/integration/pom.xml b/testsuite/integration/pom.xml
index fda1c91ec9..434df207c7 100755
--- a/testsuite/integration/pom.xml
+++ b/testsuite/integration/pom.xml
@@ -26,7 +26,7 @@
     <dependencies>
         <dependency>
             <groupId>org.jboss.spec.javax.servlet</groupId>
-            <artifactId>jboss-servlet-api_3.1_spec</artifactId>
+            <artifactId>jboss-servlet-api_3.0_spec</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -148,7 +148,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.2.1</version>
+            <version>${keycloak.apache.httpcomponents.version}</version>
         </dependency>
 
         <!--