diff --git a/build.gradle b/build.gradle
index d8d43df8..21a25440 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 
   dependencies {
     // https://github.com/melix/japicmp-gradle-plugin/issues/36
-    classpath 'com.google.guava:guava:28.2-jre'
+    classpath 'com.google.guava:guava:31.1-jre'
   }
 }
 
@@ -23,7 +23,7 @@ repositories {
 apply from: rootProject.file('gradle/versioning.gradle')
 
 version = getVersionFromFile()
-group = 'com.auth0'
+group = GROUP
 logger.lifecycle("Using version ${version} for ${name} group $group")
 
 jacocoTestReport {
@@ -60,7 +60,7 @@ project.afterEvaluate {
     tasks.register(taskName, Test) {
       def versionToUse = taskName.split("-").getAt(1) as Integer
       description = "Runs unit tests on Java version ${versionToUse}."
-      println "Test will be running in ${versionToUse}"
+      project.logger.quiet("Test will be running in ${versionToUse}")
       group = 'verification'
       javaLauncher.set(javaToolchains.launcherFor {
         languageVersion = JavaLanguageVersion.of(versionToUse)
@@ -119,7 +119,7 @@ ext {
     jupiterVersion = '5.9.3'
 
     baselineCompareVersion = '2.0.0'
-    testInJavaVersions = [8, 11, 17]
+    testInJavaVersions = [8, 11, 17, 21]
 }
 
 dependencies {
diff --git a/gradle/maven-publish.gradle b/gradle/maven-publish.gradle
index 234639c4..60474d52 100644
--- a/gradle/maven-publish.gradle
+++ b/gradle/maven-publish.gradle
@@ -37,7 +37,6 @@ publishing {
       artifactId = POM_ARTIFACT_ID
       version = getVersionName()
 
-      //artifact("$buildDir/libs/${project.name}-${version}.jar")
       artifact sourcesJar
       artifact javadocJar