SONAR-16182 Migrate remaining modules from java 8 to java 11

diff --git a/build.gradle b/build.gradle
index 17232a43187c146a38397883d8a87db4feeb9136..dd6ba0e0bf6ac6cc9735203e9145dbe65144e117 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -130,74 +130,8 @@ subprojects {
 
   ext {
     protobufVersion = '3.19.4'
-
-    // define a method which can be called by project to change Java version to compile to
-    configureCompileJavaToVersion = { javaVersion ->
-      if ( javaVersion != 11 & javaVersion != 8) {
-        throw new InvalidUserDataException("Only Java 8 and 11 are supported")
-      }
-      if ( javaVersion == 8 ) {
-        println "Configuring project ${project.name} to compile to Java ${javaVersion}"
-
-        if (!project.hasProperty('skipJava8Checks')) {
-          task ensureDependenciesRunOnJava8(dependsOn: [configurations.compileClasspath]) {
-            ext.readJavaMajorVersion = { classFile ->
-              classFile.withDataInputStream({ d ->
-                if (d.skip(7) == 7) {
-                  // read the version of the class file
-                  d.read()
-                } else {
-                  throw new GradleException("Could not read major version from $classFile")
-                }
-              })
-            }
-
-            doLast {
-              [configurations.compileClasspath].each { config ->
-                config.resolvedConfiguration.files
-                  .findAll({ f -> f.name.endsWith("jar") })
-                  .each { jarFile ->
-                    def onlyJava8 = true
-                    zipTree(jarFile)
-                      .matching({
-                        include "**/*.class"
-                        // multi-release jar files were introduced with Java 9 => contains only classes targeting Java 9+
-                        exclude "META-INF/versions/**"
-                        // ignore module-info existing in some archives for Java 9 forward compatibility
-                        exclude "module-info.class"
-                      })
-                      .files
-                      .each { classFile ->
-                        int javaMajorVersion = readJavaMajorVersion(classFile)
-                        if (javaMajorVersion > 52) {
-                          println "$classFile has been compiled to a more recent version of Java than 8 (java8=52, java11=55, actual=$javaMajorVersion)"
-                          onlyJava8 = false
-                        }
-                      }
-                    if (!onlyJava8) {
-                      throw new GradleException("Dependency ${jarFile} in configuration ${config.name} contains class file(s) compiled to a Java version > Java 8 (see logs for details)")
-                    }
-                  }
-              }
-            }
-          }
-
-          compileJava.dependsOn ensureDependenciesRunOnJava8
-        }
-      }
-
-      sourceCompatibility = javaVersion
-      targetCompatibility = javaVersion
-
-      tasks.withType(JavaCompile) {
-        options.compilerArgs.addAll(['--release', javaVersion + ''])
-        options.encoding = 'UTF-8'
-      }
-    }
   }
 
-  configureCompileJavaToVersion 11
-
   sonarqube {
     properties {
       property 'sonar.moduleKey', project.group + ':' + project.name

diff --git a/plugins/sonar-xoo-plugin/build.gradle b/plugins/sonar-xoo-plugin/build.gradle
index f34fd75a325081d5b493208a58d73b0d9938caad..61f7e7e5e1a1e16a95ae272bfb1bc1bb7f422d4b 100644 (file)
--- a/plugins/sonar-xoo-plugin/build.gradle
+++ b/plugins/sonar-xoo-plugin/build.gradle
@@ -2,8 +2,6 @@ configurations {
   testImplementation.extendsFrom(compileOnly)
 }
 
-configureCompileJavaToVersion 8
-
 dependencies {
   compile 'com.google.guava:guava'
   compile 'commons-io:commons-io'

diff --git a/sonar-check-api/build.gradle b/sonar-check-api/build.gradle
index 910647a60f4ee245c3cb3d9b06a7257f5e9c3f40..48e230f161733b5982005195ad1ac278ec4251cd 100644 (file)
--- a/sonar-check-api/build.gradle
+++ b/sonar-check-api/build.gradle
@@ -4,9 +4,6 @@ sonarqube {
   }
 }
 
-configureCompileJavaToVersion 8
-
-
 dependencies {
   compileOnly 'com.google.code.findbugs:jsr305'
 

diff --git a/sonar-core/build.gradle b/sonar-core/build.gradle
index 153eb788ec291dcd7c9a81227bb4a70bb6f26586..024708d515b247fc1d62d5c4f910302c414f04a5 100644 (file)
--- a/sonar-core/build.gradle
+++ b/sonar-core/build.gradle
@@ -4,8 +4,6 @@ sonarqube {
   }
 }
 
-configureCompileJavaToVersion 8
-
 dependencies {
   // please keep list ordered
 

diff --git a/sonar-markdown/build.gradle b/sonar-markdown/build.gradle
index f75aae381bf46571f6b5ba01f481fc3470861df2..16e8e834cdc5976a8e1f5c9977432319f5475a81 100644 (file)
--- a/sonar-markdown/build.gradle
+++ b/sonar-markdown/build.gradle
@@ -4,8 +4,6 @@ sonarqube {
   }
 }
 
-configureCompileJavaToVersion 8
-
 dependencies {
   // please keep list ordered
 

diff --git a/sonar-plugin-api-impl/build.gradle b/sonar-plugin-api-impl/build.gradle
index 303fa2f1549b850469eb6b8a9f4c26fe810c387a..ee9930a295ddeaddd1fe0ff0cd407fd6c2aaf220 100644 (file)
--- a/sonar-plugin-api-impl/build.gradle
+++ b/sonar-plugin-api-impl/build.gradle
@@ -4,8 +4,6 @@ sonarqube {
   }
 }
 
-configureCompileJavaToVersion 8
-
 dependencies {
   // please keep the list grouped by configuration and ordered by name
 

diff --git a/sonar-plugin-api/build.gradle b/sonar-plugin-api/build.gradle
index 59b49a673d78fd2a54295f997241137272787dab..9dc4e8d4762904362fc9b9e6e5b3dd0d5872f575 100644 (file)
--- a/sonar-plugin-api/build.gradle
+++ b/sonar-plugin-api/build.gradle
@@ -4,8 +4,6 @@ sonarqube {
   }
 }
 
-configureCompileJavaToVersion 8
-
 apply plugin: 'com.github.johnrengelman.shadow'
 
 dependencies {

diff --git a/sonar-scanner-protocol/build.gradle b/sonar-scanner-protocol/build.gradle
index eec132a2f93b6fbe293070740a0f902efa59d4eb..b1e3e04f859d4e4f468e03019f998e427a167790 100644 (file)
--- a/sonar-scanner-protocol/build.gradle
+++ b/sonar-scanner-protocol/build.gradle
@@ -5,8 +5,6 @@ sonarqube {
   }
 }
 
-configureCompileJavaToVersion 8
-
 dependencies {
   // please keep the list ordered
   compile 'com.google.code.gson:gson'

diff --git a/sonar-testing-harness/build.gradle b/sonar-testing-harness/build.gradle
index d2e4c7b6ab7b4aca148fb831365b9ee3b4b246ee..1c339ba836d39e027848014232bcad4ef8c3339d 100644 (file)
--- a/sonar-testing-harness/build.gradle
+++ b/sonar-testing-harness/build.gradle
@@ -4,8 +4,6 @@ sonarqube {
   }
 }
 
-configureCompileJavaToVersion 8
-
 dependencies {
   // please keep list ordered
 

diff --git a/sonar-ws/build.gradle b/sonar-ws/build.gradle
index 021b9156c2f81a7bfa3f8bd96342703992106847..0665efae5f6c68cc14768453bfd2345e513bc7a7 100644 (file)
--- a/sonar-ws/build.gradle
+++ b/sonar-ws/build.gradle
@@ -5,8 +5,6 @@ sonarqube {
   }
 }
 
-configureCompileJavaToVersion 8
-
 configurations {
   testImplementation.extendsFrom(compileOnly)
 }