keycloak-memoizeit

Merge pull request #2064 from tkyjovsk/KEYCLOAK-1420 Keycloak

1/21/2016 6:58:53 AM

Changes

.travis.yml 1(+0 -1)

pom.xml 8(+0 -8)

testsuite/pom.xml 20(+10 -10)

Details

.travis.yml 1(+0 -1)

diff --git a/.travis.yml b/.travis.yml
index 3da0679..c69a2bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,5 @@ install:
 
 script:
   - mvn test -B
-  - mvn -file testsuite/integration-arquillian test -B -Pno-console
 
 sudo: false

pom.xml 8(+0 -8)

diff --git a/pom.xml b/pom.xml
index 54fa4f9..f664d15 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1334,14 +1334,6 @@
             </build>
         </profile>
 
-        <profile>
-            <id>arquillian-integration-tests</id>
-            <modules>
-                <module>distribution</module>
-                <module>testsuite/integration-arquillian</module>
-            </modules>
-        </profile>
-
         <!-- Configure the JBoss Early Access Maven repository -->
         <profile>
             <id>jboss-earlyaccess-repository</id>

testsuite/pom.xml 20(+10 -10)

diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 490d9b1..e3663bc 100755
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<parent>
-		<artifactId>keycloak-parent</artifactId>
-		<groupId>org.keycloak</groupId>
-		<version>1.9.0.CR1-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>keycloak-parent</artifactId>
+        <groupId>org.keycloak</groupId>
+        <version>1.9.0.CR1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
 
-	<artifactId>keycloak-testsuite-pom</artifactId>
+    <artifactId>keycloak-testsuite-pom</artifactId>
     <packaging>pom</packaging>
     <name>Keycloak TestSuite</name>
-	<description />
+    <description />
 
     <build>
         <plugins>
@@ -40,7 +40,7 @@
         <module>tomcat8</module>
         <module>jetty</module>
         <module>performance</module>
-        <!--<module>docker-cluster</module>-->
+        <module>integration-arquillian</module>
     </modules>
 
     <profiles>