Merge pull request #3 from UweTrottmann/gradle-6

UweTrottmann · web-flow · commit 851f1ea7383b · 2023-08-24T16:38:26.000+02:00
Update to Gradle 6
diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
@@ -0,0 +1,28 @@
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
+
+name: Java CI
+
+on: [push]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up JDK 11
+        uses: actions/setup-java@v3
+        with:
+          java-version: '11' # Gradle 6 does not support 17
+          distribution: 'temurin'
+
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # v1.1.0
+
+      - name: Set up Gradle
+        uses: gradle/gradle-build-action@243af859f8ca30903d9d7f7936897ca0358ba691 # v2.7.1
+
+      - name: Execute Gradle build
+        run: ./gradlew build -x :endpoints-management-control-appengine-all:build -x :endpoints-management-control-all:build
diff --git a/.travis.yml b/.travis.yml
diff --git a/build.gradle b/build.gradle
@@ -51,12 +51,6 @@ allprojects {
       }
     }
   }
-
-  jar {
-    manifest {
-      attributes("Implementation-Version": version)
-    }
-  }
 }
 
 subprojects {
diff --git a/endpoints-auth/build.gradle b/endpoints-auth/build.gradle
@@ -27,29 +27,29 @@ configurations {
 }
 
 dependencies {
-  compile project(":endpoints-service-config")
-  compile(project(":endpoints-control")) {
+  implementation project(":endpoints-service-config")
+  implementation(project(":endpoints-control")) {
     transitive = false
   }
 
-  compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
-  compile "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
-  compile "com.google.guava:guava:${guavaVersion}"
-  compile "com.google.flogger:flogger:${floggerVersion}"
-  runtime "com.google.flogger:flogger-system-backend:${floggerVersion}"
-  compile "com.google.http-client:google-http-client:${httpClientVersion}"
-  compile "javax.servlet:servlet-api:${servletApiVersion}"
-  compile "org.bitbucket.b_c:jose4j:${jose4jVersion}"
+  implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
+  implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonVersion}"
+  implementation "com.google.guava:guava:${guavaVersion}"
+  implementation "com.google.flogger:flogger:${floggerVersion}"
+  runtimeOnly "com.google.flogger:flogger-system-backend:${floggerVersion}"
+  implementation "com.google.http-client:google-http-client:${httpClientVersion}"
+  implementation "javax.servlet:servlet-api:${servletApiVersion}"
+  implementation "org.bitbucket.b_c:jose4j:${jose4jVersion}"
 
-  testCompile "junit:junit:${junitVersion}"
-  testCompile "org.bouncycastle:bcmail-jdk15on:${bouncycastleVersion}"
-  testCompile "org.mockito:mockito-core:${mockitoVersion}"
+  testImplementation "junit:junit:${junitVersion}"
+  testImplementation "org.bouncycastle:bcmail-jdk15on:${bouncycastleVersion}"
+  testImplementation "org.mockito:mockito-core:${mockitoVersion}"
 
-  testCompile "org.apache.commons:commons-lang3:${commonsLang3Version}"
-  testCompile "org.eclipse.jetty:jetty-server:${jettyVersion}"
-  testCompile "org.eclipse.jetty:jetty-servlet:${jettyVersion}"
-  testCompile "org.glassfish.jersey.core:jersey-server:${jerseyVersion}"
-  testCompile "org.glassfish.jersey.containers:jersey-container-servlet-core:${jerseyVersion}"
+  testImplementation "org.apache.commons:commons-lang3:${commonsLang3Version}"
+  testImplementation "org.eclipse.jetty:jetty-server:${jettyVersion}"
+  testImplementation "org.eclipse.jetty:jetty-servlet:${jettyVersion}"
+  testImplementation "org.glassfish.jersey.core:jersey-server:${jerseyVersion}"
+  testImplementation "org.glassfish.jersey.containers:jersey-container-servlet-core:${jerseyVersion}"
 }
 
 sourceSets {
diff --git a/endpoints-control-api-client/build.gradle b/endpoints-control-api-client/build.gradle
@@ -29,13 +29,13 @@ configureMaven(
 )
 
 dependencies {
-  compile("com.google.api-client:google-api-client-protobuf:${googleApiClientProtobufVersion}") {
+  implementation("com.google.api-client:google-api-client-protobuf:${googleApiClientProtobufVersion}") {
     exclude group: 'com.google.guava', module: 'guava-jdk5'
   }
-  compile module(group: 'com.google.api-client', name: 'google-api-client', version: '1.22.0') {
+  implementation module(group: 'com.google.api-client', name: 'google-api-client', version: '1.22.0') {
     dependency('com.google.http-client:google-http-client:1.22.0')
     dependency('com.google.oauth-client:google-oauth-client:1.22.0')
     exclude group: 'com.google.guava', module: 'guava-jdk5'
   }
-  compile project(":endpoints-management-protos")
+  implementation project(":endpoints-management-protos")
 }
diff --git a/endpoints-control-appengine/build.gradle b/endpoints-control-appengine/build.gradle
@@ -22,17 +22,17 @@ configureMaven(
 archivesBaseName = 'endpoints-management-control-appengine'
 
 dependencies {
-  compile "com.google.appengine:appengine-api-1.0-sdk:$appengineSdkVersion"
-  compile "com.google.code.findbugs:jsr305:${jsr305Version}"
-  compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
-  compile "com.google.guava:guava:${guavaVersion}"
-  compile("com.google.http-client:google-http-client-jackson2:${httpClientVersion}") {
+  implementation "com.google.appengine:appengine-api-1.0-sdk:$appengineSdkVersion"
+  implementation "com.google.code.findbugs:jsr305:${jsr305Version}"
+  implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
+  implementation "com.google.guava:guava:${guavaVersion}"
+  implementation("com.google.http-client:google-http-client-jackson2:${httpClientVersion}") {
     exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
     exclude group: 'com.google.guava', module: 'guava-jdk5'
   }
-  compile(group: 'com.google.api-client', name: 'google-api-client-appengine', version: "${googleApiClientAppEngineVersion}") {
+  implementation(group: 'com.google.api-client', name: 'google-api-client-appengine', version: "${googleApiClientAppEngineVersion}") {
     exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
     exclude group: 'com.google.guava', module: 'guava-jdk5'
   }
-  compile project(":endpoints-control")
+  implementation project(":endpoints-control")
 }
diff --git a/endpoints-control/build.gradle b/endpoints-control/build.gradle
@@ -48,28 +48,28 @@ processResources {
 }
 
 dependencies {
-  compile "com.google.auto.value:auto-value-annotations:${autoValueVersion}"
+  implementation "com.google.auto.value:auto-value-annotations:${autoValueVersion}"
   annotationProcessor "com.google.auto.value:auto-value:${autoValueVersion}"
-  compile "com.google.code.findbugs:jsr305:${jsr305Version}"
-  compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
-  compile "com.google.flogger:flogger:${floggerVersion}"
-  runtime "com.google.flogger:flogger-system-backend:${floggerVersion}"
-  compile "com.google.guava:guava:${guavaVersion}"
-  compile("com.google.http-client:google-http-client-jackson2:${httpClientVersion}") {
+  implementation "com.google.code.findbugs:jsr305:${jsr305Version}"
+  implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
+  implementation "com.google.flogger:flogger:${floggerVersion}"
+  runtimeOnly "com.google.flogger:flogger-system-backend:${floggerVersion}"
+  implementation "com.google.guava:guava:${guavaVersion}"
+  implementation("com.google.http-client:google-http-client-jackson2:${httpClientVersion}") {
     exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
     exclude group: 'com.google.guava', module: 'guava-jdk5'
   }
-  compile "javax.servlet:servlet-api:${servletApiVersion}"
-  compile "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
-  compile(group: 'com.google.api-client', name: 'google-api-client-appengine', version: "${googleApiClientAppEngineVersion}") {
+  implementation "javax.servlet:servlet-api:${servletApiVersion}"
+  implementation "com.fasterxml.jackson.core:jackson-core:${jacksonVersion}"
+  implementation(group: 'com.google.api-client', name: 'google-api-client-appengine', version: "${googleApiClientAppEngineVersion}") {
     exclude group: 'com.fasterxml.jackson.core', module: 'jackson-core'
     exclude group: 'com.google.guava', module: 'guava-jdk5'
   }
-  compile project(":endpoints-control-api-client")
-  compile project(":endpoints-service-config")
-  compile project(":endpoints-management-protos")
+  implementation project(":endpoints-control-api-client")
+  implementation project(":endpoints-service-config")
+  implementation project(":endpoints-management-protos")
 
-  testCompile "junit:junit:${junitVersion}"
-  testCompile "com.google.truth:truth:${truthVersion}"
-  testCompile "org.mockito:mockito-core:${mockitoVersion}"
+  testImplementation "junit:junit:${junitVersion}"
+  testImplementation "com.google.truth:truth:${truthVersion}"
+  testImplementation "org.mockito:mockito-core:${mockitoVersion}"
 }
diff --git a/endpoints-framework-auth/build.gradle b/endpoints-framework-auth/build.gradle
@@ -23,12 +23,12 @@ archivesBaseName = "endpoints-framework-auth"
 
 dependencies {
   compileOnly group: "com.google.endpoints", name: "endpoints-framework", version: "${endpointsFrameworkVersion}"
-  compile project(":endpoints-auth")
+  implementation project(":endpoints-auth")
 
-  testCompile group: "junit", name: "junit", version: "${junitVersion}"
-  testCompile group: "org.mockito", name: "mockito-core", version: "${mockitoVersion}"
-  testCompile group: "org.springframework", name: "spring-test", version: "${springTestVersion}"
-  testCompile group: "com.google.endpoints", name: "endpoints-framework", version: "${endpointsFrameworkVersion}"
-  compile "com.google.flogger:flogger:${floggerVersion}"
-  runtime "com.google.flogger:flogger-system-backend:${floggerVersion}"
+  testImplementation group: "junit", name: "junit", version: "${junitVersion}"
+  testImplementation group: "org.mockito", name: "mockito-core", version: "${mockitoVersion}"
+  testImplementation group: "org.springframework", name: "spring-test", version: "${springTestVersion}"
+  testImplementation group: "com.google.endpoints", name: "endpoints-framework", version: "${endpointsFrameworkVersion}"
+  implementation "com.google.flogger:flogger:${floggerVersion}"
+  runtimeOnly "com.google.flogger:flogger-system-backend:${floggerVersion}"
 }
diff --git a/endpoints-management-protos/build.gradle b/endpoints-management-protos/build.gradle
@@ -21,10 +21,10 @@ repositories {
 }
 
 dependencies {
-  compile platform(libraries.protobufJavaBom),
+  implementation platform(libraries.protobufJavaBom),
           libraries.protobufJava
 
-  compile platform(libraries.grpcBom),
+  implementation platform(libraries.grpcBom),
           libraries.grpcStub,
           libraries.grpcProtobuf
 }
diff --git a/endpoints-service-config/build.gradle b/endpoints-service-config/build.gradle
@@ -22,16 +22,16 @@ configureMaven(
 archivesBaseName = 'endpoints-management-config'
 
 dependencies {
-  compile(project(":endpoints-management-protos"))
-  compile platform(libraries.protobufJavaBom)
-  compile "com.google.protobuf:protobuf-java"
-  compile "com.google.apis:google-api-services-servicemanagement:$servicemanagementVersion"
+  implementation(project(":endpoints-management-protos"))
+  implementation platform(libraries.protobufJavaBom)
+  implementation "com.google.protobuf:protobuf-java"
+  implementation "com.google.apis:google-api-services-servicemanagement:$servicemanagementVersion"
   compileOnly "com.google.appengine:appengine-api-1.0-sdk:$appengineSdkVersion"
-  compile "com.google.guava:guava:$guavaVersion"
-  compile "com.google.http-client:google-http-client:$httpClientVersion"
-  compile "com.google.protobuf:protobuf-java-util"
+  implementation "com.google.guava:guava:$guavaVersion"
+  implementation "com.google.http-client:google-http-client:$httpClientVersion"
+  implementation "com.google.protobuf:protobuf-java-util"
 
-  testCompile "org.mockito:mockito-core:$mockitoVersion"
-  testCompile "junit:junit:$junitVersion"
-  testCompile "com.google.truth:truth:$truthVersion"
+  testImplementation "org.mockito:mockito-core:$mockitoVersion"
+  testImplementation "junit:junit:$junitVersion"
+  testImplementation "com.google.truth:truth:$truthVersion"
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Wed Sep 04 19:51:56 MDT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-bin.zip
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat

Original file line number	Diff line number	Diff line change
`@@ -51,12 +51,6 @@ allprojects {`
`51`	`51`	`}`
`52`	`52`	`}`
`53`	`53`	`}`
`54`		`-`
`55`		`- jar {`
`56`		`- manifest {`
`57`		`- attributes("Implementation-Version": version)`
`58`		`- }`
`59`		`- }`
`60`	`54`	`}`
`61`	`55`
`62`	`56`	`subprojects {`
Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,13 @@ configureMaven(`
`29`	`29`	`)`
`30`	`30`
`31`	`31`	`dependencies {`
`32`		`- compile("com.google.api-client:google-api-client-protobuf:${googleApiClientProtobufVersion}") {`
	`32`	`+ implementation("com.google.api-client:google-api-client-protobuf:${googleApiClientProtobufVersion}") {`
`33`	`33`	`exclude group: 'com.google.guava', module: 'guava-jdk5'`
`34`	`34`	`}`
`35`		`- compile module(group: 'com.google.api-client', name: 'google-api-client', version: '1.22.0') {`
	`35`	`+ implementation module(group: 'com.google.api-client', name: 'google-api-client', version: '1.22.0') {`
`36`	`36`	`dependency('com.google.http-client:google-http-client:1.22.0')`
`37`	`37`	`dependency('com.google.oauth-client:google-oauth-client:1.22.0')`
`38`	`38`	`exclude group: 'com.google.guava', module: 'guava-jdk5'`
`39`	`39`	`}`
`40`		`- compile project(":endpoints-management-protos")`
	`40`	`+ implementation project(":endpoints-management-protos")`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,10 @@ repositories {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`dependencies {`
`24`		`- compile platform(libraries.protobufJavaBom),`
	`24`	`+ implementation platform(libraries.protobufJavaBom),`
`25`	`25`	`libraries.protobufJava`
`26`	`26`
`27`		`- compile platform(libraries.grpcBom),`
	`27`	`+ implementation platform(libraries.grpcBom),`
`28`	`28`	`libraries.grpcStub,`
`29`	`29`	`libraries.grpcProtobuf`
`30`	`30`	`}`