From 7424df8a4e422fa4bc9779976830a359c767b717 Mon Sep 17 00:00:00 2001 From: Juan Treminio <50673996+jtreminio-dropbox@users.noreply.github.com> Date: Fri, 15 Aug 2025 12:19:49 -0500 Subject: [PATCH] Fixing java release details (#512) --- sdks/java-v1/build.gradle | 8 ++++---- sdks/java-v1/gradle.properties | 1 - sdks/java-v1/gradle/wrapper/gradle-wrapper.properties | 2 +- sdks/java-v1/templates/gradle-wrapper.properties.mustache | 5 ----- sdks/java-v1/templates/gradle.properties.mustache | 1 - .../templates/libraries/jersey2/build.gradle.mustache | 8 ++++---- sdks/java-v2/build.gradle | 8 ++++---- sdks/java-v2/gradle.properties | 1 - sdks/java-v2/gradle/wrapper/gradle-wrapper.properties | 2 +- sdks/java-v2/templates/gradle-wrapper.properties.mustache | 5 ----- sdks/java-v2/templates/gradle.properties.mustache | 1 - .../templates/libraries/jersey3/build.gradle.mustache | 8 ++++---- 12 files changed, 18 insertions(+), 32 deletions(-) diff --git a/sdks/java-v1/build.gradle b/sdks/java-v1/build.gradle index d06cd59c9..e4b936424 100644 --- 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 index 2f88b470d..304e232fe 100644 --- 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 index 5c6f89dba..b82aa23a4 100644 --- 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 index 552ae67dd..b82aa23a4 100644 --- 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 index 101f52b9b..5aa1b7d54 100644 --- 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 index d3ea8ff60..deeb879cb 100644 --- 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 index 6f1c8f3ba..52e767e5a 100644 --- 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 index fa3197afd..4890087b8 100644 --- 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 index 5c6f89dba..b82aa23a4 100644 --- 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 index 552ae67dd..b82aa23a4 100644 --- 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 index 101f52b9b..5aa1b7d54 100644 --- 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 index e29892ff2..8663e4b09 100644 --- 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) }