Fixing java release details

jtreminio-dropbox · jtreminio-dropbox · commit 01efb4748db8 · 2025-08-15T12:14:16.000-05:00
diff --git a/sdks/java-v1/build.gradle b/sdks/java-v1/build.gradle
@@ -11,7 +11,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.vanniktech.maven.publish' version '0.24.0'
+    id 'com.vanniktech.maven.publish' version '0.34.0'
     id 'com.diffplug.spotless' version '6.25.0'
 }
 
@@ -42,17 +42,17 @@ if (JavaVersion.current().isJava8Compatible()) {
 }
 
 task javadocJar(type: Jar) {
-    classifier = 'javadoc'
+    archiveClassifier.set('javadoc')
     from javadoc
 }
 
 task sourcesJar(type: Jar) {
-    classifier = 'sources'
+    archiveClassifier.set('sources')
     from sourceSets.main.allSource
 }
 
 task fatJar(type: Jar) {
-    classifier = 'all'
+    archiveClassifier.set('all')
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     from {
         configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
diff --git a/sdks/java-v1/gradle.properties b/sdks/java-v1/gradle.properties
@@ -24,7 +24,6 @@ POM_DEVELOPER_ID=dropbox-sign-api-team
 POM_DEVELOPER_NAME=Dropbox Sign API Team
 POM_DEVELOPER_URL=https://hellosign.com
 
-SONATYPE_HOST=S01
 RELEASE_SIGNING_ENABLED=true
 
 SONATYPE_CONNECT_TIMEOUT_SECONDS=300
diff --git a/sdks/java-v1/gradle/wrapper/gradle-wrapper.properties b/sdks/java-v1/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/sdks/java-v1/templates/gradle-wrapper.properties.mustache b/sdks/java-v1/templates/gradle-wrapper.properties.mustache
@@ -1,11 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-{{^useCustomTemplateCode}}
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
-{{/useCustomTemplateCode}}
-{{#useCustomTemplateCode}}
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
-{{/useCustomTemplateCode}}
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/sdks/java-v1/templates/gradle.properties.mustache b/sdks/java-v1/templates/gradle.properties.mustache
@@ -25,7 +25,6 @@ POM_DEVELOPER_ID={{developerId}}
 POM_DEVELOPER_NAME={{developerName}}
 POM_DEVELOPER_URL={{developerOrganizationUrl}}
 
-SONATYPE_HOST=S01
 RELEASE_SIGNING_ENABLED=true
 
 SONATYPE_CONNECT_TIMEOUT_SECONDS=300
diff --git a/sdks/java-v1/templates/libraries/jersey2/build.gradle.mustache b/sdks/java-v1/templates/libraries/jersey2/build.gradle.mustache
@@ -25,7 +25,7 @@ buildscript {
 
 {{#useCustomTemplateCode}}
 plugins {
-    id 'com.vanniktech.maven.publish' version '0.24.0'
+    id 'com.vanniktech.maven.publish' version '0.34.0'
     id 'com.diffplug.spotless' version '6.25.0'
 }
 
@@ -136,17 +136,17 @@ if (JavaVersion.current().isJava8Compatible()) {
 }
 
 task javadocJar(type: Jar) {
-    classifier = 'javadoc'
+    archiveClassifier.set('javadoc')
     from javadoc
 }
 
 task sourcesJar(type: Jar) {
-    classifier = 'sources'
+    archiveClassifier.set('sources')
     from sourceSets.main.allSource
 }
 
 task fatJar(type: Jar) {
-    classifier = 'all'
+    archiveClassifier.set('all')
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     from {
         configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
diff --git a/sdks/java-v2/build.gradle b/sdks/java-v2/build.gradle
@@ -11,7 +11,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.vanniktech.maven.publish' version '0.24.0'
+    id 'com.vanniktech.maven.publish' version '0.34.0'
     id 'com.diffplug.spotless' version '6.25.0'
 }
 
@@ -42,17 +42,17 @@ if (JavaVersion.current().isJava8Compatible()) {
 }
 
 task javadocJar(type: Jar) {
-    classifier = 'javadoc'
+    archiveClassifier.set('javadoc')
     from javadoc
 }
 
 task sourcesJar(type: Jar) {
-    classifier = 'sources'
+    archiveClassifier.set('sources')
     from sourceSets.main.allSource
 }
 
 task fatJar(type: Jar) {
-    classifier = 'all'
+    archiveClassifier.set('all')
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     from {
         configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
diff --git a/sdks/java-v2/gradle.properties b/sdks/java-v2/gradle.properties
@@ -24,7 +24,6 @@ POM_DEVELOPER_ID=dropbox-sign-api-team
 POM_DEVELOPER_NAME=Dropbox Sign API Team
 POM_DEVELOPER_URL=https://hellosign.com
 
-SONATYPE_HOST=S01
 RELEASE_SIGNING_ENABLED=true
 
 SONATYPE_CONNECT_TIMEOUT_SECONDS=300
diff --git a/sdks/java-v2/gradle/wrapper/gradle-wrapper.properties b/sdks/java-v2/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/sdks/java-v2/templates/gradle-wrapper.properties.mustache b/sdks/java-v2/templates/gradle-wrapper.properties.mustache
@@ -1,11 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-{{^useCustomTemplateCode}}
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
-{{/useCustomTemplateCode}}
-{{#useCustomTemplateCode}}
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
-{{/useCustomTemplateCode}}
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/sdks/java-v2/templates/gradle.properties.mustache b/sdks/java-v2/templates/gradle.properties.mustache
@@ -25,7 +25,6 @@ POM_DEVELOPER_ID={{developerId}}
 POM_DEVELOPER_NAME={{developerName}}
 POM_DEVELOPER_URL={{developerOrganizationUrl}}
 
-SONATYPE_HOST=S01
 RELEASE_SIGNING_ENABLED=true
 
 SONATYPE_CONNECT_TIMEOUT_SECONDS=300
diff --git a/sdks/java-v2/templates/libraries/jersey3/build.gradle.mustache b/sdks/java-v2/templates/libraries/jersey3/build.gradle.mustache
@@ -25,7 +25,7 @@ buildscript {
 
 {{#useCustomTemplateCode}}
 plugins {
-    id 'com.vanniktech.maven.publish' version '0.24.0'
+    id 'com.vanniktech.maven.publish' version '0.34.0'
     id 'com.diffplug.spotless' version '6.25.0'
 }
 
@@ -136,17 +136,17 @@ if (JavaVersion.current().isJava8Compatible()) {
 }
 
 task javadocJar(type: Jar) {
-    classifier = 'javadoc'
+    archiveClassifier.set('javadoc')
     from javadoc
 }
 
 task sourcesJar(type: Jar) {
-    classifier = 'sources'
+    archiveClassifier.set('sources')
     from sourceSets.main.allSource
 }
 
 task fatJar(type: Jar) {
-    classifier = 'all'
+    archiveClassifier.set('all')
     duplicatesStrategy = DuplicatesStrategy.EXCLUDE
     from {
         configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ buildscript {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`plugins {`
`14`		`- id 'com.vanniktech.maven.publish' version '0.24.0'`
	`14`	`+ id 'com.vanniktech.maven.publish' version '0.34.0'`
`15`	`15`	`id 'com.diffplug.spotless' version '6.25.0'`
`16`	`16`	`}`
`17`	`17`
`@@ -42,17 +42,17 @@ if (JavaVersion.current().isJava8Compatible()) {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`task javadocJar(type: Jar) {`
`45`		`- classifier = 'javadoc'`
	`45`	`+ archiveClassifier.set('javadoc')`
`46`	`46`	`from javadoc`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`task sourcesJar(type: Jar) {`
`50`		`- classifier = 'sources'`
	`50`	`+ archiveClassifier.set('sources')`
`51`	`51`	`from sourceSets.main.allSource`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`task fatJar(type: Jar) {`
`55`		`- classifier = 'all'`
	`55`	`+ archiveClassifier.set('all')`
`56`	`56`	`duplicatesStrategy = DuplicatesStrategy.EXCLUDE`
`57`	`57`	`from {`
`58`	`58`	`configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ buildscript {`
`25`	`25`
`26`	`26`	`{{#useCustomTemplateCode}}`
`27`	`27`	`plugins {`
`28`		`- id 'com.vanniktech.maven.publish' version '0.24.0'`
	`28`	`+ id 'com.vanniktech.maven.publish' version '0.34.0'`
`29`	`29`	`id 'com.diffplug.spotless' version '6.25.0'`
`30`	`30`	`}`
`31`	`31`
`@@ -136,17 +136,17 @@ if (JavaVersion.current().isJava8Compatible()) {`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`task javadocJar(type: Jar) {`
`139`		`- classifier = 'javadoc'`
	`139`	`+ archiveClassifier.set('javadoc')`
`140`	`140`	`from javadoc`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`task sourcesJar(type: Jar) {`
`144`		`- classifier = 'sources'`
	`144`	`+ archiveClassifier.set('sources')`
`145`	`145`	`from sourceSets.main.allSource`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`task fatJar(type: Jar) {`
`149`		`- classifier = 'all'`
	`149`	`+ archiveClassifier.set('all')`
`150`	`150`	`duplicatesStrategy = DuplicatesStrategy.EXCLUDE`
`151`	`151`	`from {`
`152`	`152`	`configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }`