keycloak-uncached

Merge pull request #427 from stianst/master Deploy server

5/28/2014 11:32:58 AM

Details

audit/tests/pom.xml 12(+12 -0)

diff --git a/audit/tests/pom.xml b/audit/tests/pom.xml
index 1b8cac1..e911cc2 100755
--- a/audit/tests/pom.xml
+++ b/audit/tests/pom.xml
@@ -13,6 +13,18 @@
     <name>Keycloak Audit Tests</name>
     <description/>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>org.keycloak</groupId>
diff --git a/authentication/authentication-api/pom.xml b/authentication/authentication-api/pom.xml
index 73a15d8..86b4d42 100644
--- a/authentication/authentication-api/pom.xml
+++ b/authentication/authentication-api/pom.xml
@@ -1,7 +1,7 @@
 <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/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>keycloak-authentication</artifactId>
+        <artifactId>keycloak-authentication-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.0-beta-1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
diff --git a/authentication/authentication-model/pom.xml b/authentication/authentication-model/pom.xml
index 9ab4613..7ef6874 100644
--- a/authentication/authentication-model/pom.xml
+++ b/authentication/authentication-model/pom.xml
@@ -1,7 +1,7 @@
 <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/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>keycloak-authentication</artifactId>
+        <artifactId>keycloak-authentication-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.0-beta-1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
diff --git a/authentication/authentication-picketlink/pom.xml b/authentication/authentication-picketlink/pom.xml
index 748c99d..3f06db3 100644
--- a/authentication/authentication-picketlink/pom.xml
+++ b/authentication/authentication-picketlink/pom.xml
@@ -1,7 +1,7 @@
 <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/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>keycloak-authentication</artifactId>
+        <artifactId>keycloak-authentication-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.0-beta-1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
diff --git a/authentication/pom.xml b/authentication/pom.xml
index ac23138..46cc717 100644
--- a/authentication/pom.xml
+++ b/authentication/pom.xml
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
-    <artifactId>keycloak-authentication</artifactId>
+    <artifactId>keycloak-authentication-parent</artifactId>
     <name>Keycloak Authentication</name>
     <description />
 
@@ -21,4 +21,4 @@
         <module>authentication-picketlink</module>
     </modules>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/distribution/examples-docs-zip/pom.xml b/distribution/examples-docs-zip/pom.xml
index ee31f51..d797a44 100755
--- a/distribution/examples-docs-zip/pom.xml
+++ b/distribution/examples-docs-zip/pom.xml
@@ -19,6 +19,13 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <version>1.7</version>
                 <inherited>false</inherited>
diff --git a/distribution/modules/pom.xml b/distribution/modules/pom.xml
index 6aadb8d..23e8c3b 100755
--- a/distribution/modules/pom.xml
+++ b/distribution/modules/pom.xml
@@ -90,6 +90,13 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <version>1.7</version>
                 <inherited>false</inherited>
diff --git a/distribution/src-dist/pom.xml b/distribution/src-dist/pom.xml
index 95d7c12..0e83703 100755
--- a/distribution/src-dist/pom.xml
+++ b/distribution/src-dist/pom.xml
@@ -18,6 +18,13 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>2.4</version>
                 <executions>
diff --git a/distribution/theme-template-zip/pom.xml b/distribution/theme-template-zip/pom.xml
index 5742cc5..04eb5a3 100755
--- a/distribution/theme-template-zip/pom.xml
+++ b/distribution/theme-template-zip/pom.xml
@@ -19,6 +19,13 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <version>1.7</version>
                 <inherited>false</inherited>
diff --git a/distribution/war-zip/pom.xml b/distribution/war-zip/pom.xml
index 3c75d9c..1390e24 100755
--- a/distribution/war-zip/pom.xml
+++ b/distribution/war-zip/pom.xml
@@ -19,6 +19,13 @@
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <!--<version>2.7</version> -->
                 <executions>

docbook/pom.xml 11(+9 -2)

diff --git a/docbook/pom.xml b/docbook/pom.xml
index cad69fe..629cd4c 100755
--- a/docbook/pom.xml
+++ b/docbook/pom.xml
@@ -41,6 +41,13 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+            <plugin>
                 <groupId>org.jboss.maven.plugins</groupId>
                 <artifactId>maven-jdocbook-plugin</artifactId>
                 <version>2.3.8</version>
