Merge pull request #427 from stianst/master

Deploy server war and dist bundles to Maven repo. Also added '-parent' to some parent poms where this was missing

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>

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>

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>

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>

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>
+</project>

distribution/examples-docs-zip/pom.xml

@@ -17,6 +17,13 @@
     </dependencies>
     <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-antrun-plugin</artifactId>

distribution/modules/pom.xml

@@ -88,6 +88,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-antrun-plugin</artifactId>

distribution/src-dist/pom.xml

@@ -17,6 +17,13 @@
     </dependencies>
     <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>

distribution/theme-template-zip/pom.xml

@@ -17,6 +17,13 @@
     </dependencies>
     <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-antrun-plugin</artifactId>

distribution/war-zip/pom.xml

@@ -17,6 +17,13 @@
     </dependencies>
     <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-dependency-plugin</artifactId>

docbook/pom.xml

@@ -40,6 +40,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>
@@ -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>

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>

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>

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>

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/>
 

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>

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>

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>

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>

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>

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>

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>

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

@@ -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 />
 

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/>
 

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>

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>

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>

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>

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>
+</project>

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>