Merge pull request #495 from tdrwenski/gradle-upgrade

Upgrade gradle
Unidata · Jul 18, 2024 · b26d4ec · b26d4ec
2 parents 93b5c07 + 3693a95
commit b26d4ec
Show file tree

Hide file tree

Showing 11 changed files with 140 additions and 131 deletions.
diff --git a/build.gradle b/build.gradle
@@ -101,7 +101,7 @@ ext {
 
 tasks.named('wrapper') {
   distributionType = Wrapper.DistributionType.ALL
-  gradleVersion = '6.9.1'
+  gradleVersion = '7.6.4'
 }
 
 gradle.projectsEvaluated {

diff --git a/dap4/d4ts/build.gradle b/dap4/d4ts/build.gradle
@@ -12,8 +12,8 @@ dependencies {
 
   compileOnly 'org.slf4j:slf4j-api'
 
-  runtime 'org.apache.logging.log4j:log4j-slf4j-impl'
-  runtime 'org.apache.logging.log4j:log4j-web'
+  runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl'
+  runtimeOnly 'org.apache.logging.log4j:log4j-web'
 
   compileOnly 'org.slf4j:slf4j-api'
 }

diff --git a/gradle/any/shared-mvn-coords.gradle b/gradle/any/shared-mvn-coords.gradle
@@ -6,7 +6,7 @@ ext {
   // plugin version management
   buildPlugins = [:]
   buildPlugins.gretty = 'org.gretty:gretty:3.0.9'
-  buildPlugins.shadow = 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
+  buildPlugins.shadow = 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2'
   buildPlugins.sonarqube = 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.0'
   buildPlugins.spotless = 'com.diffplug.spotless:spotless-plugin-gradle:4.5.1'
   buildPlugins.protobuf = 'com.google.protobuf:protobuf-gradle-plugin:0.8.18'

diff --git 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.9.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/opendap/dtswar/build.gradle b/opendap/dtswar/build.gradle
@@ -7,18 +7,19 @@ apply from: "$rootDir/gradle/any/war-published.gradle"
 dependencies {
   implementation enforcedPlatform(project(':tds-platform'))
 
-  compile project(':opendap:opendap-servlet')
+  implementation project(':opendap:opendap-servlet')
 
-  compile 'edu.ucar:cdm-core'
-  compile 'edu.ucar:opendap'
-  compile 'org.slf4j:slf4j-api'
+  implementation 'edu.ucar:cdm-core'
+  implementation 'edu.ucar:opendap'
+  implementation 'org.jdom:jdom2'
+  implementation 'org.slf4j:slf4j-api'
 
   providedCompile "jakarta.servlet:jakarta.servlet-api:${depVersion.javaxServletApi}"
 
-  runtime 'org.apache.taglibs:taglibs-standard-spec'
-  runtime 'org.apache.taglibs:taglibs-standard-impl'
+  runtimeOnly 'org.apache.taglibs:taglibs-standard-spec'
+  runtimeOnly 'org.apache.taglibs:taglibs-standard-impl'
 
 
-  runtime 'org.apache.logging.log4j:log4j-slf4j-impl'
-  runtime 'org.apache.logging.log4j:log4j-web'
+  runtimeOnly 'org.apache.logging.log4j:log4j-slf4j-impl'
+  runtimeOnly 'org.apache.logging.log4j:log4j-web'
 }
diff --git a/opendap/server/build.gradle b/opendap/server/build.gradle
@@ -8,9 +8,10 @@ dependencies {
   implementation enforcedPlatform(project(':tds-platform'))
   testImplementation enforcedPlatform (project(':tds-testing-platform'))
 
-  compile 'edu.ucar:cdm-core'
-  compile 'edu.ucar:opendap'
-  compile 'org.slf4j:slf4j-api'
+  implementation 'edu.ucar:cdm-core'
+  implementation 'edu.ucar:opendap'
+  implementation 'org.jdom:jdom2'
+  implementation 'org.slf4j:slf4j-api'
 
   compileOnly 'jakarta.servlet:jakarta.servlet-api'
 

diff --git a/tdcommon/build.gradle b/tdcommon/build.gradle
@@ -8,26 +8,27 @@ apply from: "$rootDir/gradle/any/protobuf.gradle"
 dependencies {
   implementation enforcedPlatform(project(':tds-platform'))
   testImplementation enforcedPlatform (project(':tds-testing-platform'))
-  compile 'edu.ucar:cdm-core'
-  compile 'edu.ucar:cdm-s3'
-  compile 'edu.ucar:grib'
-  compile 'org.jdom:jdom2'
+  implementation 'edu.ucar:cdm-core'
+  implementation 'edu.ucar:cdm-s3'
+  implementation 'edu.ucar:grib'
+  implementation 'org.jdom:jdom2'
 
-  compile 'jakarta.validation:jakarta.validation-api'
-  compile 'jakarta.annotation:jakarta.annotation-api'
+  implementation 'jakarta.validation:jakarta.validation-api'
+  implementation 'jakarta.annotation:jakarta.annotation-api'
 
-  compile 'org.quartz-scheduler:quartz'
-  compile 'net.openhft:chronicle-map'
-  compile 'com.google.code.findbugs:jsr305'
-  compile 'com.google.guava:guava'
-  compile 'com.google.protobuf:protobuf-java'
+  implementation 'org.quartz-scheduler:quartz'
+  implementation 'net.openhft:chronicle-map'
+  implementation 'com.google.code.findbugs:jsr305'
+  implementation 'com.google.guava:guava'
+  implementation 'com.google.protobuf:protobuf-java'
+  implementation 'com.google.re2j:re2j'
 
-  compile 'org.slf4j:slf4j-api'
+  implementation 'org.slf4j:slf4j-api'
 
   // Spring
-  compile 'org.springframework:spring-core'
-  compile 'org.springframework:spring-context'
-  compile 'org.springframework:spring-beans'
+  implementation 'org.springframework:spring-core'
+  implementation 'org.springframework:spring-context'
+  implementation 'org.springframework:spring-beans'
 
   // Testing
   testImplementation 'edu.ucar:cdm-test-utils'  // Contains stuff like the JUnit @Category classes.
@@ -43,3 +44,7 @@ spotless {
     targetExclude('src/main/java/thredds/server/catalog/tracker/ConfigCatalogExtProto.java')
   }
 }
+
+tasks.named('sourceJar').configure {
+  dependsOn('generateProto')
+}
diff --git a/tdm/build.gradle b/tdm/build.gradle
@@ -13,29 +13,26 @@ apply plugin: 'com.github.johnrengelman.shadow'
 dependencies {
   implementation enforcedPlatform(project(':tds-platform'))
 
-  compile project(':tdcommon')
-  compile 'edu.ucar:httpservices'
-  compile 'edu.ucar:cdm-core'
-  compile 'edu.ucar:grib'
-
-  compile 'org.apache.httpcomponents:httpclient'
-  compile 'org.jdom:jdom2'
-  compile 'org.springframework:spring-beans'
-  compile 'org.springframework:spring-core'
-  compile 'org.springframework:spring-context'
-  compile 'com.google.protobuf:protobuf-java'
-  compile 'com.beust:jcommander'
-  compile 'com.google.guava:guava'
-
-  compile 'org.slf4j:slf4j-api'
-  runtime 'org.apache.logging.log4j:log4j-slf4j-impl'
+  implementation project(':tdcommon')
+  implementation 'edu.ucar:httpservices'
+  implementation 'edu.ucar:cdm-core'
+  implementation 'edu.ucar:grib'
+
+  implementation 'org.apache.httpcomponents:httpclient'
+  implementation 'org.jdom:jdom2'
+  implementation 'org.springframework:spring-beans'
+  implementation 'org.springframework:spring-core'
+  implementation 'org.springframework:spring-context'
+  implementation 'com.google.protobuf:protobuf-java'
+  implementation 'com.beust:jcommander'
+  implementation 'com.google.guava:guava'
+  implementation 'com.google.re2j:re2j'
+
+  implementation 'org.slf4j:slf4j-api'
+  implementation 'org.apache.logging.log4j:log4j-slf4j-impl'
 }
 
 shadowJar {
-  baseName = 'tdmFat'
-  setArchiveBaseName('tdmFat')
-  classifier ''
-  setArchiveClassifier ''
   doFirst {
     manifest.attributes jar.manifest.attributes
   }

diff --git a/tds-ugrid/build.gradle b/tds-ugrid/build.gradle
@@ -9,18 +9,19 @@ apply from: "$rootDir/gradle/any/java-published.gradle"
 
 dependencies {
   implementation enforcedPlatform (project(':tds-platform'))
-  testCompile enforcedPlatform (project(':tds-testing-platform'))
+  testImplementation enforcedPlatform (project(':tds-testing-platform'))
 
-  compile 'edu.ucar:cdm-core'
-  compile 'edu.ucar:cdm-s3'
+  implementation 'edu.ucar:cdm-core'
+  implementation 'edu.ucar:cdm-s3'
   implementation 'colt:colt:1.2.0'
+  implementation 'com.google.guava:guava'
 
   // Testing
-  testCompile project(':tds-test-utils');
-  testCompile 'edu.ucar:cdm-test-utils'  // Contains stuff like the JUnit @Category classes.
-  testCompile 'junit:junit'
-  testCompile 'com.google.truth:truth'
+  testImplementation project(':tds-test-utils');
+  testImplementation 'edu.ucar:cdm-test-utils'  // Contains stuff like the JUnit @Category classes.
+  testImplementation 'junit:junit'
+  testImplementation 'com.google.truth:truth'
 
   // Logging
-  compile 'org.slf4j:slf4j-api'
+  implementation 'org.slf4j:slf4j-api'
 }
diff --git a/tds-ui/build.gradle b/tds-ui/build.gradle
@@ -9,11 +9,11 @@ apply plugin: 'application'
 
 dependencies {
   implementation enforcedPlatform(project(':tds-platform'))
-  testCompile enforcedPlatform(project(':tds-testing-platform'))
+  testImplementation enforcedPlatform(project(':tds-testing-platform'))
 
-  runtime 'edu.ucar:uicdm'
-  runtime 'edu.ucar:cdm-s3'
-  runtime project(':tds-ugrid')
+  runtimeOnly 'edu.ucar:uicdm'
+  runtimeOnly 'edu.ucar:cdm-s3'
+  runtimeOnly project(':tds-ugrid')
 }
 
 application {