@@ -63,9 +70,9 @@
                 <configuration>
                     <sourceDocumentName>master.xml</sourceDocumentName>
                     <masterTranslation>en-US</masterTranslation>
-                    <sourceDirectory>reference/en</sourceDirectory>
+                    <sourceDirectory>${project.basedir}/reference/en</sourceDirectory>
                     <imageResource>
-                        <directory>reference/en</directory>
+                        <directory>${project.basedir}/reference/en</directory>
                         <includes>
                             <include>images/*</include>
                         </includes>
diff --git a/examples/demo-template/customer-app-cli/pom.xml b/examples/demo-template/customer-app-cli/pom.xml
index 61e903e..87ef08e 100755
--- a/examples/demo-template/customer-app-cli/pom.xml
+++ b/examples/demo-template/customer-app-cli/pom.xml
@@ -17,7 +17,7 @@
     <dependencies>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-installed</artifactId>
+            <artifactId>keycloak-installed-adapter</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
diff --git a/export-import/export-import-api/pom.xml b/export-import/export-import-api/pom.xml
index e4ed0ad..7f2f0fa 100644
--- a/export-import/export-import-api/pom.xml
+++ b/export-import/export-import-api/pom.xml
@@ -2,7 +2,7 @@
 <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-export-import</artifactId>
+        <artifactId>keycloak-export-import-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.0-beta-1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
diff --git a/export-import/export-import-impl/pom.xml b/export-import/export-import-impl/pom.xml
index 17a566e..6ffce86 100644
--- a/export-import/export-import-impl/pom.xml
+++ b/export-import/export-import-impl/pom.xml
@@ -2,7 +2,7 @@
 <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-export-import</artifactId>
+        <artifactId>keycloak-export-import-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.0-beta-1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
diff --git a/export-import/pom.xml b/export-import/pom.xml
index 6df4145..caf22b7 100644
--- a/export-import/pom.xml
+++ b/export-import/pom.xml
@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
-    <artifactId>keycloak-export-import</artifactId>
+    <artifactId>keycloak-export-import-parent</artifactId>
     <name>Keycloak Export And Import</name>
     <description/>
 
diff --git a/forms/account-api/pom.xml b/forms/account-api/pom.xml
index 33658a5..fd6d5e4 100755
--- a/forms/account-api/pom.xml
+++ b/forms/account-api/pom.xml
@@ -2,7 +2,7 @@
 <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-forms</artifactId>
+		<artifactId>keycloak-forms-parent</artifactId>
 		<groupId>org.keycloak</groupId>
 		<version>1.0-beta-1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
diff --git a/forms/account-freemarker/pom.xml b/forms/account-freemarker/pom.xml
index 1c5c02a..90f3d4e 100755
--- a/forms/account-freemarker/pom.xml
+++ b/forms/account-freemarker/pom.xml
@@ -2,7 +2,7 @@
 <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-forms</artifactId>
+		<artifactId>keycloak-forms-parent</artifactId>
 		<groupId>org.keycloak</groupId>
 		<version>1.0-beta-1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
diff --git a/forms/common-freemarker/pom.xml b/forms/common-freemarker/pom.xml
index f89c87b..668aca7 100755
--- a/forms/common-freemarker/pom.xml
+++ b/forms/common-freemarker/pom.xml
@@ -2,7 +2,7 @@
 <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-forms</artifactId>
+		<artifactId>keycloak-forms-parent</artifactId>
 		<groupId>org.keycloak</groupId>
 		<version>1.0-beta-1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
diff --git a/forms/common-themes/pom.xml b/forms/common-themes/pom.xml
index 411e96a..cdcb776 100755
--- a/forms/common-themes/pom.xml
+++ b/forms/common-themes/pom.xml
@@ -2,7 +2,7 @@
 <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-forms</artifactId>
+		<artifactId>keycloak-forms-parent</artifactId>
 		<groupId>org.keycloak</groupId>
 		<version>1.0-beta-1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
diff --git a/forms/email-api/pom.xml b/forms/email-api/pom.xml
index 62df27f..1650b21 100755
--- a/forms/email-api/pom.xml
+++ b/forms/email-api/pom.xml
@@ -2,7 +2,7 @@
 <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-forms</artifactId>
+		<artifactId>keycloak-forms-parent</artifactId>
 		<groupId>org.keycloak</groupId>
 		<version>1.0-beta-1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
diff --git a/forms/email-freemarker/pom.xml b/forms/email-freemarker/pom.xml
index f83f098..2a1b295 100755
--- a/forms/email-freemarker/pom.xml
+++ b/forms/email-freemarker/pom.xml
@@ -2,7 +2,7 @@
 <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-forms</artifactId>
+        <artifactId>keycloak-forms-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.0-beta-1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
diff --git a/forms/login-api/pom.xml b/forms/login-api/pom.xml
index bb2a702..e8007c1 100755
--- a/forms/login-api/pom.xml
+++ b/forms/login-api/pom.xml
@@ -2,7 +2,7 @@
 <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-forms</artifactId>
+		<artifactId>keycloak-forms-parent</artifactId>
 		<groupId>org.keycloak</groupId>
 		<version>1.0-beta-1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
diff --git a/forms/login-freemarker/pom.xml b/forms/login-freemarker/pom.xml
index 9e51232..87f30a0 100755
--- a/forms/login-freemarker/pom.xml
+++ b/forms/login-freemarker/pom.xml
@@ -2,7 +2,7 @@
 <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-forms</artifactId>
+		<artifactId>keycloak-forms-parent</artifactId>
 		<groupId>org.keycloak</groupId>
 		<version>1.0-beta-1-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>

forms/pom.xml 2(+1 -1)

diff --git a/forms/pom.xml b/forms/pom.xml
index 0f2268d..a2d3028 100755
--- a/forms/pom.xml
+++ b/forms/pom.xml
@@ -10,7 +10,7 @@
 	<modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
-	<artifactId>keycloak-forms</artifactId>
+	<artifactId>keycloak-forms-parent</artifactId>
 	<name>Keycloak Forms</name>
 	<description />
 
diff --git a/integration/installed/pom.xml b/integration/installed/pom.xml
index 09f3e1a..f880bd8 100755
--- a/integration/installed/pom.xml
+++ b/integration/installed/pom.xml
@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>keycloak-installed</artifactId>
+    <artifactId>keycloak-installed-adapter</artifactId>
     <name>Keycloak Installed Application</name>
     <description/>
 
diff --git a/integration/pom.xml b/integration/pom.xml
index 15a2196..a6f8b81 100755
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -10,7 +10,7 @@
     <description/>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>integration-pom</artifactId>
+    <artifactId>keycloak-integration-pom</artifactId>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/model/tests/pom.xml b/model/tests/pom.xml
index 87817fe..b9d96fe 100755
--- a/model/tests/pom.xml
+++ b/model/tests/pom.xml
@@ -162,7 +162,13 @@
 
     <build>
         <plugins>
-
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
diff --git a/picketlink/keycloak-picketlink-api/pom.xml b/picketlink/keycloak-picketlink-api/pom.xml
index b23e616..08aaf5c 100644
--- a/picketlink/keycloak-picketlink-api/pom.xml
+++ b/picketlink/keycloak-picketlink-api/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>keycloak-picketlink</artifactId>
+        <artifactId>keycloak-picketlink-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.0-beta-1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
diff --git a/picketlink/keycloak-picketlink-realm/pom.xml b/picketlink/keycloak-picketlink-realm/pom.xml
index e82acb1..fc14358 100644
--- a/picketlink/keycloak-picketlink-realm/pom.xml
+++ b/picketlink/keycloak-picketlink-realm/pom.xml
@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>keycloak-picketlink</artifactId>
+        <artifactId>keycloak-picketlink-parent</artifactId>
         <groupId>org.keycloak</groupId>
         <version>1.0-beta-1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
diff --git a/picketlink/pom.xml b/picketlink/pom.xml
index 2917578..948d467 100644
--- a/picketlink/pom.xml
+++ b/picketlink/pom.xml
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
 
-    <artifactId>keycloak-picketlink</artifactId>
+    <artifactId>keycloak-picketlink-parent</artifactId>
     <name>Keycloak Picketlink</name>
     <description />
 
@@ -21,4 +21,4 @@
     </modules>
 
 
-</project>
\ No newline at end of file
+</project>

server/pom.xml 9(+0 -9)

diff --git a/server/pom.xml b/server/pom.xml
index 21770b3..d6f3d2e 100755
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -308,7 +308,6 @@
                     <skip>false</skip>
                 </configuration>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-deploy-plugin</artifactId>
@@ -316,14 +315,6 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>${maven.compiler.source}</source>
-                    <target>${maven.compiler.target}</target>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>