revert 261c7f2bb6595475342d1b459ece2d23d14383b9 and b6db20049acf1add75aeecc9f52f366efb4b4fdc

.github/workflows/release.yml

@@ -37,8 +37,6 @@ jobs:
         SONATYPE_PASSWORD_ESCAPED=$(printf '%s\n' "$SONATYPE_PASSWORD" | sed -e 's/[\/&]/\\&/g')
         sed -i -e "s,sonatypeUsername=,sonatypeUsername=$SONATYPE_USERNAME,g" gradle.properties
         sed -i -e "s,sonatypePassword=,sonatypePassword=$SONATYPE_PASSWORD_ESCAPED,g" gradle.properties
-        sed -i -e "s,mavenCentralUsername=,mavenCentralUsername=$SONATYPE_USERNAME,g" gradle.properties
-        sed -i -e "s,mavenCentralPassword=,mavenCentralPassword=$SONATYPE_PASSWORD_ESCAPED,g" gradle.properties
         sed -i -e "s,githubPassword=,githubPassword=$GITHUB_PASSWORD,g" gradle.properties
         sed -i -e "s,signing.keyId=,signing.keyId=$GPG_KEY_ID,g" gradle.properties
         sed -i -e "s,signing.password=,signing.password=$GPG_PASSWORD,g" gradle.properties

build.gradle

@@ -5,7 +5,6 @@ buildscript {    // Configuration for building
 }
 
 plugins {
-    id "com.vanniktech.maven.publish" version "0.34.0"
     id 'java-library'
     id 'maven-publish'
     id 'signing'
@@ -29,100 +28,61 @@ repositories {   // repositories for Jar's you access in your code
     }
     mavenCentral()
 }
-//
-//publishing {
-//    publications {
-//        authLib(MavenPublication) {
-//            pom {
-//                name = 'Fleet Engine Auth Library'
-//                description = 'Provides a set of tools to simplify the Fleet Engine setup process.'
-//                url = 'https://github.com/googlemaps/java-fleetengine-auth'
-//                licenses {
-//                    license {
-//                        name = 'The Apache License, Version 2.0'
-//                        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-//                    }
-//                }
-//                organization {
-//                    name = 'Google, Inc.'
-//                    url = 'http://www.google.com'
-//                }
-//                issueManagement {
-//                    system = 'GitHub Issues'
-//                    url = 'http://github.com/googlemaps/java-fleetengine-auth/issues'
-//                }
-//                scm {
-//                    connection = 'scm:git:git://github.com/googlemaps/java-fleetengine-auth.git'
-//                    developerConnection = 'scm:git:ssh://github.com/googlemaps/java-fleetengine-auth.git'
-//                    url = 'http://github.com/googlemaps/java-fleetengine-auth/'
-//                    tag = 'HEAD'
-//                }
-//                developers {
-//                    developer {
-//                        id = 'danielfbright'
-//                        name = 'Daniel Bright'
-//                    }
-//                }
-//            }
-//            groupId group
-//            artifactId project.ext.artifactId
-//            version version
-//            from components.java
-//        }
-//    }
-//    repositories {
-//        maven {
-//            name = "mavencentral"
-//            url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-//            credentials {
-//                username sonatypeUsername
-//                password sonatypePassword
-//            }
-//        }
-//    }
-//}
-
-//import com.vanniktech.maven.publish.SonatypeHost
-
-mavenPublishing {
-    publishToMavenCentral()
-    signAllPublications()
-    pom {
-        name = "Fleet Engine Auth Library"
-        description = "Provides a set of tools to simplify the Fleet Engine setup process."
-        url = "https://github.com/googlemaps/java-fleetengine-auth"
-        licenses {
-            license {
-                name = "The Apache License, Version 2.0"
-                url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
-                distribution = "http://www.apache.org/licenses/LICENSE-2.0.txt"
+
+publishing {
+    publications {
+        authLib(MavenPublication) {
+            pom {
+                name = 'Fleet Engine Auth Library'
+                description = 'Provides a set of tools to simplify the Fleet Engine setup process.'
+                url = 'https://github.com/googlemaps/java-fleetengine-auth'
+                licenses {
+                    license {
+                        name = 'The Apache License, Version 2.0'
+                        url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    }
+                }
+                organization {
+                    name = 'Google, Inc.'
+                    url = 'http://www.google.com'
+                }
+                issueManagement {
+                    system = 'GitHub Issues'
+                    url = 'http://github.com/googlemaps/java-fleetengine-auth/issues'
+                }
+                scm {
+                    connection = 'scm:git:git://github.com/googlemaps/java-fleetengine-auth.git'
+                    developerConnection = 'scm:git:ssh://github.com/googlemaps/java-fleetengine-auth.git'
+                    url = 'http://github.com/googlemaps/java-fleetengine-auth/'
+                    tag = 'HEAD'
+                }
+                developers {
+                    developer {
+                        id = 'danielfbright'
+                        name = 'Daniel Bright'
+                    }
+                }
             }
+            groupId group
+            artifactId project.ext.artifactId
+            version version
+            from components.java
         }
-        organization {
-            name = 'Google, Inc.'
-            url = 'http://www.google.com'
-        }
-        issueManagement {
-            system = 'GitHub Issues'
-            url = 'http://github.com/googlemaps/java-fleetengine-auth/issues'
-        }
-        scm {
-            connection = 'scm:git:git://github.com/googlemaps/java-fleetengine-auth.git'
-            developerConnection = 'scm:git:ssh://github.com/googlemaps/java-fleetengine-auth.git'
-            url = 'http://github.com/googlemaps/java-fleetengine-auth/'
-            tag = 'HEAD'
-        }
-        developers {
-            developer {
-                id.set("google")
-                name.set("Google Inc.")
+    }
+    repositories {
+        maven {
+            name = "mavencentral"
+            url = "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
+            credentials {
+                username sonatypeUsername
+                password sonatypePassword
             }
         }
     }
 }
 
 dependencies {
-    implementation 'jstl:jstl:1.2'
+    compile 'jstl:jstl:1.2'
 
     annotationProcessor 'com.google.auto.value:auto-value:1.6.2'
 
@@ -141,18 +101,18 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:3.12.4'
 }
 
-//signing {
-//    sign publishing.publications.authLib
-//}
+signing {
+    sign publishing.publications.authLib
+}
 
 task javadocJar(type: Jar) {
-    archiveClassifier = 'javadoc'
+    classifier = 'javadoc'
     from 'build/docs/javadoc'
 }
 
 task sourcesJar(type: Jar) {
     from sourceSets.main.allSource
-    archiveClassifier = 'sources'
+    classifier = 'sources'
 }
 
 artifacts {

gradle.properties

@@ -22,10 +22,3 @@ signing.secretKeyRingFile=
 sonatypeUsername=
 sonatypePassword=
 
-mavenCentralUsername=
-mavenCentralPassword=
-
-# Add a property to enable automatic release to Maven Central (optional, but good for CI)
-# If true, publishToMavenCentral will also close and release the staging repository
-mavenCentralAutomaticRelease=false
-

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists