Rename feature pack artifacts. Fix empty content directory.

distribution/feature-pack-builds/adapter-only/adapter-feature-pack/assembly.xml

@@ -32,7 +32,7 @@
     <includeBaseDirectory>false</includeBaseDirectory>
     <fileSets>
         <fileSet>
-            <directory>target/keycloak-feature-pack-adapter-${project.version}</directory>
+            <directory>target/${project.build.finalName}</directory>
             <outputDirectory/>            
         </fileSet>
     </fileSets>

distribution/feature-pack-builds/adapter-only/adapter-feature-pack/pom.xml

@@ -26,7 +26,7 @@
     <modelVersion>4.0.0</modelVersion>
     
     <groupId>org.keycloak</groupId>
-    <artifactId>feature-pack-adapter</artifactId>
+    <artifactId>keycloak-adapter-feature-pack</artifactId>
 
     <name>Keycloak Feature Pack: Adapter</name>
     <packaging>pom</packaging>
@@ -124,7 +124,6 @@
     </dependencies>
 
     <build>
-        <finalName>keycloak-feature-pack-adapter-${project.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -162,7 +161,7 @@
                                 <descriptor>assembly.xml</descriptor>
                             </descriptors>
                             <recompressZippedFiles>true</recompressZippedFiles>
-                            <finalName>keycloak-feature-pack-adapter-${project.version}</finalName>
+                            <finalName>${project.build.finalName}</finalName>
                             <appendAssemblyId>false</appendAssemblyId>
                             <outputDirectory>target/</outputDirectory>
                             <workDirectory>target/assembly/work</workDirectory>

distribution/feature-pack-builds/adapter-only/adapter-feature-pack/src/main/resources/content/README.md

@@ -0,0 +1,2 @@
+This directory intentionally left empty.  The Feature Pack plugin barfs if there is no content 
+directory.  But Git won't save an empty directory.  Thus, we need this readme file.

distribution/feature-pack-builds/adapter-only/adapter-only-build/assembly.xml

@@ -29,7 +29,7 @@
             <directory>target</directory>
             <outputDirectory/>
             <includes>
-                <include>${project.artifactId}-${project.version}/**</include>
+                <include>${project.build.finalName}/**</include>
             </includes>
         </fileSet>
     </fileSets>

distribution/feature-pack-builds/adapter-only/adapter-only-build/pom.xml

@@ -26,7 +26,7 @@
     <modelVersion>4.0.0</modelVersion>
     
     <groupId>org.keycloak</groupId>
-    <artifactId>adapter-only-build</artifactId>
+    <artifactId>keycloak-adapter-only-build</artifactId>
 
     <name>Keycloak WildFly Build: Adapter Only</name>
     <packaging>pom</packaging>
@@ -34,14 +34,13 @@
     <dependencies>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>feature-pack-adapter</artifactId>
+            <artifactId>keycloak-adapter-feature-pack</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
         </dependency>
     </dependencies>
 
     <build>
-        <finalName>${project.artifactId}-${project.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.wildfly.build</groupId>
@@ -74,7 +73,7 @@
                                 <descriptor>assembly.xml</descriptor>
                             </descriptors>
                             <recompressZippedFiles>true</recompressZippedFiles>
-                            <finalName>${project.artifactId}-${project.version}</finalName>
+                            <finalName>${project.build.finalName}</finalName>
                             <appendAssemblyId>false</appendAssemblyId>
                             <outputDirectory>${project.build.directory}</outputDirectory>
                             <workDirectory>${project.build.directory}/assembly/work</workDirectory>

distribution/feature-pack-builds/adapter-only/adapter-only-build/server-provisioning.xml

@@ -20,6 +20,6 @@
         <!-- uncomment wildfly-feature-pack to build against wildfly full instead of wildfly web -->
         <!--<feature-pack groupId="org.wildfly" artifactId="wildfly-feature-pack" version="${wildfly9.version}"/>-->
         
-        <feature-pack groupId="org.keycloak" artifactId="feature-pack-adapter" version="${project.version}"/>
+        <feature-pack groupId="org.keycloak" artifactId="keycloak-adapter-feature-pack" version="${project.version}"/>
     </feature-packs>
 </server-provisioning>

distribution/feature-pack-builds/adapter-only/adapter-only-dist/pom.xml

@@ -26,7 +26,7 @@
     <modelVersion>4.0.0</modelVersion>
     
     <groupId>org.keycloak</groupId>
-    <artifactId>adapter-only-dist</artifactId>
+    <artifactId>keycloak-adapter-only-dist</artifactId>
 
     <name>Keycloak WildFly Dist: Adapter Only</name>
     <packaging>pom</packaging>
@@ -34,15 +34,11 @@
     <dependencies>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>feature-pack-adapter</artifactId>
+            <artifactId>keycloak-adapter-feature-pack</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
         </dependency>
     </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}-${project.version}</finalName>
-    </build>
     
     <profiles>
         <profile>

distribution/feature-pack-builds/adapter-only/adapter-only-dist/server-provisioning.xml

@@ -20,6 +20,6 @@
         <!-- uncomment wildfly-feature-pack to build against wildfly full instead of wildfly web -->
         <!--<feature-pack groupId="org.wildfly" artifactId="wildfly-feature-pack" version="${wildfly9.version}"/>-->
         
-        <feature-pack groupId="org.keycloak" artifactId="feature-pack-adapter" version="${project.version}"/>
+        <feature-pack groupId="org.keycloak" artifactId="keycloak-adapter-feature" version="${project.version}"/>
     </feature-packs>
 </server-provisioning>

distribution/feature-pack-builds/adapter-only/pom.xml

@@ -14,7 +14,7 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>feature-pack-adapter</module>
+        <module>adapter-feature-pack</module>
         <module>adapter-only-build</module>
         <module>adapter-only-dist</module>
     </modules>

distribution/feature-pack-builds/server-and-adapter/server-and-adapter-build/pom.xml

@@ -26,7 +26,7 @@
     <modelVersion>4.0.0</modelVersion>
     
     <groupId>org.keycloak</groupId>
-    <artifactId>server-and-adapter-build</artifactId>
+    <artifactId>keycloak-server-and-adapter-build</artifactId>
 
     <name>Keycloak WildFly Build: Server and Adapter</name>
     <packaging>pom</packaging>
@@ -34,20 +34,19 @@
     <dependencies>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>feature-pack-server</artifactId>
+            <artifactId>keycloak-server-feature-pack</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>feature-pack-adapter</artifactId>
+            <artifactId>keycloak-adapter-feature-pack</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
         </dependency>
     </dependencies>
 
     <build>
-        <finalName>${project.artifactId}-${project.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.wildfly.build</groupId>

distribution/feature-pack-builds/server-and-adapter/server-and-adapter-build/server-provisioning.xml

@@ -17,7 +17,7 @@
 -->
 <server-provisioning xmlns="urn:wildfly:server-provisioning:1.0">
     <feature-packs>
-        <feature-pack groupId="org.keycloak" artifactId="feature-pack-server" version="${project.version}"/>     
-	  <feature-pack groupId="org.keycloak" artifactId="feature-pack-adapter" version="${project.version}"/>     
+        <feature-pack groupId="org.keycloak" artifactId="keycloak-server-feature-pack" version="${project.version}"/>     
+	  <feature-pack groupId="org.keycloak" artifactId="keycloak-adapter-feature-pack" version="${project.version}"/>     
     </feature-packs>
 </server-provisioning>

distribution/feature-pack-builds/server-and-adapter/server-and-adapter-dist/pom.xml

@@ -26,7 +26,7 @@
     <modelVersion>4.0.0</modelVersion>
     
     <groupId>org.keycloak</groupId>
-    <artifactId>server-and-adapter-dist</artifactId>
+    <artifactId>keycloak-server-and-adapter-dist</artifactId>
 
     <name>Keycloak WildFly Dist: Server and Adapter</name>
     <packaging>pom</packaging>
@@ -34,22 +34,18 @@
     <dependencies>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>feature-pack-server</artifactId>
+            <artifactId>keycloak-server-feature-pack</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
         </dependency>
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>feature-pack-adapter</artifactId>
+            <artifactId>keycloak-adapter-feature-pack</artifactId>
             <version>${project.version}</version>
             <type>zip</type>
         </dependency>
     </dependencies>
 
-    <build>
-        <finalName>${project.artifactId}-${project.version}</finalName>
-    </build>
-    
     <profiles>
         <profile>
             <id>jboss-release</id>

distribution/feature-pack-builds/server-and-adapter/server-and-adapter-dist/server-provisioning.xml

@@ -17,7 +17,7 @@
 -->
 <server-provisioning xmlns="urn:wildfly:server-provisioning:1.0" extract-schemas="true" copy-module-artifacts="true">
     <feature-packs>
-        <feature-pack groupId="org.keycloak" artifactId="feature-pack-server" version="${project.version}"/>     
-        <feature-pack groupId="org.keycloak" artifactId="feature-pack-adapter" version="${project.version}"/>     
+        <feature-pack groupId="org.keycloak" artifactId="keycloak-server-feature-pack" version="${project.version}"/>     
+        <feature-pack groupId="org.keycloak" artifactId="keycloak-adapter-feature-pack" version="${project.version}"/>     
     </feature-packs>
 </server-provisioning>

distribution/feature-pack-builds/server-only/pom.xml

@@ -14,7 +14,7 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>feature-pack-server</module>
+        <module>server-feature-pack</module>
         <module>server-only-build</module>
         <module>server-only-dist</module>
     </modules>

distribution/feature-pack-builds/server-only/server-feature-pack/pom.xml

@@ -25,7 +25,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
-    <artifactId>feature-pack-server</artifactId>
+    <artifactId>keycloak-server-feature-pack</artifactId>
 
     <name>Keycloak Feature Pack: Server</name>
     <packaging>pom</packaging>
@@ -72,7 +72,6 @@
     </dependencies>
 
     <build>
-        <finalName>keycloak-feature-pack-server-${project.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>