0005140: Upgrade to gradle version 6.9.1

Replace compile dependency with corresponding non-deprecated
replacement.

symmetric-android/build.gradle

@@ -3,12 +3,12 @@ apply from: symAssembleDir + '/common.gradle'
     description = 'SymmetricDS Client library for Android clients'
 
     dependencies {
-        compile (project(":symmetric-core")) {
+        api (project(":symmetric-core")) {
             exclude group:'org.slf4j'
             exclude group:'log4j'
             exclude group:'net.sf.kxml'
         }
-        compile "org.slf4j:slf4j-android:1.6.1-RC1"
+        api "org.slf4j:slf4j-android:1.6.1-RC1"
         compileOnly "com.google.android:android:2.1.2"
     }
 

symmetric-assemble/common.gradle

@@ -106,14 +106,6 @@ subprojects { subproject ->
         }
         api.extendsFrom(provided)
 		// Ensure only the compile configuration is exported
-		project.eclipse.classpath.file {
-			whenMerged { classpath ->
-				def resolved = project.configurations.compile.resolve()
-				classpath.entries.findAll{it.kind == 'lib'}.each {
-					it.exported = resolved.contains(project.file(it.path))
-				}
-			}
-		}
 		project.idea.module {
 			// IDEA internally deals with 4 scopes : COMPILE, TEST, PROVIDED, RUNTIME
 			// but only PROVIDED seems to be picked up
@@ -355,13 +347,13 @@ subprojects { subproject ->
     }
 
     dependencies {
-        compile "org.apache.logging.log4j:log4j-core:$log4jVersion"
-        compile "org.apache.logging.log4j:log4j-api:$log4jVersion"
-        compile "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion"
-        compile "org.apache.logging.log4j:log4j-web:$log4jVersion"
-        compile "org.slf4j:slf4j-api:$slf4jVersion"
-        compile "org.slf4j:jul-to-slf4j:$slf4jVersion"
-        compile "org.slf4j:jcl-over-slf4j:$slf4jVersion"
+        api "org.apache.logging.log4j:log4j-core:$log4jVersion"
+        api "org.apache.logging.log4j:log4j-api:$log4jVersion"
+        api "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion"
+        api "org.apache.logging.log4j:log4j-web:$log4jVersion"
+        api "org.slf4j:slf4j-api:$slf4jVersion"
+        api "org.slf4j:jul-to-slf4j:$slf4jVersion"
+        api "org.slf4j:jcl-over-slf4j:$slf4jVersion"
         compileOnly "com.github.spotbugs:spotbugs-annotations:$spotBugsVersion"
 
         testImplementation fileTree(dir: System.getProperty("user.home") + '/.symmetricds/lib', include: '*.jar')
@@ -417,6 +409,6 @@ subprojects { subproject ->
             (w3c) : ['The W3C Software License', 'W3C Software Copyright Notice and License']
         ]
 
-        dependencyConfiguration = 'compile'
+        dependencyConfiguration = 'api'
     }    
 }

symmetric-client/build.gradle

@@ -3,15 +3,15 @@ apply from: symAssembleDir + '/common.gradle'
     description = 'SymmetricDS Client library for JDBC clients'
 
     dependencies {
-        compile project(":symmetric-core")
-        compile project(":symmetric-jdbc")
-        compile "org.springframework:spring-context:$springVersion"
-        compile "commons-cli:commons-cli:$commonsCliVersion"
-        compile ("org.apache.commons:commons-vfs2:$commonsVfs") {
+        api project(":symmetric-core")
+        api project(":symmetric-jdbc")
+        api "org.springframework:spring-context:$springVersion"
+        api "commons-cli:commons-cli:$commonsCliVersion"
+        api ("org.apache.commons:commons-vfs2:$commonsVfs") {
             exclude group: "org.apache.hadoop"
             exclude group: 'commons-logging'
         }
-        compile "org.jdom:jdom2:$jdomVersion"
+        api "org.jdom:jdom2:$jdomVersion"
 
         provided "com.h2database:h2:$h2Version"
         provided ("mysql:mysql-connector-java:$mysqlVersion") {

symmetric-core/build.gradle

@@ -3,17 +3,17 @@ apply from: symAssembleDir + '/common.gradle'
     description = 'Central SymmetricDS library.  Excludes direct dependencies on JDBC.'
 
     dependencies {
-        compile project(":symmetric-io")
-        compile project(":symmetric-util")
-        compile "com.sun.mail:javax.mail:$javaMailVersion"
-        compile "com.google.code.gson:gson:$gsonVersion"
-        compile "org.springframework:spring-core:$springVersion"
-        compile "org.springframework:spring-beans:$springVersion"
+        api project(":symmetric-io")
+        api project(":symmetric-util")
+        api "com.sun.mail:javax.mail:$javaMailVersion"
+        api "com.google.code.gson:gson:$gsonVersion"
+        api "org.springframework:spring-core:$springVersion"
+        api "org.springframework:spring-beans:$springVersion"
 
         compileOnly "org.eclipse.jetty:jetty-alpn-conscrypt-server:$jettyVersion"
         // force okhttp3 to use newer version of kotlin
-        compile "org.jetbrains.kotlin:kotlin-stdlib:1.6.20"
-        compile "com.squareup.okhttp3:okhttp:4.9.3"
+        api "org.jetbrains.kotlin:kotlin-stdlib:1.6.20"
+        api "com.squareup.okhttp3:okhttp:4.9.3"
 
         compileOnly ("nl.cad:tps-parse:1.0.15-SNAPSHOT") {
             exclude group: 'commons-lang', module: 'commons-lang'

symmetric-db/build.gradle

@@ -3,9 +3,9 @@ apply from: symAssembleDir + '/common.gradle'
     description = 'Database classes that are used by several Symmetric libraries'
 
     dependencies {
-        compile project(":symmetric-util")
-        compile "net.sf.kxml:kxml2:2.3.0" // Used by ddlutils / DatabaseXmlUtil
-        compile ("commons-beanutils:commons-beanutils:$commonsBeanUtilsVersion") {
+        api project(":symmetric-util")
+        api "net.sf.kxml:kxml2:2.3.0" // Used by ddlutils / DatabaseXmlUtil
+        api ("commons-beanutils:commons-beanutils:$commonsBeanUtilsVersion") {
             exclude group: "commons-collections"
             exclude group: 'commons-logging'
         }

symmetric-io/build.gradle

@@ -3,12 +3,12 @@ apply from: symAssembleDir + '/common.gradle'
     description = 'Data input/output libraries'
 
     dependencies {
-        compile project(":symmetric-csv")
-        compile project(":symmetric-db")
-        compile "org.apache-extras.beanshell:bsh:$bshVersion"
-        compile "net.sourceforge.jeval:jeval:0.9.4"
-        compile "com.google.code.gson:gson:$gsonVersion"
-        compile "org.springframework:spring-core:$springVersion"
+        api project(":symmetric-csv")
+        api project(":symmetric-db")
+        api "org.apache-extras.beanshell:bsh:$bshVersion"
+        api "net.sourceforge.jeval:jeval:0.9.4"
+        api "com.google.code.gson:gson:$gsonVersion"
+        api "org.springframework:spring-core:$springVersion"
         compileOnly ("com.datastax.cassandra:cassandra-driver-core:3.11.1") {
             exclude group: 'org.slf4j'
             exclude group: 'com.google.guava'

symmetric-jdbc/build.gradle

@@ -3,11 +3,11 @@ apply from: symAssembleDir + '/common.gradle'
     description = 'Library that contains the jdbc implementation for symmetric-db'
 
     dependencies {
-        compile project(":symmetric-db")
-        compile ("org.apache.commons:commons-dbcp2:$commonsDbcpVersion") {
+        api project(":symmetric-db")
+        api ("org.apache.commons:commons-dbcp2:$commonsDbcpVersion") {
             exclude group: 'commons-logging'
         }
-        compile "org.springframework:spring-jdbc:$springVersion"
+        api "org.springframework:spring-jdbc:$springVersion"
 
         compileOnly "com.h2database:h2:$h2Version"
         compileOnly "jdbc.sybase:jconnect:7.7"

symmetric-server/build.gradle

@@ -6,16 +6,16 @@ apply from: symAssembleDir + '/asciidoc.gradle'
     apply plugin: 'distribution'
 
     dependencies {
-        compile project(":symmetric-client")
+        api project(":symmetric-client")
         compileOnly project(":symmetric-swagger-ui")
-        compile "org.springframework:spring-jms:$springVersion"
-        compile "org.springframework:spring-web:$springVersion"
-        compile "org.springframework:spring-webmvc:$springVersion"
-        compile "javax.xml.bind:jaxb-api:$jaxbVersion"
-        compile "org.jdom:jdom2:$jdomVersion"
-        compile "commons-fileupload:commons-fileupload:$commonsFileuploadVersion"
+        api "org.springframework:spring-jms:$springVersion"
+        api "org.springframework:spring-web:$springVersion"
+        api "org.springframework:spring-webmvc:$springVersion"
+        api "javax.xml.bind:jaxb-api:$jaxbVersion"
+        api "org.jdom:jdom2:$jdomVersion"
+        api "commons-fileupload:commons-fileupload:$commonsFileuploadVersion"
 
-        compile "io.swagger:swagger-annotations:1.6.6"
+        api "io.swagger:swagger-annotations:1.6.6"
 
         provided project(":symmetric-wrapper")
         provided "javax.jms:jms-api:1.1-rev-1"
@@ -29,8 +29,8 @@ apply from: symAssembleDir + '/asciidoc.gradle'
         provided "net.sourceforge.jtds:jtds:$jtdsVersion"
         provided "com.microsoft.sqlserver:mssql-jdbc:10.2.0.jre8"
 
-        compile "org.bouncycastle:bcprov-jdk15on:$bouncyCastleVersion"
-        compile "org.bouncycastle:bcpkix-jdk15on:$bouncyCastleVersion"        
+        api "org.bouncycastle:bcprov-jdk15on:$bouncyCastleVersion"
+        api "org.bouncycastle:bcpkix-jdk15on:$bouncyCastleVersion"        
 
         compileOnly "org.codehaus.mojo:animal-sniffer-annotations:$animalSnifferVersion"
 
@@ -107,7 +107,7 @@ apply from: symAssembleDir + '/asciidoc.gradle'
                 }
                 into('web/WEB-INF/lib') {
                     from project(":symmetric-server").jar
-                    from configurations.compile.filter {  a ->
+                    from configurations.runtimeClasspath.filter {  a ->
                                 (!configurations.provided.contains(a) &&
                                 !project(':symmetric-server').configurations.provided.contains(a)) ||
                                 (a.name.contains('slf4j-api') || a.name.contains('to-slf4j') || a.name.contains('over-slf4j'))

symmetric-sqlexplorer/build.gradle

@@ -26,19 +26,19 @@ configurations.archives.with {
 }
 
 dependencies {
-    compile project(":symmetric-jdbc")
-    compile project(":symmetric-io")
+    api project(":symmetric-jdbc")
+    api project(":symmetric-io")
 
-    compile "org.apache.commons:commons-lang3:$commonsLangVersion"
-    compile ("org.apache.commons:commons-dbcp2:$commonsDbcpVersion") {
+    api "org.apache.commons:commons-lang3:$commonsLangVersion"
+    api ("org.apache.commons:commons-dbcp2:$commonsDbcpVersion") {
         exclude group: 'commons-logging'
     }
-    compile "commons-io:commons-io:$commonsIoVersion"
+    api "commons-io:commons-io:$commonsIoVersion"
 
-    compile "org.springframework:spring-webmvc:$springVersion"
-    
-    compile "de.f0rce:ace:1.3.0"
-    compile "com.vaadin:vaadin-context-menu:3.1.0"
+    api "org.springframework:spring-webmvc:$springVersion"
+
+    api "de.f0rce:ace:1.3.0"
+    api "com.vaadin:vaadin-context-menu:3.1.0"
 
     testImplementation "com.h2database:h2:$h2Version"
     testImplementation "javax.websocket:javax.websocket-api:$websocketVersion"    

symmetric-swagger-ui/build.gradle

@@ -3,18 +3,18 @@ apply from: symAssembleDir + '/common.gradle'
     description = 'Swagger UI'
 
     dependencies {
-        compile project(":symmetric-core")
-        compile "org.springframework:spring-context:$springVersion"
-        compile "org.springframework:spring-webmvc:$springVersion"
+        api project(":symmetric-core")
+        api "org.springframework:spring-context:$springVersion"
+        api "org.springframework:spring-webmvc:$springVersion"
 
-        compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
-        compile "com.google.guava:guava:$guavaVersion"
-        compile ("io.springfox:springfox-swagger2:2.9.2") {
+        api "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
+        api "com.google.guava:guava:$guavaVersion"
+        api ("io.springfox:springfox-swagger2:2.9.2") {
             exclude group: "com.fasterxml.jackson.core"
             exclude group: 'com.fasterxml.jackson.dataformat'
             exclude group: 'com.fasterxml.jackson.databind'
             exclude group: "com.google.guava"
             exclude group: "com.fasterxml"
         }
-        compile 'io.springfox:springfox-swagger-ui:2.9.2'
+        api 'io.springfox:springfox-swagger-ui:2.9.2'
     }

symmetric-util/build.gradle

@@ -3,12 +3,12 @@ apply from: symAssembleDir + '/common.gradle'
     description = 'Utility classes that are used by several Symmetric libraries'
 
     dependencies {
-        compile "org.apache.commons:commons-lang3:$commonsLangVersion"
-        compile "org.apache.commons:commons-text:$commonsTextVersion"
-        compile "commons-io:commons-io:$commonsIoVersion"
-        compile "commons-codec:commons-codec:$commonsCodecVersion"
-        compile "org.apache.commons:commons-collections4:$commonsCollectionVersion"
-        compile "com.google.code.gson:gson:$gsonVersion"
+        api "org.apache.commons:commons-lang3:$commonsLangVersion"
+        api "org.apache.commons:commons-text:$commonsTextVersion"
+        api "commons-io:commons-io:$commonsIoVersion"
+        api "commons-codec:commons-codec:$commonsCodecVersion"
+        api "org.apache.commons:commons-collections4:$commonsCollectionVersion"
+        api "com.google.code.gson:gson:$gsonVersion"
         compileOnly "org.bouncycastle:bcprov-jdk15on:$bouncyCastleVersion"
         compileOnly "org.bouncycastle:bcpkix-jdk15on:$bouncyCastleVersion"
         compileOnly "org.codehaus.mojo:animal-sniffer-annotations:$animalSnifferVersion"

symmetric-wrapper/build.gradle

@@ -3,15 +3,15 @@ apply from: symAssembleDir + '/common.gradle'
     description = 'General purpose cross platform service wrapper'
 
     dependencies {
-        compile "net.java.dev.jna:jna:$jnaVersion"
-        compile "net.java.dev.jna:jna-platform:$jnaVersion"
+        api "net.java.dev.jna:jna:$jnaVersion"
+        api "net.java.dev.jna:jna-platform:$jnaVersion"
         compileOnly "org.codehaus.mojo:animal-sniffer-annotations:$animalSnifferVersion"
     }
 
     jar {
         manifest {
             attributes(
                     "Main-Class": "org.jumpmind.symmetric.wrapper.Wrapper",
-                    "Class-Path": configurations.compile.collect { it.getName() }.join(' '))
+                    "Class-Path": configurations.runtimeClasspath.collect { it.getName() }.join(' '))
         }
     }