Fixes for releasing

tsaarni · Mar 6, 2019 · 7ad02e7 · 7ad02e7
1 parent 8a750c7
commit 7ad02e7
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 63 deletions.
diff --git a/dependencies/drools-bom/pom.xml b/dependencies/drools-bom/pom.xml
@@ -3,9 +3,8 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
         <groupId>org.keycloak</groupId>
-        <artifactId>keycloak-parent</artifactId>
+        <artifactId>keycloak-dependencies-parent</artifactId>
         <version>5.0.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -35,16 +35,4 @@
         <module>server-min</module>
         <module>server-all</module>
     </modules>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/dependencies/server-all/pom.xml b/dependencies/server-all/pom.xml
@@ -19,10 +19,9 @@
 <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>
+		<artifactId>keycloak-dependencies-parent</artifactId>
 		<groupId>org.keycloak</groupId>
 		<version>5.0.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/dependencies/server-min/pom.xml b/dependencies/server-min/pom.xml
@@ -19,10 +19,9 @@
 <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>
+		<artifactId>keycloak-dependencies-parent</artifactId>
 		<groupId>org.keycloak</groupId>
 		<version>5.0.0-SNAPSHOT</version>
-		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -47,7 +47,7 @@
 
     <profiles>
         <profile>
-            <id>jboss-release</id>
+            <id>distribution-downloads</id>
             <modules>
                 <module>api-docs-dist</module>
                 <module>examples-dist</module>

diff --git a/examples/demo-template/pom.xml b/examples/demo-template/pom.xml
@@ -30,17 +30,6 @@
     <artifactId>keycloak-examples-demo-parent</artifactId>
     <packaging>pom</packaging>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
     <modules>
         <!-- <module>server</module> -->
         <module>customer-app</module>

diff --git a/examples/saml/pom.xml b/examples/saml/pom.xml
@@ -30,17 +30,6 @@
     <artifactId>keycloak-examples-saml-parent</artifactId>
     <packaging>pom</packaging>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
     <modules>
         <module>post-with-signature</module>
         <module>post-with-encryption</module>

diff --git a/model/infinispan/pom.xml b/model/infinispan/pom.xml
@@ -19,10 +19,9 @@
 <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>
+        <artifactId>keycloak-model-pom</artifactId>
         <groupId>org.keycloak</groupId>
         <version>5.0.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/model/jpa/pom.xml b/model/jpa/pom.xml
@@ -19,10 +19,9 @@
 <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>
+        <artifactId>keycloak-model-pom</artifactId>
         <groupId>org.keycloak</groupId>
         <version>5.0.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/model/pom.xml b/model/pom.xml
@@ -30,17 +30,6 @@
     <artifactId>keycloak-model-pom</artifactId>
     <packaging>pom</packaging>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
     <modules>
         <module>jpa</module>
         <module>infinispan</module>

diff --git a/pom.xml b/pom.xml
@@ -220,7 +220,6 @@
         <module>integration</module>
         <module>adapters</module>
         <module>authz</module>
-        <module>examples</module>
         <module>misc</module>
     </modules>
 
@@ -1727,6 +1726,15 @@
             </modules>
         </profile>
 
+        <profile>
+            <id>examples</id>
+            <activation>
+                <property>
+                    <name>!skipExamples</name>
+                </property>
+            </activation>
+        </profile>
+
         <profile>
             <id>distribution</id>
             <modules>

diff --git a/release.sh b/release.sh
@@ -1,23 +1,22 @@
 #!/bin/bash -e
 
 DIR="$PWD"
-VERSION=`./get-version.sh`
+source release-details
+
 echo "Version: $VERSION"
 
 echo "------------------------------------------------------------------------------------------------------------"
 echo "Building:"
 echo ""
 
-mvn -Pjboss-release -DskipTests clean install
+mvn -Pjboss-release,distribution-downloads -DskipTests -DskipTestsuite clean install
 
 
 echo "------------------------------------------------------------------------------------------------------------"
 echo "Deploying:"
 echo ""
 
-mvn -Pjboss-release -DretryFailedDeploymentCount=10 -DskipTests -DstagingDescription="Keycloak $VERSION release" deploy
-
-mvn nexus-staging:release -DstagingDescription="Keycloak $VERSION release"
+mvn -Pjboss-release,nexus-staging -DretryFailedDeploymentCount=10 -DskipTests -DskipTestsuite -DskipExamples -DautoReleaseAfterClose=true deploy
 
 
 echo "------------------------------------------------------------------------------------------------------------"
@@ -33,7 +32,7 @@ echo ""
 
 TMP=`mktemp -d`
 cd $TMP
-unzip $DIR/keycloak/distribution/adapters/js-adapter-npm-zip/target/keycloak-js-adapter-npm-dist-$VERSION.zip
+unzip $DIR/distribution/adapters/js-adapter-npm-zip/target/keycloak-js-adapter-npm-dist-$VERSION.zip
 cd keycloak-js-adapter-npm-dist-$VERSION
 
 npm publish