switching to gradle 7, deprecating some projects

Author: jveverka

README.md

@@ -11,8 +11,7 @@ but also new JDK 11 possibilities.
 ### Environment setup
 Make sure following software is installed on your PC.
 * [OpenJDK 11](https://adoptopenjdk.net/?variant=openjdk11&jvmVariant=hotspot)
-* [Gradle 6.5](https://gradle.org/install/) or later
-* [protoc 3.8](https://github.com/protocolbuffers/protobuf/releases/tag/v3.8.0) google protocol buffers
+* [Gradle 6.8](https://gradle.org/install/) or later
 * [docker.io 19.x](https://www.docker.com/) or later 
 
 Please check [system requirements](docs/system-requirements.md) before. 
@@ -21,17 +20,12 @@ Please check [system requirements](docs/system-requirements.md) before.
 Most examples are build by top-level gradle project.
 ```
 gradle clean build test
-gradle --build-file di-examples/build.gradle clean test
 ```
 
 ### Examples
 * [artefact publishing demo](artefact-publishing-demo) - publish artefact to ORSSH.
 * [akka clustering demo](akka-cluster-sshsessions)
-* [apache avro demo](avro-demo)
-* [dependency injection examples](di-examples)
 * [futures demo](futures-demo)
-* [grpc demo](grpc-demo)
-* [hazelcast cluster demo](hazelcast-cluster)
 * [image processing demo](imageprocessing-demo)
 * [jetty server demo](jetty-servlet4-http2)
 * [kafka example](kafka-example)

akka-cluster-sshsessions/build.gradle

@@ -1,6 +1,5 @@
 
 apply plugin: 'java'
-apply plugin: 'maven'
 apply plugin: 'application'
 
 sourceCompatibility = 11

avro-demo/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.commercehub.gradle.plugin.avro" version "0.9.1"
+    id "com.commercehub.gradle.plugin.avro" version "0.99.99"
 }
 group 'itx.avro'
 version '1.0-SNAPSHOT'

block-chain/build.gradle

@@ -1,6 +1,5 @@
 
 apply plugin: 'java'
-apply plugin: 'maven'
 apply plugin: 'maven-publish'
 
 sourceCompatibility = 11

build.gradle

@@ -10,15 +10,15 @@ project(':block-chain') {}
 project(':akka-cluster-sshsessions') {}
 project(':futures-demo') {}
 project(':grpc-demo') {}
-project(':hazelcast-cluster') {}
+//project(':hazelcast-cluster') {}
 project(':hibernate-demo') {}
 project(':jdbc-demo') {}
 project(':jetty-servlet4-http2') {}
 project(':kafka-example') {}
 project(':mongodb-demo') {}
 project(':simple-module-example') {}
 project(':ssh-server-demo') {}
-project(':avro-demo') {}
+//project(':avro-demo') {}
 project(':imageprocessing-demo') {}
 project(':rxjava-demo') {}
 project(':elastic-demo') {}

cached-model-demo/build.gradle

@@ -1,6 +1,5 @@
 
 apply plugin: 'java'
-apply plugin: 'maven'
 apply plugin: 'maven-publish'
 
 sourceCompatibility = 11

di-examples/app-dagger/build.gradle

@@ -5,14 +5,14 @@ plugins {
 }
 
 dependencies {
-    compile 'com.google.dagger:dagger:2.25.4'
+    implementation 'com.google.dagger:dagger:2.25.4'
     apt 'com.google.dagger:dagger-compiler:2.25.4'
 }
 
 test {
 
     dependencies {
-        testCompile 'org.testng:testng:7.3.0'
+        testImplementation 'org.testng:testng:7.3.0'
     }
 
     // enable TestNG support (default is JUnit)

di-examples/app-guice/build.gradle

@@ -2,7 +2,7 @@
 test {
 
     dependencies {
-        testCompile 'org.testng:testng:7.3.0'
+        testImplementation 'org.testng:testng:7.3.0'
     }
 
     // enable TestNG support (default is JUnit)

di-examples/app-spring/build.gradle

@@ -31,8 +31,8 @@ repositories {
 
 
 dependencies {
-    compile('org.springframework.boot:spring-boot-starter-web')
-    testCompile('org.springframework.boot:spring-boot-starter-test')
+    implementation('org.springframework.boot:spring-boot-starter-web')
+    testImplementation('org.springframework.boot:spring-boot-starter-test')
 }
 
 test {

di-examples/build.gradle

@@ -11,8 +11,8 @@ subprojects {
     }
 
     dependencies {
-        compile 'org.slf4j:slf4j-api:1.8.0-beta4'
-        compile 'org.slf4j:slf4j-simple:1.8.0-beta4'
+        implementation 'org.slf4j:slf4j-api:1.7.30'
+        implementation 'org.slf4j:slf4j-simple:1.7.30'
     }
 
 }
@@ -22,45 +22,45 @@ project(':data-service') {
 
 project(':di-spring') {
     dependencies {
-        compile project(':data-service')
+        implementation project(':data-service')
     }
 }
 
 project(':di-guice') {
     dependencies {
-        compile project(':data-service')
+        implementation project(':data-service')
     }
 }
 
 project(':di-dagger') {
     dependencies {
-        compile project(':data-service')
+        implementation project(':data-service')
     }
 }
 
 project(':app-simple') {
     dependencies {
-        compile project(':data-service')
+        implementation project(':data-service')
     }
 }
 
 project(':app-spring') {
     dependencies {
-        compile project(':data-service')
-        compile project(':di-spring')
+        implementation project(':data-service')
+        implementation project(':di-spring')
     }
 }
 
 project(':app-guice') {
     dependencies {
-        compile project(':data-service')
-        compile project(':di-guice')
+        implementation project(':data-service')
+        implementation project(':di-guice')
     }
 }
 
 project(':app-dagger') {
     dependencies {
-        compile project(':data-service')
-        compile project(':di-dagger')
+        implementation project(':data-service')
+        implementation project(':di-dagger')
     }
 }

di-examples/data-service/build.gradle

@@ -2,7 +2,7 @@
 test {
 
     dependencies {
-        testCompile 'org.testng:testng:7.3.0'
+        testImplementation 'org.testng:testng:7.3.0'
     }
 
     // enable TestNG support (default is JUnit)

di-examples/di-dagger/build.gradle

@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-    compile 'com.google.dagger:dagger:2.25.4'
+    implementation 'com.google.dagger:dagger:2.25.4'
     apt 'com.google.dagger:dagger-compiler:2.25.4'
 }
 

di-examples/di-guice/build.gradle

@@ -1,5 +1,5 @@
 
 
 dependencies {
-    compile 'com.google.inject:guice:4.2.2'
+    implementation 'com.google.inject:guice:4.2.2'
 }

di-examples/di-spring/build.gradle

@@ -1,5 +1,5 @@
 
 
 dependencies {
-    compile 'org.springframework:spring-context:5.2.2.RELEASE'
+    implementation 'org.springframework:spring-context:5.2.2.RELEASE'
 }

grpc-demo/build.gradle

@@ -1,6 +1,5 @@
 
 apply plugin: 'java'
-apply plugin: 'maven'
 apply plugin: 'idea'
 apply plugin: 'application'
 apply plugin: 'com.google.protobuf'
@@ -10,7 +9,7 @@ buildscript {
       mavenCentral()
    }
    dependencies {
-      classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
+      classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.15'
    }
 }
 
@@ -26,19 +25,19 @@ def grpcVersion = '1.13.2'
 mainClassName = 'itx.examples.grpc.service.Main'
 
 dependencies {
-   compile 'org.slf4j:slf4j-api:1.7.30'
-   compile 'org.slf4j:slf4j-simple:1.7.30'
-   compile 'com.beust:jcommander:1.78'
+   implementation 'org.slf4j:slf4j-api:1.7.30'
+   implementation 'org.slf4j:slf4j-simple:1.7.30'
+   implementation 'com.beust:jcommander:1.78'
 
-   compile "com.google.api.grpc:proto-google-common-protos:1.12.0"
-   compile "io.grpc:grpc-netty:${grpcVersion}"
-   compile "io.grpc:grpc-protobuf:${grpcVersion}"
-   compile "io.grpc:grpc-stub:${grpcVersion}"
+   implementation "com.google.api.grpc:proto-google-common-protos:1.12.0"
+   implementation "io.grpc:grpc-netty:${grpcVersion}"
+   implementation "io.grpc:grpc-protobuf:${grpcVersion}"
+   implementation "io.grpc:grpc-stub:${grpcVersion}"
 
-   compile 'javax.annotation:javax.annotation-api:1.3.2'
+   implementation 'javax.annotation:javax.annotation-api:1.3.2'
 
-   testCompile "io.grpc:grpc-testing:${grpcVersion}"
-   testCompile 'org.testng:testng:7.3.0'
+   testImplementation "io.grpc:grpc-testing:${grpcVersion}"
+   testImplementation 'org.testng:testng:7.3.0'
 }
 
 protobuf {

hazelcast-cluster/build.gradle

@@ -10,24 +10,24 @@ subprojects {
     }
 
     dependencies {
-        compile 'org.slf4j:slf4j-api:1.7.30'
-        compile 'org.slf4j:slf4j-simple:1.7.30'
+        implementation 'org.slf4j:slf4j-api:1.7.30'
+        implementation 'org.slf4j:slf4j-simple:1.7.30'
     }
 }
 
-project(':common') {
+project(':hz-common') {
 }
 
 project(':server-node') {
     dependencies {
-        compile project(':common')
+        implementation project(':hz-common')
     }
 }
 
 project(':it-tests') {
     dependencies {
-        compile project(':common')
-        compile project(':server-node')
+        implementation project(':hz-common')
+        implementation project(':server-node')
     }
 }
 

hazelcast-cluster/common/build.gradle renamed to hazelcast-cluster/hz-common/build.gradle

@@ -1,6 +1,5 @@
 
 apply plugin: 'java'
-apply plugin: 'maven'
 apply plugin: 'idea'
 apply plugin: 'application'
 apply plugin: 'com.google.protobuf'
@@ -10,7 +9,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.10'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.15'
     }
 }
 
@@ -22,28 +21,28 @@ repositories {
 sourceCompatibility = 11
 targetCompatibility = 11
 
-def grpcVersion = '1.14.0'
+def grpcVersion = '1.37.0'
 mainClassName = 'itx.examples.grpc.service.Main'
 
 dependencies {
-    compile 'org.slf4j:slf4j-api:1.7.30'
-    compile 'org.slf4j:slf4j-simple:1.7.30'
-    compile 'com.beust:jcommander:1.78'
+    implementation 'org.slf4j:slf4j-api:1.7.30'
+    implementation 'org.slf4j:slf4j-simple:1.7.30'
+    implementation 'com.beust:jcommander:1.78'
 
-    compile "com.google.api.grpc:proto-google-common-protos:1.12.0"
-    compile "io.grpc:grpc-netty:${grpcVersion}"
-    compile "io.grpc:grpc-protobuf:${grpcVersion}"
-    compile "io.grpc:grpc-stub:${grpcVersion}"
+    implementation "com.google.api.grpc:proto-google-common-protos:2.1.0"
+    implementation "io.grpc:grpc-netty:${grpcVersion}"
+    implementation "io.grpc:grpc-protobuf:${grpcVersion}"
+    implementation "io.grpc:grpc-stub:${grpcVersion}"
 
-    compile 'javax.annotation:javax.annotation-api:1.3.2'
+    implementation 'javax.annotation:javax.annotation-api:1.3.2'
 
-    testCompile "io.grpc:grpc-testing:${grpcVersion}"
-    testCompile 'org.testng:testng:7.3.0'
+    testImplementation "io.grpc:grpc-testing:${grpcVersion}"
+    testImplementation 'org.testng:testng:7.3.0'
 }
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.6.1'
+        artifact = 'com.google.protobuf:protoc:3.15.8'
     }
     plugins {
         grpc {

hazelcast-cluster/common/src/main/proto/messages.proto renamed to hazelcast-cluster/hz-common/src/main/proto/messages.proto

@@ -22,11 +22,11 @@ sourceCompatibility = 11
 targetCompatibility = 11
 
 dependencies {
-   compile 'org.slf4j:slf4j-api:1.7.30'
-   compile 'org.slf4j:slf4j-simple:1.7.30'
+   implementation 'org.slf4j:slf4j-api:1.7.30'
+   implementation 'org.slf4j:slf4j-simple:1.7.30'
 
-   compile 'org.eclipse.jetty.websocket:websocket-client:9.4.20.v20190813'
+   implementation 'org.eclipse.jetty.websocket:websocket-client:9.4.20.v20190813'
 
-   testCompile 'org.testng:testng:7.3.0'
+   testImplementation 'org.testng:testng:7.3.0'
 }