Merge branch 'main' into 6.x

Author: jmini

build.gradle

@@ -4,9 +4,8 @@ plugins {
     id 'com.diffplug.spotless' version '6.25.0'
     id 'signing'
     id 'maven-publish'
-    id 'de.marcphilipp.nexus-publish' version '0.4.0'
     id 'net.researchgate.release' version '3.0.2'
-    id 'io.codearte.nexus-staging' version '0.22.0'
+    id 'io.github.gradle-nexus.publish-plugin' version '1.3.0'
 }
 
 wrapper {
@@ -64,6 +63,7 @@ spotless {
 }
 
 nexusPublishing {
+    packageGroup = 'org.gitlab4j'
     repositories {
         sonatype {
             nexusUrl.set(uri("https://oss.sonatype.org/service/local/"))
@@ -73,13 +73,6 @@ nexusPublishing {
     }
 }
 
-nexusStaging {
-    serverUrl = "https://oss.sonatype.org/service/local/"
-    packageGroup = 'org.gitlab4j'
-    username = project.findProperty('sonatypeUser') ?: ''
-    password = project.findProperty('sonatypePassword') ?: ''
-}
-
 publishing {
     publications {
         mavenJava(MavenPublication) {
@@ -124,7 +117,7 @@ publishing {
 release {
     buildTasks = ['releaseBuild']
     git {
-        requireBranch.set('main')
+        requireBranch.set('6.x')
     }
 }
 
@@ -152,7 +145,8 @@ def updateLastVersionValueTask = tasks.register('updateLastVersionValue') {
     doLast {
         def propertiesFile = file('gradle.properties')
         def content = propertiesFile.text
-        content = content.replaceAll("lastVersion=[0-9\\.]+", "lastVersion=" + version.replace('-SNAPSHOT', ''))
+        def newVersion = project.findProperty('release.releaseVersion') ?: version.replace('-SNAPSHOT', '')
+        content = content.replaceAll("lastVersion=[0-9a-z\\.\\-]+", "lastVersion=" + newVersion)
         propertiesFile.text = content
     }
 }