Merge pull request #1174 from stianst/master

Build javadoc as part of release process
keycloak · Apr 23, 2015 · d314198 · d314198
2 parents e697d5e + 35b6c88
commit d314198
Show file tree

Hide file tree

Showing 14 changed files with 87 additions and 379 deletions.
diff --git a/...on/modules/src/main/resources/modules/org/keycloak/keycloak-saml-protocol/main/module.xml b/...on/modules/src/main/resources/modules/org/keycloak/keycloak-saml-protocol/main/module.xml
@@ -20,7 +20,6 @@
         <module name="org.jboss.logging"/>
         <module name="javax.ws.rs.api"/>
         <module name="org.jboss.resteasy.resteasy-jaxrs"/>
-        <module name="org.jboss.resteasy.resteasy-crypto"/>
         <module name="org.jboss.resteasy.resteasy-multipart-provider"/>
 
         <module name="javax.api"/>

diff --git a/...ibution/modules/src/main/resources/modules/org/keycloak/keycloak-services/main/module.xml b/...ibution/modules/src/main/resources/modules/org/keycloak/keycloak-services/main/module.xml
@@ -65,7 +65,6 @@
 
         <module name="javax.ws.rs.api"/>
         <module name="org.jboss.resteasy.resteasy-jaxrs"/>
-        <module name="org.jboss.resteasy.resteasy-crypto"/>
         <module name="org.jboss.resteasy.resteasy-multipart-provider"/>
         <module name="javax.servlet.api"/>
         <module name="org.codehaus.jackson.jackson-core-asl"/>

diff --git a/distribution/server-dist/assembly.xml b/distribution/server-dist/assembly.xml
@@ -26,6 +26,13 @@
             </includes>
             <fileMode>0755</fileMode>
         </fileSet>
+        <fileSet>
+            <directory>src/main/welcome-content</directory>
+            <outputDirectory>welcome-content</outputDirectory>
+            <includes>
+                <include>*.*</include>
+            </includes>
+        </fileSet>
     </fileSets>
 
     <dependencySets>

diff --git a/distribution/server-dist/src/main/providers/README.txt b/distribution/server-dist/src/main/providers/README.txt
diff --git a/distribution/server-dist/src/main/themes/README.txt b/distribution/server-dist/src/main/themes/README.txt
diff --git a/distribution/server-dist/src/main/xslt/standalone.xsl b/distribution/server-dist/src/main/xslt/standalone.xsl
diff --git a/distribution/server-overlay/assembly.xml b/distribution/server-overlay/assembly.xml
@@ -19,14 +19,6 @@
             <directory>${project.build.directory}/unpacked/docs</directory>
             <outputDirectory>docs</outputDirectory>
         </fileSet>
-        <fileSet>
-            <directory>${project.build.directory}/unpacked/wildfly-${wildfly.version}</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>**/*.sh</include>
-            </includes>
-            <fileMode>0755</fileMode>
-        </fileSet>
         <fileSet>
             <directory>${project.build.directory}/unpacked/modules</directory>
             <outputDirectory>modules/system/layers/base</outputDirectory>
@@ -38,13 +30,6 @@
                 <include>**/**</include>
             </includes>
         </fileSet>
-        <fileSet>
-            <directory>src/main/welcome-content</directory>
-            <outputDirectory>welcome-content</outputDirectory>
-            <includes>
-                <include>*.*</include>
-            </includes>
-        </fileSet>
         <fileSet>
             <directory>../../</directory>
             <includes>
@@ -57,7 +42,7 @@
             <outputDirectory>docs/javadocs</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>../../services/target/site/apidocs</directory>
+            <directory>../../services/target/apidocs</directory>
             <outputDirectory>docs/rest-api</outputDirectory>
         </fileSet>
         <fileSet>

diff --git a/distribution/server-overlay/pom.xml b/distribution/server-overlay/pom.xml
@@ -27,7 +27,7 @@
     </dependencies>
 
     <build>
-        <finalName>keycloak-${project.version}</finalName>
+        <finalName>keycloak-overlay-${project.version}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>

diff --git a/distribution/server-overlay/src/main/welcome-content/index.html b/distribution/server-overlay/src/main/welcome-content/index.html
diff --git a/distribution/subsystem-war/src/main/webapp/WEB-INF/jboss-deployment-structure.xml b/distribution/subsystem-war/src/main/webapp/WEB-INF/jboss-deployment-structure.xml
@@ -55,6 +55,7 @@
             <module name="org.bouncycastle"/>
 
             <module name="org.jboss.resteasy.resteasy-jackson-provider" services="import"/>
+            <module name="org.jboss.resteasy.resteasy-jaxrs"/>
         </dependencies>
         <exclusions>
             <module name="org.jboss.resteasy.resteasy-jackson2-provider"/>