From 06be861eef2d5180651d34faaddb5ed524b5d5dc Mon Sep 17 00:00:00 2001 From: Ethel Bao Date: Fri, 3 Oct 2025 13:20:54 -0400 Subject: [PATCH 1/9] test --- build.gradle | 154 +++++++++++++++-------- gradle.properties | 17 ++- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 112 insertions(+), 61 deletions(-) diff --git a/build.gradle b/build.gradle index d3f28b9..f4b4956 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,4 @@ + buildscript { // Configuration for building repositories { mavenCentral() @@ -8,6 +9,7 @@ plugins { id 'java-library' id 'maven-publish' id 'signing' + id "com.vanniktech.maven.publish" version "0.34.0" } apply plugin: 'java' // standard Java tasks @@ -16,7 +18,7 @@ def props = new Properties() file("version.properties").withInputStream { props.load(it) } group 'com.google.maps' -version props.libVersion +version "-SNAPSHOT" ext.artifactId = 'fleetengine-auth' sourceCompatibility = 1.8 @@ -28,61 +30,103 @@ 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' - } - } +//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" } - 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 + 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.") } } + groupId group + artifactId project.ext.artifactId + version version + from components.java } } +// +//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 +// } +// } +// } +//} dependencies { - compile 'jstl:jstl:1.2' + implementation 'jstl:jstl:1.2' annotationProcessor 'com.google.auto.value:auto-value:1.6.2' @@ -100,19 +144,19 @@ dependencies { testImplementation 'com.google.truth:truth:1.1' testImplementation 'org.mockito:mockito-core:3.12.4' } +// +//signing { +// sign publishing.publications.authLib +//} -signing { - sign publishing.publications.authLib -} - -task javadocJar(type: Jar) { - classifier = 'javadoc' +task javadocJar(type: Jar, dependsOn: javadoc) { + archiveClassifier = 'javadoc' from 'build/docs/javadoc' } task sourcesJar(type: Jar) { from sourceSets.main.allSource - classifier = 'sources' + archiveClassifier = 'sources' } artifacts { diff --git a/gradle.properties b/gradle.properties index d2f4230..cd883dd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,10 +15,17 @@ ################################################################################ # Used for publishing workflow, do not change -signing.keyId= -signing.password= -signing.secretKeyRingFile= +signing.keyId=123 +signing.password=123 +signing.secretKeyRingFile=123 -sonatypeUsername= -sonatypePassword= +sonatypeUsername=123 +sonatypePassword=123 + +mavenCentralUsername=123 +mavenCentralPassword=123 + +# 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a2bf131..a595206 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 8c3e994b20a80b899f6e692555d9fe501f556dbf Mon Sep 17 00:00:00 2001 From: Ethel Bao Date: Fri, 3 Oct 2025 13:35:23 -0400 Subject: [PATCH 2/9] test --- .github/workflows/release.yml | 4 +++- build.gradle | 4 ---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9cedc57..a69f15f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ name: Release on: push: - branches: [ main ] + branches: [ main, test_changes] workflow_dispatch: jobs: @@ -37,6 +37,8 @@ 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 diff --git a/build.gradle b/build.gradle index f4b4956..e865e0c 100644 --- a/build.gradle +++ b/build.gradle @@ -66,10 +66,6 @@ mavenPublishing { name.set("Google Inc.") } } - groupId group - artifactId project.ext.artifactId - version version - from components.java } } // From 008fffabd53804bd48b29fdbe3afb2ffd2234975 Mon Sep 17 00:00:00 2001 From: Ethel Bao Date: Fri, 3 Oct 2025 14:53:38 -0400 Subject: [PATCH 3/9] test --- build.gradle | 84 +--------------------------------------------------- 1 file changed, 1 insertion(+), 83 deletions(-) diff --git a/build.gradle b/build.gradle index e865e0c..9893c45 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ def props = new Properties() file("version.properties").withInputStream { props.load(it) } group 'com.google.maps' -version "-SNAPSHOT" +version "SNAPSHOT" ext.artifactId = 'fleetengine-auth' sourceCompatibility = 1.8 @@ -30,7 +30,6 @@ repositories { // repositories for Jar's you access in your code } mavenCentral() } -//import com.vanniktech.maven.publish.SonatypeHost mavenPublishing { publishToMavenCentral() @@ -68,58 +67,6 @@ mavenPublishing { } } } -// -//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 -// } -// } -// } -//} dependencies { implementation 'jstl:jstl:1.2' @@ -140,32 +87,3 @@ dependencies { testImplementation 'com.google.truth:truth:1.1' testImplementation 'org.mockito:mockito-core:3.12.4' } -// -//signing { -// sign publishing.publications.authLib -//} - -task javadocJar(type: Jar, dependsOn: javadoc) { - archiveClassifier = 'javadoc' - from 'build/docs/javadoc' -} - -task sourcesJar(type: Jar) { - from sourceSets.main.allSource - archiveClassifier = 'sources' -} - -artifacts { - archives jar - archives javadocJar - archives sourcesJar -} - -java { - withJavadocJar() - withSourcesJar() -} - - -compileJava.options.encoding = 'UTF-8' -javadoc.options.encoding = 'UTF-8' From 5dc17ed65f8b1fa52aaf9150f96bf983eb40808f Mon Sep 17 00:00:00 2001 From: Ethel Bao Date: Fri, 3 Oct 2025 14:54:40 -0400 Subject: [PATCH 4/9] test --- gradle.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index cd883dd..115dad3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,15 +15,15 @@ ################################################################################ # Used for publishing workflow, do not change -signing.keyId=123 -signing.password=123 -signing.secretKeyRingFile=123 +signing.keyId= +signing.password= +signing.secretKeyRingFile= -sonatypeUsername=123 -sonatypePassword=123 +sonatypeUsername= +sonatypePassword= -mavenCentralUsername=123 -mavenCentralPassword=123 +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 From 00a9e0bfac3738e737cc78226bfcfab4f07b5a05 Mon Sep 17 00:00:00 2001 From: Ethel Bao Date: Fri, 3 Oct 2025 15:28:42 -0400 Subject: [PATCH 5/9] update sample --- sample/build.gradle | 9 --------- sample/gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/sample/build.gradle b/sample/build.gradle index c143c89..053b4db 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -30,15 +30,6 @@ run { systemProperties System.getProperties() standardInput = System.in } - -sourceSets.all { - configurations.getByName(runtimeClasspathConfigurationName) { - attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm") - } - configurations.getByName(compileClasspathConfigurationName) { - attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm") - } -} dependencies { annotationProcessor 'com.google.auto.value:auto-value:1.6.2' diff --git a/sample/gradle/wrapper/gradle-wrapper.properties b/sample/gradle/wrapper/gradle-wrapper.properties index 6ce793f..a595206 100644 --- a/sample/gradle/wrapper/gradle-wrapper.properties +++ b/sample/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 7b107fc93a9fc846e7d985ab22550ace216fa1d3 Mon Sep 17 00:00:00 2001 From: Ethel Bao Date: Fri, 3 Oct 2025 15:55:21 -0400 Subject: [PATCH 6/9] update sample --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9893c45..d0f3539 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ def props = new Properties() file("version.properties").withInputStream { props.load(it) } group 'com.google.maps' -version "SNAPSHOT" +version props.libVersion ext.artifactId = 'fleetengine-auth' sourceCompatibility = 1.8 From 6228f0d97c2533c3c1ddf7019c0f813b6be4e3ec Mon Sep 17 00:00:00 2001 From: Ethel Bao Date: Fri, 3 Oct 2025 16:09:51 -0400 Subject: [PATCH 7/9] test --- .github/workflows/release.yml | 2 -- gradle.properties | 3 --- 2 files changed, 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a69f15f..bc58aa1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,8 +35,6 @@ jobs: gpg --quiet --output $GITHUB_WORKSPACE/release.gpg --dearmor ./release.asc 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 diff --git a/gradle.properties b/gradle.properties index 115dad3..b55db30 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,9 +19,6 @@ signing.keyId= signing.password= signing.secretKeyRingFile= -sonatypeUsername= -sonatypePassword= - mavenCentralUsername= mavenCentralPassword= From eaea7ffa2647c2ab9c9830e6504a9082efbaadb2 Mon Sep 17 00:00:00 2001 From: Ethel Bao Date: Fri, 3 Oct 2025 16:12:43 -0400 Subject: [PATCH 8/9] test --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index d0f3539..6dfd195 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,6 @@ buildscript { // Configuration for building plugins { id 'java-library' id 'maven-publish' - id 'signing' id "com.vanniktech.maven.publish" version "0.34.0" } From b531a794b2da0e17b9a1ee98781bab4bd47f70d5 Mon Sep 17 00:00:00 2001 From: Ethel Bao Date: Fri, 3 Oct 2025 16:17:55 -0400 Subject: [PATCH 9/9] test --- gradle.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b55db30..852dc23 100644 --- a/gradle.properties +++ b/gradle.properties @@ -24,5 +24,4 @@ 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