Skip to content

Commit 7ad02e7

Browse files
stianststianst
committed
Fixes for releasing
1 parent 8a750c7 commit 7ad02e7

File tree

12 files changed

+20
-63
lines changed

12 files changed

+20
-63
lines changed

‎dependencies/drools-bom/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
44
<parent>
55
<groupId>org.keycloak</groupId>
6-
<artifactId>keycloak-parent</artifactId>
6+
<artifactId>keycloak-dependencies-parent</artifactId>
77
<version>5.0.0-SNAPSHOT</version>
8-
<relativePath>../../pom.xml</relativePath>
98
</parent>
109
<modelVersion>4.0.0</modelVersion>
1110

‎dependencies/pom.xml

-12
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,4 @@
3535
<module>server-min</module>
3636
<module>server-all</module>
3737
</modules>
38-
39-
<build>
40-
<plugins>
41-
<plugin>
42-
<groupId>org.apache.maven.plugins</groupId>
43-
<artifactId>maven-deploy-plugin</artifactId>
44-
<configuration>
45-
<skip>true</skip>
46-
</configuration>
47-
</plugin>
48-
</plugins>
49-
</build>
5038
</project>

‎dependencies/server-all/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2020
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2121
<parent>
22-
<artifactId>keycloak-parent</artifactId>
22+
<artifactId>keycloak-dependencies-parent</artifactId>
2323
<groupId>org.keycloak</groupId>
2424
<version>5.0.0-SNAPSHOT</version>
25-
<relativePath>../../pom.xml</relativePath>
2625
</parent>
2726
<modelVersion>4.0.0</modelVersion>
2827

‎dependencies/server-min/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2020
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2121
<parent>
22-
<artifactId>keycloak-parent</artifactId>
22+
<artifactId>keycloak-dependencies-parent</artifactId>
2323
<groupId>org.keycloak</groupId>
2424
<version>5.0.0-SNAPSHOT</version>
25-
<relativePath>../../pom.xml</relativePath>
2625
</parent>
2726
<modelVersion>4.0.0</modelVersion>
2827

‎distribution/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
<profiles>
4949
<profile>
50-
<id>jboss-release</id>
50+
<id>distribution-downloads</id>
5151
<modules>
5252
<module>api-docs-dist</module>
5353
<module>examples-dist</module>

‎examples/demo-template/pom.xml

-11
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,6 @@
3030
<artifactId>keycloak-examples-demo-parent</artifactId>
3131
<packaging>pom</packaging>
3232

33-
<build>
34-
<plugins>
35-
<plugin>
36-
<groupId>org.apache.maven.plugins</groupId>
37-
<artifactId>maven-deploy-plugin</artifactId>
38-
<configuration>
39-
<skip>true</skip>
40-
</configuration>
41-
</plugin>
42-
</plugins>
43-
</build>
4433
<modules>
4534
<!-- <module>server</module> -->
4635
<module>customer-app</module>

‎examples/saml/pom.xml

-11
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,6 @@
3030
<artifactId>keycloak-examples-saml-parent</artifactId>
3131
<packaging>pom</packaging>
3232

33-
<build>
34-
<plugins>
35-
<plugin>
36-
<groupId>org.apache.maven.plugins</groupId>
37-
<artifactId>maven-deploy-plugin</artifactId>
38-
<configuration>
39-
<skip>true</skip>
40-
</configuration>
41-
</plugin>
42-
</plugins>
43-
</build>
4433
<modules>
4534
<module>post-with-signature</module>
4635
<module>post-with-encryption</module>

‎model/infinispan/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2020
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2121
<parent>
22-
<artifactId>keycloak-parent</artifactId>
22+
<artifactId>keycloak-model-pom</artifactId>
2323
<groupId>org.keycloak</groupId>
2424
<version>5.0.0-SNAPSHOT</version>
25-
<relativePath>../../pom.xml</relativePath>
2625
</parent>
2726
<modelVersion>4.0.0</modelVersion>
2827

‎model/jpa/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@
1919
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2020
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
2121
<parent>
22-
<artifactId>keycloak-parent</artifactId>
22+
<artifactId>keycloak-model-pom</artifactId>
2323
<groupId>org.keycloak</groupId>
2424
<version>5.0.0-SNAPSHOT</version>
25-
<relativePath>../../pom.xml</relativePath>
2625
</parent>
2726
<modelVersion>4.0.0</modelVersion>
2827

‎model/pom.xml

-11
Original file line numberDiff line numberDiff line change
@@ -30,17 +30,6 @@
3030
<artifactId>keycloak-model-pom</artifactId>
3131
<packaging>pom</packaging>
3232

33-
<build>
34-
<plugins>
35-
<plugin>
36-
<groupId>org.apache.maven.plugins</groupId>
37-
<artifactId>maven-deploy-plugin</artifactId>
38-
<configuration>
39-
<skip>true</skip>
40-
</configuration>
41-
</plugin>
42-
</plugins>
43-
</build>
4433
<modules>
4534
<module>jpa</module>
4635
<module>infinispan</module>

‎pom.xml

+9-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@
220220
<module>integration</module>
221221
<module>adapters</module>
222222
<module>authz</module>
223-
<module>examples</module>
224223
<module>misc</module>
225224
</modules>
226225

@@ -1727,6 +1726,15 @@
17271726
</modules>
17281727
</profile>
17291728

1729+
<profile>
1730+
<id>examples</id>
1731+
<activation>
1732+
<property>
1733+
<name>!skipExamples</name>
1734+
</property>
1735+
</activation>
1736+
</profile>
1737+
17301738
<profile>
17311739
<id>distribution</id>
17321740
<modules>

‎release.sh

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,22 @@
11
#!/bin/bash -e
22

33
DIR="$PWD"
4-
VERSION=`./get-version.sh`
4+
source release-details
5+
56
echo "Version: $VERSION"
67

78
echo "------------------------------------------------------------------------------------------------------------"
89
echo "Building:"
910
echo ""
1011

11-
mvn -Pjboss-release -DskipTests clean install
12+
mvn -Pjboss-release,distribution-downloads -DskipTests -DskipTestsuite clean install
1213

1314

1415
echo "------------------------------------------------------------------------------------------------------------"
1516
echo "Deploying:"
1617
echo ""
1718

18-
mvn -Pjboss-release -DretryFailedDeploymentCount=10 -DskipTests -DstagingDescription="Keycloak $VERSION release" deploy
19-
20-
mvn nexus-staging:release -DstagingDescription="Keycloak $VERSION release"
19+
mvn -Pjboss-release,nexus-staging -DretryFailedDeploymentCount=10 -DskipTests -DskipTestsuite -DskipExamples -DautoReleaseAfterClose=true deploy
2120

2221

2322
echo "------------------------------------------------------------------------------------------------------------"
@@ -33,7 +32,7 @@ echo ""
3332

3433
TMP=`mktemp -d`
3534
cd $TMP
36-
unzip $DIR/keycloak/distribution/adapters/js-adapter-npm-zip/target/keycloak-js-adapter-npm-dist-$VERSION.zip
35+
unzip $DIR/distribution/adapters/js-adapter-npm-zip/target/keycloak-js-adapter-npm-dist-$VERSION.zip
3736
cd keycloak-js-adapter-npm-dist-$VERSION
3837

3938
npm publish

0 commit comments

Comments
 (0)