diff --git a/build.gradle.kts b/build.gradle.kts
index 5dfbbd2..8ae225a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -7,11 +7,11 @@ plugins {
   id("java-gradle-plugin")
   id("maven-publish")
   id("signing")
-  id("com.github.ben-manes.versions") version "0.46.0"
+  id("com.github.ben-manes.versions") version "0.51.0"
   id("net.ossindex.audit") version "0.4.11"
-  id("com.gradle.plugin-publish") version "1.1.0"
+  id("com.gradle.plugin-publish") version "1.2.1"
   id("io.github.gradle-nexus.publish-plugin") version "1.2.0"
-  id("io.freefair.maven-central.validate-poms") version "6.6.2"
+  id("io.freefair.maven-central.validate-poms") version "8.6"
 }
 
 val dependencyVersions = listOf<String>(
@@ -31,7 +31,6 @@ configurations.all {
 dependencies {
   constraints {
     listOf(
-      "org.apache.maven:maven-archiver",
       "org.apache.maven:maven-artifact",
       "org.apache.maven:maven-core",
       "org.apache.maven:maven-model",
@@ -44,6 +43,16 @@ dependencies {
         }
       }
     }
+    listOf(
+      "org.apache.maven:maven-archiver",
+    ).forEach {
+      implementation(it) {
+        version {
+          strictly("[3,)")
+          prefer("3.5.1")
+        }
+      }
+    }
     implementation("org.apache.maven.shared:maven-shared-utils") {
       version {
         strictly("[3,)")
@@ -202,11 +211,11 @@ signing {
   sign(publishing.publications[publicationName])
 }
 
-pluginBundle {
-  website = "https://github.com/gesellix/gradle-debian-plugin"
-  vcsUrl = "https://github.com/gesellix/gradle-debian-plugin.git"
-  tags = listOf("debian", "jdeb", "package", "ubuntu")
-}
+//pluginBundle {
+//  website = "https://github.com/gesellix/gradle-debian-plugin"
+//  vcsUrl = "https://github.com/gesellix/gradle-debian-plugin.git"
+//  tags = listOf("debian", "jdeb", "package", "ubuntu")
+//}
 
 gradlePlugin {
   plugins {
@@ -222,7 +231,7 @@ gradlePlugin {
 
 tasks.withType<ValidateMavenPom>().configureEach {
   ignoreFailures = System.getenv()["IGNORE_INVALID_POMS"] == "true"
-      || name.contains("For${publicationName.capitalize()}PluginMarkerMaven")
+      || name.contains("For${publicationName.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() }}PluginMarkerMaven")
       || name.contains("ForPluginMavenPublication")
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cb..e644113 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index adb6acb..8a1f6b9 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionSha256Sum=a4b4158601f8636cdeeab09bd76afb640030bb5b144aafe261a5e8af027dc612
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 65dcd68..b740cf1 100755
--- a/gradlew
+++ b/gradlew
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
@@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
diff --git a/gradlew.bat b/gradlew.bat
index 93e3f59..25da30d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
diff --git a/src/main/groovy/de/gesellix/gradle/debian/tasks/ArtifactCollector.groovy b/src/main/groovy/de/gesellix/gradle/debian/tasks/ArtifactCollector.groovy
index ff2e836..d48a02e 100644
--- a/src/main/groovy/de/gesellix/gradle/debian/tasks/ArtifactCollector.groovy
+++ b/src/main/groovy/de/gesellix/gradle/debian/tasks/ArtifactCollector.groovy
@@ -18,12 +18,12 @@ class ArtifactCollector {
       logger.info "{} can only use maven publications - skipping {}.", path, publication.name
       return []
     }
-    def identity = publication.mavenProjectIdentity
+    def mvnPublication = publication
     Collection<Artifact> artifacts = publication.artifacts.findResults {
       new Artifact(
-          name: identity.artifactId,
-          groupId: identity.groupId,
-          version: identity.version,
+          name: mvnPublication.artifactId,
+          groupId: mvnPublication.groupId,
+          version: mvnPublication.version,
           extension: it.extension,
           type: it.extension,
           classifier: it.classifier,