From b00651391ba6e30a0e422a263b32cff27b923442 Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stianst@gmail.com>
Date: Fri, 5 May 2017 10:40:54 +0200
Subject: [PATCH 1/3] KEYCLOAK-4859 [RHSSO] Upgrade to EAP 7.1.0 Alpha17

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 79b5c36728..4e5796b858 100755
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
         <wildfly.build-tools.version>1.1.3.Final</wildfly.build-tools.version>
         <wildfly11.version>11.0.0.Alpha1</wildfly11.version> <!-- for testing with wf11 pre-releases -->
         <wildfly11.build-tools.version>1.1.8.Final</wildfly11.build-tools.version>
-        <eap.version>7.1.0.Alpha1-redhat-16</eap.version>
+        <eap.version>7.1.0.Beta1-redhat-2</eap.version>
         <eap.build-tools.version>1.1.8.Final</eap.build-tools.version>
         <wildfly.core.version>2.0.10.Final</wildfly.core.version>
 

From 43f64e51c654be386947a86e08d959ac1b8cf554 Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stianst@gmail.com>
Date: Fri, 5 May 2017 11:36:10 +0200
Subject: [PATCH 2/3] KEYCLOAK-4857 [RHSSO] async-http-servlet-3.0 missing in
 newest resteasy

---
 pom.xml                                        | 5 -----
 testsuite/integration-arquillian/tests/pom.xml | 4 ----
 testsuite/integration/pom.xml                  | 4 ----
 3 files changed, 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 4e5796b858..eabcaa981e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -278,11 +278,6 @@
                 <artifactId>resteasy-undertow</artifactId>
                 <version>${resteasy.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.jboss.resteasy</groupId>
-                <artifactId>async-http-servlet-3.0</artifactId>
-                <version>${resteasy.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.jboss.spec.javax.xml.bind</groupId>
                 <artifactId>jboss-jaxb-api_2.2_spec</artifactId>
diff --git a/testsuite/integration-arquillian/tests/pom.xml b/testsuite/integration-arquillian/tests/pom.xml
index f0d569c2df..4e29ec3051 100755
--- a/testsuite/integration-arquillian/tests/pom.xml
+++ b/testsuite/integration-arquillian/tests/pom.xml
@@ -892,10 +892,6 @@
                     <version>${undertow-embedded.version}</version>
                 </dependency>
 
-                <dependency>
-                    <groupId>org.jboss.resteasy</groupId>
-                    <artifactId>async-http-servlet-3.0</artifactId>
-                </dependency>
                 <dependency>
                     <groupId>org.jboss.resteasy</groupId>
                     <artifactId>resteasy-client</artifactId>
diff --git a/testsuite/integration/pom.xml b/testsuite/integration/pom.xml
index 4542557e06..cda3bbbfa8 100755
--- a/testsuite/integration/pom.xml
+++ b/testsuite/integration/pom.xml
@@ -72,10 +72,6 @@
             <groupId>org.jboss.spec.javax.transaction</groupId>
             <artifactId>jboss-transaction-api_1.2_spec</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>async-http-servlet-3.0</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>

From e6477ed261badb73f267383c740f117506936210 Mon Sep 17 00:00:00 2001
From: Stian Thorgersen <stianst@gmail.com>
Date: Fri, 5 May 2017 11:39:17 +0200
Subject: [PATCH 3/3] KEYCLOAK-4856 [RHSSO] Adapter feature pack requires
 org.jboss.eap:wildfly-feature-pack in product

---
 .../feature-pack-build.xml                    |  2 +-
 .../adapter-feature-pack/pom.xml              | 54 ++++++++++++++++---
 2 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/distribution/feature-packs/adapter-feature-pack/feature-pack-build.xml b/distribution/feature-packs/adapter-feature-pack/feature-pack-build.xml
index e249722284..50ea3d7636 100644
--- a/distribution/feature-packs/adapter-feature-pack/feature-pack-build.xml
+++ b/distribution/feature-packs/adapter-feature-pack/feature-pack-build.xml
@@ -17,7 +17,7 @@
 
 <build xmlns="urn:wildfly:feature-pack-build:1.0">
     <dependencies>
-        <artifact name="org.wildfly:wildfly-feature-pack" />
+        <artifact name="${feature.parent}" />
     </dependencies>
     <config>
         <standalone template="configuration/standalone/template.xml" subsystems="configuration/standalone/subsystems.xml" output-file="standalone/configuration/standalone.xml" />
diff --git a/distribution/feature-packs/adapter-feature-pack/pom.xml b/distribution/feature-packs/adapter-feature-pack/pom.xml
index e51f22056d..be9c989d96 100755
--- a/distribution/feature-packs/adapter-feature-pack/pom.xml
+++ b/distribution/feature-packs/adapter-feature-pack/pom.xml
@@ -61,12 +61,6 @@
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-authz-client</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.wildfly</groupId>
-            <artifactId>wildfly-feature-pack</artifactId>
-            <type>zip</type>
-        </dependency>
     </dependencies>
 
     <build>
@@ -119,4 +113,52 @@
         </plugins>
     </build>
 
+
+    <profiles>
+        <profile>
+            <id>community</id>
+            <activation>
+                <property>
+                    <name>!product</name>
+                </property>
+            </activation>
+
+            <properties>
+                <build-tools.version>${wildfly.build-tools.version}</build-tools.version>
+                <feature.parent>org.wildfly:wildfly-feature-pack</feature.parent>
+            </properties>
+
+            <dependencies>
+                <dependency>
+                    <groupId>org.wildfly</groupId>
+                    <artifactId>wildfly-feature-pack</artifactId>
+                    <type>zip</type>
+                </dependency>
+            </dependencies>
+        </profile>
+
+        <profile>
+            <id>product</id>
+            <activation>
+                <property>
+                    <name>product</name>
+                </property>
+            </activation>
+
+            <properties>
+                <build-tools.version>${eap.build-tools.version}</build-tools.version>
+                <feature.parent>org.jboss.eap:wildfly-feature-pack</feature.parent>
+            </properties>
+
+            <dependencies>
+                <dependency>
+                    <groupId>org.jboss.eap</groupId>
+                    <artifactId>wildfly-feature-pack</artifactId>
+                    <version>${eap.version}</version>
+                    <type>zip</type>
+                </dependency>
+            </dependencies>
+        </profile>
+    </profiles>
+
 </project>