From f4aeb42e6148a1927593fd7da19002dc286cab6d Mon Sep 17 00:00:00 2001 From: Sven Kubiak Date: Sun, 16 Jul 2023 19:19:36 +0200 Subject: [PATCH 1/8] Version bumps --- pom.xml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pom.xml b/pom.xml index 3ee05b6..52190a2 100644 --- a/pom.xml +++ b/pom.xml @@ -40,13 +40,12 @@ ${java.version} ${java.version} false - true org.apache.maven.plugins maven-source-plugin - 3.2.1 + 3.3.0 attach-sources @@ -59,7 +58,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.1.0 + 3.3.0 @@ -112,7 +111,7 @@ org.owasp dependency-check-maven - 7.4.1 + 8.3.1 12 1 @@ -132,7 +131,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.4.1 + 3.5.0 attach-javadocs @@ -159,17 +158,17 @@ org.apache.maven.plugins maven-deploy-plugin - 3.0.0 + 3.1.1 org.codehaus.mojo versions-maven-plugin - 2.15.0 + 2.16.0 org.apache.maven.plugins maven-clean-plugin - 3.2.0 + 3.3.1 org.apache.maven.plugins @@ -184,17 +183,17 @@ org.apache.maven.plugins maven-site-plugin - 4.0.0-M4 + 4.0.0-M9 org.apache.maven.plugins maven-install-plugin - 3.1.0 + 3.1.1 org.apache.maven.plugins maven-resources-plugin - 3.3.0 + 3.3.1 @@ -230,7 +229,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.0.1 + 3.1.0 sign-artifacts From 772f9a590a1cac5442a39ae6082ebdd871d9b70d Mon Sep 17 00:00:00 2001 From: Sven Kubiak Date: Mon, 17 Jul 2023 13:41:05 +0200 Subject: [PATCH 2/8] Updates to pom.xml --- pom.xml | 56 +++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 52190a2..32a6996 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 de.svenkubiak jpushover @@ -28,7 +30,8 @@ HEAD JPushover - Zero-dependency convenient class for sending messages to Pushover in Java project + Zero-dependency convenient class for sending messages to + Pushover in Java project https://github.com/svenkubiak/JPushover @@ -109,25 +112,25 @@ - org.owasp - dependency-check-maven - 8.3.1 - - 12 - 1 - - false - false - false - false - false - false - - + false + false + false + false + false + false + + org.apache.maven.plugins maven-javadoc-plugin @@ -149,7 +152,7 @@ org.apache.maven.plugins maven-release-plugin - 2.5.3 + 3.0.1 true deploy @@ -195,6 +198,17 @@ maven-resources-plugin 3.3.1 + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.7 + true + + ossrh + https://s01.oss.sonatype.org/ + true + + @@ -208,11 +222,11 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://s01.oss.sonatype.org/content/repositories/snapshots ossrh - https://oss.sonatype.org/service/local/staging/deploy/maven2/ + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ From 8f71cf816443df33ade76b0d0138df014324e51e Mon Sep 17 00:00:00 2001 From: Sven Kubiak Date: Mon, 17 Jul 2023 14:09:42 +0200 Subject: [PATCH 3/8] Switched from maven release to sonatype staging plugin --- pom.xml | 65 +++++++++++++++++---------------------------------------- 1 file changed, 19 insertions(+), 46 deletions(-) diff --git a/pom.xml b/pom.xml index 32a6996..8a1da81 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,8 @@ - + 4.0.0 de.svenkubiak jpushover - 7.0.4-SNAPSHOT + 7.0.8 jar @@ -176,7 +174,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.0.0-M5 + 3.1.2 org.apache.maven.plugins @@ -201,14 +199,28 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.7 + 1.6.13 true ossrh - https://s01.oss.sonatype.org/ + https://oss.sonatype.org/ true + + org.apache.maven.plugins + maven-gpg-plugin + 3.1.0 + + + sign-artifacts + verify + + sign + + + + @@ -219,43 +231,4 @@ test - - - ossrh - https://s01.oss.sonatype.org/content/repositories/snapshots - - - ossrh - https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - release-sign-artifacts - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - 3.1.0 - - - sign-artifacts - verify - - sign - - - - - - - - \ No newline at end of file From f9809e444e4a113b2d92ac8b036a4a316167dc8e Mon Sep 17 00:00:00 2001 From: Sven Kubiak Date: Mon, 17 Jul 2023 14:10:15 +0200 Subject: [PATCH 4/8] New snapshot version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8a1da81..acc712c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 de.svenkubiak jpushover - 7.0.8 + 7.0.9-SNAPSHOT jar From 49616e1d9d09e3ccd533cc0bc6931c7965c21ced Mon Sep 17 00:00:00 2001 From: Sven Kubiak Date: Mon, 17 Jul 2023 14:13:27 +0200 Subject: [PATCH 5/8] Signing is only activated on release --- pom.xml | 42 +++++++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index acc712c..1eae30f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,4 +1,6 @@ - + 4.0.0 de.svenkubiak jpushover @@ -207,20 +209,6 @@ true - - org.apache.maven.plugins - maven-gpg-plugin - 3.1.0 - - - sign-artifacts - verify - - sign - - - - @@ -231,4 +219,28 @@ test + + + release + + + + org.apache.maven.plugins + maven-gpg-plugin + 3.1.0 + + + sign-artifacts + verify + + sign + + + + + + + + + \ No newline at end of file From f0effe5240a037ca0edc3af989ec4b75105ed297 Mon Sep 17 00:00:00 2001 From: Sven Kubiak Date: Mon, 17 Jul 2023 14:15:33 +0200 Subject: [PATCH 6/8] Moved release plugins to profile --- pom.xml | 57 ++++++++++++++++++++++++++------------------------------- 1 file changed, 26 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index 1eae30f..eafeaef 100644 --- a/pom.xml +++ b/pom.xml @@ -45,19 +45,6 @@ false - - org.apache.maven.plugins - maven-source-plugin - 3.3.0 - - - attach-sources - - jar-no-fork - - - - org.apache.maven.plugins maven-enforcer-plugin @@ -131,19 +118,6 @@ false - - org.apache.maven.plugins - maven-javadoc-plugin - 3.5.0 - - - attach-javadocs - - jar - - - - org.sonarsource.scanner.maven sonar-maven-plugin @@ -153,10 +127,6 @@ org.apache.maven.plugins maven-release-plugin 3.0.1 - - true - deploy - org.apache.maven.plugins @@ -238,9 +208,34 @@ + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + + attach-javadocs + + jar + + + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.0 + + + attach-sources + + jar-no-fork + + + + - \ No newline at end of file From 7e6cc8e1bbcbfd6bd09909345654b4ffcd64115f Mon Sep 17 00:00:00 2001 From: Sven Kubiak Date: Mon, 17 Jul 2023 14:18:31 +0200 Subject: [PATCH 7/8] New SNAPSHOT version --- pom.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index eafeaef..2387764 100644 --- a/pom.xml +++ b/pom.xml @@ -1,10 +1,8 @@ - + 4.0.0 de.svenkubiak jpushover - 7.0.9-SNAPSHOT + 7.0.10-SNAPSHOT jar From 42dd11678a0f383e9ed51e91b3f2b49cb29889e9 Mon Sep 17 00:00:00 2001 From: Sven Kubiak Date: Wed, 19 Jul 2023 10:41:39 +0200 Subject: [PATCH 8/8] Added release script --- release.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100755 release.sh diff --git a/release.sh b/release.sh new file mode 100755 index 0000000..7ec5bc7 --- /dev/null +++ b/release.sh @@ -0,0 +1,18 @@ +#!/bin/bash +mvn versions:set +STATUS=$? +if [ $STATUS -ne 0 ]; then + echo "Failed to set new version!" +else + mvn clean deploy -Prelease + STATUS=$? + if [ $STATUS -ne 0 ]; then + echo "Failed to release!" + else + mvn release:update-versions + fi +fi + +rm pom.xml.versionsBackup + +