Issue #148: Update Gradle to 7+ (#149)

* #148: Updated syntax for Gradle commands

* #148: Upgraded to Gradlew 7

* #148: Updated Gradlew wrapper to v8.0.2

* #148: Upgraded Gradle to 8.0.2 locally, 7+ in Docker

---------

Co-authored-by: darnjo <[email protected]>

Author: darnjo

CommanderTestingContainer

@@ -1,6 +1,6 @@
-FROM alpine:3.10
+FROM alpine:3.17.2
 
-RUN apk add --update bash ca-certificates openjdk8 openjdk8-jre-base nss git "gradle=5.4.1-r0" && \
+RUN apk add --update bash ca-certificates openjdk8 openjdk8-jre-base nss git gradle && \
     rm -rf /var/cache/apk/*
 
 RUN git clone --single-branch --branch main https://github.com/RESOStandards/web-api-commander.git

Dockerfile

@@ -1,4 +1,4 @@
-FROM gradle:6.9.2-jdk8 AS builder
+FROM gradle:8.0.2-jdk8 AS builder
 
 WORKDIR /home/gradle/project
 

GradleDockerfile

@@ -1,8 +1,6 @@
-FROM gradle:6.9.2-jdk8 AS builder
+FROM alpine:3.17.2
 
-FROM alpine:3.14.8
-
-RUN apk add --update bash ca-certificates openjdk8-jre-base nss git gradle   && \
+RUN apk add --update bash ca-certificates openjdk8-jre-base nss git gradle && \
     rm -rf /var/cache/apk/*
 
 RUN git clone --single-branch --branch main https://github.com/RESOStandards/web-api-commander.git

build.gradle

@@ -1,6 +1,6 @@
 plugins {
   // Apply the java plugin to add support for Java
-  id 'java'
+  id 'java-library'
 
   // Apply the application plugin to add support for building an application
   id 'application'
@@ -13,48 +13,46 @@ targetCompatibility = 1.8
 compileJava.options.encoding = 'UTF-8'
 
 repositories {
-  // Use jcenter for resolving your dependencies.
-  // You can declare any Maven/Ivy/file repository here.
   mavenCentral()
 }
 
 dependencies {
-  compile 'com.google.guava:guava:31.1-jre'
-  compile 'com.google.inject:guice:5.1.0'
-  compile 'commons-cli:commons-cli:1.5.0'
+  implementation 'com.google.guava:guava:31.1-jre'
+  implementation 'com.google.inject:guice:5.1.0'
+  implementation 'commons-cli:commons-cli:1.5.0'
 
-  compile 'org.apache.logging.log4j:log4j-api:2.18.0'
-  compile 'org.apache.logging.log4j:log4j-slf4j-impl:2.18.0'
-  compile 'org.apache.logging.log4j:log4j-1.2-api:2.18.0'
-  compile 'org.apache.logging.log4j:log4j-core:2.18.0'
+  implementation 'org.apache.logging.log4j:log4j-api:2.18.0'
+  implementation 'org.apache.logging.log4j:log4j-slf4j-impl:2.18.0'
+  implementation 'org.apache.logging.log4j:log4j-1.2-api:2.18.0'
+  implementation 'org.apache.logging.log4j:log4j-core:2.18.0'
 
-  compile 'org.apache.olingo:odata-client-api:4.9.0'
-  compile 'org.apache.olingo:odata-commons-core:4.9.0'
-  compile 'org.apache.olingo:odata-client-core:4.9.0'
+  implementation 'org.apache.olingo:odata-client-api:4.9.0'
+  implementation 'org.apache.olingo:odata-commons-core:4.9.0'
+  implementation 'org.apache.olingo:odata-client-core:4.9.0'
 
-  compile 'org.apache.poi:poi:5.2.2'
-  compile 'org.apache.poi:poi-ooxml:5.2.2'
+  implementation 'org.apache.poi:poi:5.2.2'
+  implementation 'org.apache.poi:poi-ooxml:5.2.2'
 
-  compile 'io.rest-assured:rest-assured:5.1.1'
-  compile 'io.rest-assured:json-path:5.1.1'
-  compile 'io.rest-assured:json-schema-validator:5.1.1'
+  implementation 'io.rest-assured:rest-assured:5.1.1'
+  implementation 'io.rest-assured:json-path:5.1.1'
+  implementation 'io.rest-assured:json-schema-validator:5.1.1'
 
-  compile 'io.cucumber:cucumber-java8:7.1.0'
-  compile 'io.cucumber:cucumber-java:7.1.0'
-  compile 'io.cucumber:cucumber-junit:7.1.0'
-  compile 'io.cucumber:cucumber-guice:7.1.0'
-  compile 'io.cucumber:cucumber-core:7.1.0'
+  implementation 'io.cucumber:cucumber-java8:7.1.0'
+  implementation 'io.cucumber:cucumber-java:7.1.0'
+  implementation 'io.cucumber:cucumber-junit:7.1.0'
+  implementation 'io.cucumber:cucumber-guice:7.1.0'
+  implementation 'io.cucumber:cucumber-core:7.1.0'
 
   //TODO: choose one schema validator between this and rest-assured
-  compile 'com.networknt:json-schema-validator:1.0.70'
-  compile 'com.google.code.gson:gson:2.9.0'
-  compile 'org.apache.commons:commons-text:1.9'
+  implementation 'com.networknt:json-schema-validator:1.0.70'
+  implementation 'com.google.code.gson:gson:2.9.0'
+  implementation 'org.apache.commons:commons-text:1.9'
 
 }
 
 configurations {
   cucumberRuntime {
-    extendsFrom compile
+    extendsFrom implementation
   }
 }
 
@@ -63,17 +61,16 @@ jar {
     attributes "Main-Class": mainClassName
   }
 
+  duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+
   from {
-    configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
+    configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
   }
-  exclude 'META-INF/*.RSA'
-  exclude 'META-INF/*.SF'
-  exclude 'META-INF/*.DSA'
 }
 
 
 // don't suppress warnings or deprecation notices
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
   options.compilerArgs << '-Xlint:unchecked'
   options.deprecation = true
 }
@@ -87,21 +84,21 @@ final String certOutputDir = 'build' + File.separator + 'certification',
              certReportsDir = certOutputDir + File.separator + 'reports',
              certResultsDir = certOutputDir + File.separator + 'results'
 
-task prepareCertificationEnvironment() {
- doLast {
-  def folder = new File(certOutputDir)
-  if (folder.exists()) {
-    delete certOutputDir
-  }
-  
+tasks.register('prepareCertificationEnvironment') {
+  doLast {
+    def folder = new File(certOutputDir)
+    if (folder.exists()) {
+      delete certOutputDir
+    }
+
     mkdir certOutputDir
     mkdir cucumberJsonPath
     mkdir certReportsDir
     mkdir certResultsDir
   }
 }
 
-task testWebApiCore_2_0_0() {
+tasks.register('testWebApiCore_2_0_0') {
   group = 'RESO Certification'
   description = 'Web API Core 2.0.0 Acceptance Tests' +
       '\nExample: ' +
@@ -116,7 +113,7 @@ task testWebApiCore_2_0_0() {
   dependsOn jar, prepareCertificationEnvironment
   doLast {
     javaexec {
-      main = "io.cucumber.core.cli.Main"
+      mainClass = "io.cucumber.core.cli.Main"
       classpath = configurations.cucumberRuntime + sourceSets.main.output + sourceSets.test.output
       systemProperties = System.getProperties()
 
@@ -137,7 +134,7 @@ task testWebApiCore_2_0_0() {
   }
 }
 
-task testDataDictionary_1_7() {
+tasks.register('testDataDictionary_1_7') {
   group = 'RESO Certification'
   description = 'Data Dictionary 1.7 Acceptance Tests' +
       '\nRESOScript Example:' +
@@ -178,13 +175,13 @@ task testDataDictionary_1_7() {
       }
 
       argsArray.addAll(
-        '--plugin',
-        'json:' + cucumberJsonPath + '/' + reportName + '.json',
-        '--plugin',
-        'html:' + certReportsDir + '/' + reportName + '.html',
-        '--glue',
-        'org.reso.certification.stepdefs#DataDictionary',
-        'src/main/java/org/reso/certification/features/data-dictionary/v1-7-0'
+          '--plugin',
+          'json:' + cucumberJsonPath + '/' + reportName + '.json',
+          '--plugin',
+          'html:' + certReportsDir + '/' + reportName + '.html',
+          '--glue',
+          'org.reso.certification.stepdefs#DataDictionary',
+          'src/main/java/org/reso/certification/features/data-dictionary/v1-7-0'
       )
 
       if (systemProperties.hasProperty('cucumber.filter.tags')) {
@@ -197,7 +194,7 @@ task testDataDictionary_1_7() {
   }
 }
 
-task testDataAvailability_1_7() {
+tasks.register('testDataAvailability_1_7') {
   group = 'RESO Certification'
   description = 'Data Dictionary 1.7 Data Availability Tests' +
       '\nExample:' +
@@ -210,7 +207,7 @@ task testDataAvailability_1_7() {
   dependsOn jar
   doLast {
     javaexec {
-      main = "io.cucumber.core.cli.Main"
+      mainClass = "io.cucumber.core.cli.Main"
       classpath = configurations.cucumberRuntime + sourceSets.main.output + sourceSets.test.output
       systemProperties = System.getProperties()
 
@@ -239,7 +236,7 @@ task testDataAvailability_1_7() {
   }
 }
 
-task testIdxPayload_1_7() {
+tasks.register('testIdxPayload_1_7') {
   group = 'RESO Certification'
   description = 'Data Dictionary 1.7 Payloads Sampling Tests' +
       '\nExample:' +
@@ -252,7 +249,7 @@ task testIdxPayload_1_7() {
   dependsOn jar
   doLast {
     javaexec {
-      main = "io.cucumber.core.cli.Main"
+      mainClass = "io.cucumber.core.cli.Main"
       classpath = configurations.cucumberRuntime + sourceSets.main.output + sourceSets.test.output
       systemProperties = System.getProperties()
 
@@ -271,12 +268,12 @@ task testIdxPayload_1_7() {
   }
 }
 
-task testDataDictionaryReferenceMetadata_1_7() {
+tasks.register('testDataDictionaryReferenceMetadata_1_7') {
   description = 'Runs Data Dictionary tests against reference metadata'
   dependsOn jar
   doLast {
     javaexec {
-      main = "io.cucumber.core.cli.Main"
+      mainClass = "io.cucumber.core.cli.Main"
       classpath = configurations.cucumberRuntime + sourceSets.main.output + sourceSets.test.output
       System.setProperty('pathToMetadata', 'src/main/resources/RESODataDictionary-1.7.xml')
       systemProperties = System.getProperties()
@@ -298,7 +295,7 @@ test {
   dependsOn assemble, compileTestJava, testDataDictionaryReferenceMetadata_1_7
   doLast {
     javaexec {
-      main = "io.cucumber.core.cli.Main"
+      mainClass = "io.cucumber.core.cli.Main"
       classpath = configurations.cucumberRuntime + sourceSets.main.output + sourceSets.test.output
       args = [
           '--plugin',

gradle.properties

@@ -1 +1,2 @@
 org.gradle.jvmargs=-Xmx28g
+org.gradle.warning.mode=all

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.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists