Fixes for releasing

This commit is contained in:
stianst 2019-03-06 11:33:57 +01:00 committed by Stian Thorgersen
parent 8a750c7fca
commit 7ad02e7318
12 changed files with 20 additions and 63 deletions

View file

@ -3,9 +3,8 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-parent</artifactId> <artifactId>keycloak-dependencies-parent</artifactId>
<version>5.0.0-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

12
dependencies/pom.xml vendored
View file

@ -35,16 +35,4 @@
<module>server-min</module> <module>server-min</module>
<module>server-all</module> <module>server-all</module>
</modules> </modules>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
</plugins>
</build>
</project> </project>

View file

@ -19,10 +19,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<artifactId>keycloak-parent</artifactId> <artifactId>keycloak-dependencies-parent</artifactId>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<version>5.0.0-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View file

@ -19,10 +19,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<artifactId>keycloak-parent</artifactId> <artifactId>keycloak-dependencies-parent</artifactId>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<version>5.0.0-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View file

@ -47,7 +47,7 @@
<profiles> <profiles>
<profile> <profile>
<id>jboss-release</id> <id>distribution-downloads</id>
<modules> <modules>
<module>api-docs-dist</module> <module>api-docs-dist</module>
<module>examples-dist</module> <module>examples-dist</module>

View file

@ -30,17 +30,6 @@
<artifactId>keycloak-examples-demo-parent</artifactId> <artifactId>keycloak-examples-demo-parent</artifactId>
<packaging>pom</packaging> <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> <modules>
<!-- <module>server</module> --> <!-- <module>server</module> -->
<module>customer-app</module> <module>customer-app</module>

View file

@ -30,17 +30,6 @@
<artifactId>keycloak-examples-saml-parent</artifactId> <artifactId>keycloak-examples-saml-parent</artifactId>
<packaging>pom</packaging> <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> <modules>
<module>post-with-signature</module> <module>post-with-signature</module>
<module>post-with-encryption</module> <module>post-with-encryption</module>

View file

@ -19,10 +19,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<artifactId>keycloak-parent</artifactId> <artifactId>keycloak-model-pom</artifactId>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<version>5.0.0-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View file

@ -19,10 +19,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <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"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<artifactId>keycloak-parent</artifactId> <artifactId>keycloak-model-pom</artifactId>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<version>5.0.0-SNAPSHOT</version> <version>5.0.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

View file

@ -30,17 +30,6 @@
<artifactId>keycloak-model-pom</artifactId> <artifactId>keycloak-model-pom</artifactId>
<packaging>pom</packaging> <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> <modules>
<module>jpa</module> <module>jpa</module>
<module>infinispan</module> <module>infinispan</module>

10
pom.xml
View file

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

View file

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