release version 3.3.1

Co-authored-by: Riko Stave <[email protected]> Co-authored-by: Matthias Geißendörfer <[email protected]>
otto-de · Sep 9, 2024 · 158c66a · 158c66a
1 parent 14dae2d
commit 158c66a
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Release Notes
 
+## 3.3.1
+* **[general]**: increase gradle version to 8.x
+* **[edison-togglz]**
+    * Fix NullPointerException for togglz check when togglz state is retrieved without HttpServletRequest. 
+
 ## 3.3.0
 * **[all]
     * Upgrade to Spring Boot 3.3.2

diff --git a/build.gradle b/build.gradle
@@ -27,7 +27,7 @@ plugins {
 //
 // Add a GitHub release for every new release: https://github.com/otto-de/edison-microservice/releases
 // Publish artifacts to sonatype by executing the release.sh script. Don't publish packages to github.
-def edison_version = "3.3.1-SNAPSHOT"
+def edison_version = "3.3.1"
 //
 //
 //

diff --git a/edison-core/build.gradle b/edison-core/build.gradle
@@ -71,6 +71,10 @@ publishing {
     }
 }
 
+tasks.named("publishMavenJavaPublicationToSonatypeRepository") {
+    dependsOn tasks.named("signArchives")
+}
+
 signing {
     sign publishing.publications.mavenJava
 }
diff --git a/edison-jobs/build.gradle b/edison-jobs/build.gradle
@@ -71,6 +71,11 @@ publishing {
     }
 }
 
+
+tasks.named("publishMavenJavaPublicationToSonatypeRepository") {
+    dependsOn tasks.named("signArchives")
+}
+
 signing {
     sign publishing.publications.mavenJava
 }
diff --git a/edison-mongo/build.gradle b/edison-mongo/build.gradle
@@ -61,6 +61,10 @@ publishing {
     }
 }
 
+tasks.named("publishMavenJavaPublicationToSonatypeRepository") {
+    dependsOn tasks.named("signArchives")
+}
+
 signing {
     sign publishing.publications.mavenJava
 }
diff --git a/edison-testsupport/build.gradle b/edison-testsupport/build.gradle
@@ -72,6 +72,10 @@ publishing {
     }
 }
 
+tasks.named("publishMavenJavaPublicationToSonatypeRepository") {
+    dependsOn tasks.named("signArchives")
+}
+
 signing {
     sign publishing.publications.mavenJava
 }
diff --git a/edison-togglz/build.gradle b/edison-togglz/build.gradle
@@ -74,6 +74,10 @@ publishing {
     }
 }
 
+tasks.named("publishMavenJavaPublicationToSonatypeRepository") {
+    dependsOn tasks.named("signArchives")
+}
+
 signing {
     sign publishing.publications.mavenJava
 }
diff --git a/edison-validation/build.gradle b/edison-validation/build.gradle
@@ -57,6 +57,10 @@ publishing {
     }
 }
 
+tasks.named("publishMavenJavaPublicationToSonatypeRepository") {
+    dependsOn tasks.named("signArchives")
+}
+
 signing {
     sign publishing.publications.mavenJava
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,3 @@
 org.gradle.jvmargs=-Xmx384m -XX:+UseG1GC -XX:SoftRefLRUPolicyMSPerMB=0
 org.gradle.daemon=false
 
-sonatypeUsername=
-sonatypePassword=
diff --git a/release.sh b/release.sh
@@ -21,7 +21,7 @@ check_configuration() {
     check_configured "signing.keyId" "This is the id of your key (e.g. 72FE5380). Use gpg --list-keys to find yours"
     check_configured "signing.password" "This is the password you defined for your gpg key"
     # for GPG version >= 2.1: gpg --export-secret-keys >~/.gnupg/secring.gpg
-    # gpg --send-keys --keyserver keyserver.ubuntu.com yourKeyId
+    # gpg --send-keys --keyserver keys.openpgp.org yourKeyId
 }
 
 check_configuration
@@ -37,8 +37,8 @@ else
   echo "INFO: This is a SNAPSHOT release."
 fi
 
-"${SCRIPT_DIR}"/gradlew clean
-"${SCRIPT_DIR}"/gradlew check
+#"${SCRIPT_DIR}"/gradlew clean
+#"${SCRIPT_DIR}"/gradlew check
 "${SCRIPT_DIR}"/gradlew -Dorg.gradle.internal.http.socketTimeout=200000 -Dorg.gradle.internal.http.connectionTimeout=200000 build publish
 
 if [[ $SNAPSHOT == 1 ]]; then