diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 2efd7d6e62..3c5ed37ef8 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -98,8 +98,8 @@ Once you are satisfied with your work, there is one last step to complete before ### Follow these Style Guidelines -#### Java, Groovy, and Gradle -We are using the [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html) for Java, Groovy, and Gradle, with these exceptions and augmentations: +#### Java and Gradle +We are using the [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html) for Java and Gradle, with these exceptions and augmentations: 1. The recommended line width is 120, not 100. Modern screens are much wider than tall, so having wider lines allows more code to fit on a screen. diff --git a/cdm/core/build.gradle b/cdm/core/build.gradle index 369a4cc19e..f02decb9ff 100644 --- a/cdm/core/build.gradle +++ b/cdm/core/build.gradle @@ -6,8 +6,6 @@ apply from: "$rootDir/gradle/any/dependencies.gradle" apply from: "$rootDir/gradle/any/java-library.gradle" apply from: "$rootDir/gradle/any/protobuf.gradle" -apply plugin: 'groovy' // For Spock tests. - dependencies { api enforcedPlatform(project(':netcdf-java-platform')) implementation 'commons-math:commons-math' @@ -32,9 +30,7 @@ dependencies { testImplementation 'com.google.truth:truth' testImplementation 'commons-io:commons-io' testImplementation 'junit:junit' - testImplementation 'org.codehaus.groovy:groovy-all' // for Spock. testImplementation 'org.mockito:mockito-core' - testImplementation 'org.spockframework:spock-core' testRuntimeOnly 'ch.qos.logback:logback-classic' } diff --git a/cdm/misc/build.gradle b/cdm/misc/build.gradle index 2e6f0cdf32..a1765e691d 100644 --- a/cdm/misc/build.gradle +++ b/cdm/misc/build.gradle @@ -5,8 +5,6 @@ apply from: "$rootDir/gradle/any/dependencies.gradle" apply from: "$rootDir/gradle/any/java-library.gradle" apply from: "$rootDir/gradle/any/protobuf.gradle" -apply plugin: 'groovy' // For Spock tests. - dependencies { api enforcedPlatform(project(':netcdf-java-platform')) testImplementation enforcedPlatform(project(':netcdf-java-testing-platform')) @@ -23,9 +21,6 @@ dependencies { testImplementation project(':cdm-test-utils') - testImplementation 'org.codehaus.groovy:groovy-all' // for spock - testImplementation 'org.spockframework:spock-core' - testImplementation 'commons-io:commons-io' testImplementation 'org.mockito:mockito-core' testImplementation 'com.google.truth:truth' diff --git a/cdm/radial/build.gradle b/cdm/radial/build.gradle index b769186ef3..6a57986bf8 100644 --- a/cdm/radial/build.gradle +++ b/cdm/radial/build.gradle @@ -4,8 +4,6 @@ ext.title = 'CDM radial library' apply from: "$rootDir/gradle/any/dependencies.gradle" apply from: "$rootDir/gradle/any/java-library.gradle" -apply plugin: 'groovy' // For Spock tests. - dependencies { api enforcedPlatform(project(':netcdf-java-platform')) testImplementation enforcedPlatform(project(':netcdf-java-testing-platform')) @@ -21,8 +19,6 @@ dependencies { testImplementation project(':cdm-test-utils') testImplementation project(':netcdf4') - testImplementation 'org.codehaus.groovy:groovy-all' // for spock - testImplementation 'org.spockframework:spock-core' testImplementation 'commons-io:commons-io' testImplementation 'org.mockito:mockito-core' testImplementation 'com.google.truth:truth' diff --git a/cdm/s3/build.gradle b/cdm/s3/build.gradle index d5f1c988b6..a4a108a170 100644 --- a/cdm/s3/build.gradle +++ b/cdm/s3/build.gradle @@ -4,8 +4,6 @@ ext.title = 'CDM S3 support library' apply from: "$rootDir/gradle/any/dependencies.gradle" apply from: "$rootDir/gradle/any/java-library.gradle" -apply plugin: 'groovy' // For Spock tests. - dependencies { api enforcedPlatform(project(':netcdf-java-platform')) testImplementation enforcedPlatform(project(':netcdf-java-testing-platform')) diff --git a/gradle/root/sonarqube.gradle b/gradle/root/sonarqube.gradle index 89d747b751..384ad087ed 100644 --- a/gradle/root/sonarqube.gradle +++ b/gradle/root/sonarqube.gradle @@ -58,7 +58,7 @@ gradle.projectsEvaluated { allprojects { sonarqube { properties { - properties['sonar.inclusions'] = '**/*.java, **/*.groovy' // Only scan Java and Groovy files. + properties['sonar.inclusions'] = '**/*.java' // Only scan Java files. properties['sonar.exclusions'] = '**/*Proto.java' // Don't analyze protobuf-generated code. // We're already reporting test failures and code coverage in Jenkins; we don't need to do it in Sonar diff --git a/legacy/build.gradle b/legacy/build.gradle index cc8255bf3f..9b9a3f77bf 100644 --- a/legacy/build.gradle +++ b/legacy/build.gradle @@ -5,8 +5,6 @@ ext.url = 'https://www.unidata.ucar.edu/software/tds/v4.6/TDS.html' apply from: "$rootDir/gradle/any/dependencies.gradle" apply from: "$rootDir/gradle/any/java-library.gradle" -apply plugin: 'groovy' // For Spock tests. - dependencies { api enforcedPlatform(project(':netcdf-java-platform')) testImplementation enforcedPlatform(project(':netcdf-java-testing-platform')) @@ -24,10 +22,5 @@ dependencies { compile 'com.amazonaws:aws-java-sdk-s3' // For CrawlableDatasetAmazonS3. testImplementation project(':cdm-test-utils') - // These are all for Spock. - testImplementation 'org.spockframework:spock-core' - testImplementation 'org.codehaus.groovy:groovy-all' testRuntimeOnly 'ch.qos.logback:logback-classic' - testRuntimeOnly 'cglib:cglib-nodep' - testRuntimeOnly 'org.objenesis:objenesis' } diff --git a/netcdf-java-testing-platform/build.gradle b/netcdf-java-testing-platform/build.gradle index 3163b2a19c..5527e0abee 100644 --- a/netcdf-java-testing-platform/build.gradle +++ b/netcdf-java-testing-platform/build.gradle @@ -18,10 +18,6 @@ dependencies { // Fluent assertions for Java api 'com.google.truth:truth:1.0' - // These two are for Spock. - api 'org.spockframework:spock-core:1.3-groovy-2.5' - api 'org.codehaus.groovy:groovy-all:2.5.12' - //mockito api 'org.mockito:mockito-core:2.28.2' @@ -33,14 +29,6 @@ dependencies { // opendap, dap4, and httpservices api 'org.testcontainers:testcontainers:1.19.7' - - // In Spock, allows mocking of classes (in addition to interfaces). - // todo: remove with legacy in 6 - runtime 'cglib:cglib-nodep:3.2.4' - - // In Spock, allows mocking of classes without default constructor (together with CGLIB). - // todo: remove with legacy in 6 - runtime 'org.objenesis:objenesis:2.4' } } diff --git a/netcdf4/build.gradle b/netcdf4/build.gradle index 3cddb0e1ad..9038c9cf91 100644 --- a/netcdf4/build.gradle +++ b/netcdf4/build.gradle @@ -4,7 +4,6 @@ ext.url = 'https://www.unidata.ucar.edu/software/netcdf/' apply from: "$rootDir/gradle/any/dependencies.gradle" apply from: "$rootDir/gradle/any/java-library.gradle" -apply plugin: 'groovy' // For Spock tests. apply plugin: 'jacoco' dependencies { @@ -18,8 +17,6 @@ dependencies { testImplementation project(':cdm-test-utils') testImplementation 'com.google.truth:truth' - testImplementation 'org.codehaus.groovy:groovy-all' // for spock - testImplementation 'org.spockframework:spock-core' testRuntimeOnly 'ch.qos.logback:logback-classic' } diff --git a/uibase/build.gradle b/uibase/build.gradle index d9d76a059b..3627dda52e 100644 --- a/uibase/build.gradle +++ b/uibase/build.gradle @@ -3,7 +3,6 @@ ext.title = 'UI base library' apply from: "$rootDir/gradle/any/dependencies.gradle" apply from: "$rootDir/gradle/any/java-library.gradle" -apply plugin: 'groovy' // For Spock tests. dependencies { compile enforcedPlatform(project(':netcdf-java-platform')) @@ -32,8 +31,6 @@ dependencies { testImplementation project(':cdm:cdm-core') testImplementation project(':cdm-test-utils') - testImplementation 'org.codehaus.groovy:groovy-all' // for spock - testImplementation 'org.spockframework:spock-core' testImplementation 'commons-io:commons-io' testImplementation 'org.mockito:mockito-core' testImplementation 'com.google.truth:truth'