diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dc38798c8..c07aefa5c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,9 +23,12 @@ jobs: # 10.x - SONAR_SERVER_VERSION: 10.7.0.96327 SONAR_SERVER_JAVA_VERSION: 17 - # 25.x - - SONAR_SERVER_VERSION: 25.10.0.114319 + # 25.x + - SONAR_SERVER_VERSION: 25.12.0.117093 SONAR_SERVER_JAVA_VERSION: 17 + # 26.x + - SONAR_SERVER_VERSION: 26.1.0.118079 + SONAR_SERVER_JAVA_VERSION: 21 # https://mvnrepository.com/artifact/org.sonarsource.sonarqube/sonar-core steps: - uses: actions/checkout@v6 diff --git a/src/test/resources/projects/findbugs/pom.xml b/src/test/resources/projects/findbugs/pom.xml index cc047058c..2f746a9c7 100644 --- a/src/test/resources/projects/findbugs/pom.xml +++ b/src/test/resources/projects/findbugs/pom.xml @@ -13,8 +13,8 @@ maven-compiler-plugin 3.8.1 - 7 - 7 + 8 + 8 diff --git a/src/test/resources/projects/jspc-jetty/pom.xml b/src/test/resources/projects/jspc-jetty/pom.xml index f22d8d426..36ec79587 100644 --- a/src/test/resources/projects/jspc-jetty/pom.xml +++ b/src/test/resources/projects/jspc-jetty/pom.xml @@ -18,8 +18,8 @@ maven-compiler-plugin 3.8.1 - 7 - 7 + 8 + 8 @@ -79,4 +79,4 @@ 1.2 - + diff --git a/src/test/resources/projects/jspc-sling/pom.xml b/src/test/resources/projects/jspc-sling/pom.xml index 29498691a..dbfb13789 100644 --- a/src/test/resources/projects/jspc-sling/pom.xml +++ b/src/test/resources/projects/jspc-sling/pom.xml @@ -18,8 +18,8 @@ maven-compiler-plugin 3.8.1 - 7 - 7 + 8 + 8 @@ -65,4 +65,4 @@ provided - + diff --git a/src/test/resources/projects/multi-module/build.gradle b/src/test/resources/projects/multi-module/build.gradle index e84b321cf..4f242e4c0 100644 --- a/src/test/resources/projects/multi-module/build.gradle +++ b/src/test/resources/projects/multi-module/build.gradle @@ -1,6 +1,6 @@ plugins { id "java-library" - id "org.sonarqube" version "3.3" + id "org.sonarqube" version "4.0.0.2929" } allprojects { @@ -32,4 +32,4 @@ allprojects { repositories { mavenCentral() } -} +} diff --git a/src/test/resources/projects/multi-module/gradle/wrapper/gradle-wrapper.properties b/src/test/resources/projects/multi-module/gradle/wrapper/gradle-wrapper.properties index ffed3a254..a59520664 100644 --- a/src/test/resources/projects/multi-module/gradle/wrapper/gradle-wrapper.properties +++ b/src/test/resources/projects/multi-module/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/test/resources/projects/multi-module/multi-module-app/build.gradle b/src/test/resources/projects/multi-module/multi-module-app/build.gradle index b69502fcf..9fcdb3f84 100644 --- a/src/test/resources/projects/multi-module/multi-module-app/build.gradle +++ b/src/test/resources/projects/multi-module/multi-module-app/build.gradle @@ -1,4 +1,9 @@ dependencies { implementation project(':multi-module-core') implementation project(':multi-module-fx') -} +} + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} diff --git a/src/test/resources/projects/multi-module/multi-module-app/pom.xml b/src/test/resources/projects/multi-module/multi-module-app/pom.xml index 0d020afd0..c796f402e 100644 --- a/src/test/resources/projects/multi-module/multi-module-app/pom.xml +++ b/src/test/resources/projects/multi-module/multi-module-app/pom.xml @@ -19,8 +19,8 @@ maven-compiler-plugin 3.8.1 - 7 - 7 + 8 + 8 @@ -38,4 +38,4 @@ 0.0.1-SNAPSHOT - + diff --git a/src/test/resources/projects/multi-module/multi-module-clojure/build.gradle b/src/test/resources/projects/multi-module/multi-module-clojure/build.gradle index b38d0ef8a..71b85c741 100644 --- a/src/test/resources/projects/multi-module/multi-module-clojure/build.gradle +++ b/src/test/resources/projects/multi-module/multi-module-clojure/build.gradle @@ -4,4 +4,9 @@ plugins { dependencies { implementation 'com.google.code.findbugs:jsr305:3.0.2' -} +} + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} diff --git a/src/test/resources/projects/multi-module/multi-module-core/build.gradle b/src/test/resources/projects/multi-module/multi-module-core/build.gradle index 2101f01e6..4722120de 100644 --- a/src/test/resources/projects/multi-module/multi-module-core/build.gradle +++ b/src/test/resources/projects/multi-module/multi-module-core/build.gradle @@ -5,6 +5,11 @@ dependencies { testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2' } +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + test { useJUnitPlatform() -} +} diff --git a/src/test/resources/projects/multi-module/multi-module-core/pom.xml b/src/test/resources/projects/multi-module/multi-module-core/pom.xml index 932529b51..996b75c51 100644 --- a/src/test/resources/projects/multi-module/multi-module-core/pom.xml +++ b/src/test/resources/projects/multi-module/multi-module-core/pom.xml @@ -19,8 +19,8 @@ maven-compiler-plugin 3.8.1 - 7 - 7 + 8 + 8 @@ -40,4 +40,4 @@ test - + diff --git a/src/test/resources/projects/multi-module/multi-module-fx/build.gradle b/src/test/resources/projects/multi-module/multi-module-fx/build.gradle index f2f9f95db..89cec0631 100644 --- a/src/test/resources/projects/multi-module/multi-module-fx/build.gradle +++ b/src/test/resources/projects/multi-module/multi-module-fx/build.gradle @@ -1,3 +1,8 @@ dependencies { implementation project(':multi-module-core') -} +} + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} diff --git a/src/test/resources/projects/multi-module/multi-module-fx/pom.xml b/src/test/resources/projects/multi-module/multi-module-fx/pom.xml index d2469efb8..0c8cbed6d 100644 --- a/src/test/resources/projects/multi-module/multi-module-fx/pom.xml +++ b/src/test/resources/projects/multi-module/multi-module-fx/pom.xml @@ -19,8 +19,8 @@ maven-compiler-plugin 3.8.1 - 7 - 7 + 8 + 8 @@ -40,4 +40,4 @@ 4.13.1 - + diff --git a/src/test/resources/projects/multi-module/multi-module-groovy/build.gradle b/src/test/resources/projects/multi-module/multi-module-groovy/build.gradle index e975f215a..c0ed6bd47 100644 --- a/src/test/resources/projects/multi-module/multi-module-groovy/build.gradle +++ b/src/test/resources/projects/multi-module/multi-module-groovy/build.gradle @@ -5,4 +5,9 @@ plugins { dependencies { implementation 'org.codehaus.groovy:groovy-all:2.4.15' implementation project(':multi-module-core') -} +} + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} diff --git a/src/test/resources/projects/multi-module/multi-module-jsp-uncompiled/build.gradle b/src/test/resources/projects/multi-module/multi-module-jsp-uncompiled/build.gradle index 9d35a0630..723631a23 100644 --- a/src/test/resources/projects/multi-module/multi-module-jsp-uncompiled/build.gradle +++ b/src/test/resources/projects/multi-module/multi-module-jsp-uncompiled/build.gradle @@ -6,6 +6,11 @@ dependencies { implementation project(':multi-module-core') } +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + sonarqube { properties { property 'sonar.sources', 'src/main/webapp' diff --git a/src/test/resources/projects/multi-module/multi-module-jsp-uncompiled/pom.xml b/src/test/resources/projects/multi-module/multi-module-jsp-uncompiled/pom.xml index 5b1837401..2388512cc 100644 --- a/src/test/resources/projects/multi-module/multi-module-jsp-uncompiled/pom.xml +++ b/src/test/resources/projects/multi-module/multi-module-jsp-uncompiled/pom.xml @@ -20,8 +20,8 @@ maven-compiler-plugin 3.8.1 - 7 - 7 + 8 + 8 diff --git a/src/test/resources/projects/multi-module/multi-module-kotlin/build.gradle b/src/test/resources/projects/multi-module/multi-module-kotlin/build.gradle index b38d0ef8a..42517bc92 100644 --- a/src/test/resources/projects/multi-module/multi-module-kotlin/build.gradle +++ b/src/test/resources/projects/multi-module/multi-module-kotlin/build.gradle @@ -4,4 +4,13 @@ plugins { dependencies { implementation 'com.google.code.findbugs:jsr305:3.0.2' -} +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 +} + +tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { + kotlinOptions.jvmTarget = "11" +} diff --git a/src/test/resources/projects/multi-module/multi-module-scala/build.gradle b/src/test/resources/projects/multi-module/multi-module-scala/build.gradle index 2321da278..d483c44f7 100644 --- a/src/test/resources/projects/multi-module/multi-module-scala/build.gradle +++ b/src/test/resources/projects/multi-module/multi-module-scala/build.gradle @@ -3,6 +3,6 @@ plugins { } dependencies { - implementation 'org.scala-lang:scala3-library_3:3.0.1' + implementation 'org.scala-lang:scala3-library_3:3.4.0' implementation project(':multi-module-core') -} +} diff --git a/src/test/resources/projects/multi-module/multi-module-scala/pom.xml b/src/test/resources/projects/multi-module/multi-module-scala/pom.xml index 23b9b75de..d894014d3 100644 --- a/src/test/resources/projects/multi-module/multi-module-scala/pom.xml +++ b/src/test/resources/projects/multi-module/multi-module-scala/pom.xml @@ -49,7 +49,7 @@ org.scala-lang scala3-library_3 - 3.1.2 + 3.4.0 - + diff --git a/src/test/resources/projects/multiple-directories-with-classes/dir1/pom.xml b/src/test/resources/projects/multiple-directories-with-classes/dir1/pom.xml index b50c756fd..b1dc44df0 100644 --- a/src/test/resources/projects/multiple-directories-with-classes/dir1/pom.xml +++ b/src/test/resources/projects/multiple-directories-with-classes/dir1/pom.xml @@ -14,8 +14,8 @@ maven-compiler-plugin 3.8.1 - 7 - 7 + 8 + 8 diff --git a/src/test/resources/projects/multiple-directories-with-classes/dir2/pom.xml b/src/test/resources/projects/multiple-directories-with-classes/dir2/pom.xml index faa2cfa17..c01d88301 100644 --- a/src/test/resources/projects/multiple-directories-with-classes/dir2/pom.xml +++ b/src/test/resources/projects/multiple-directories-with-classes/dir2/pom.xml @@ -14,8 +14,8 @@ maven-compiler-plugin 3.8.1 - 7 - 7 + 8 + 8 diff --git a/src/test/resources/projects/scala/pom.xml b/src/test/resources/projects/scala/pom.xml index 912c5a0fb..f051a4747 100644 --- a/src/test/resources/projects/scala/pom.xml +++ b/src/test/resources/projects/scala/pom.xml @@ -6,7 +6,7 @@ UTF-8 - 2.13.10 + 2.13.18 @@ -34,4 +34,4 @@ - + diff --git a/src/test/resources/projects/simple/pom.xml b/src/test/resources/projects/simple/pom.xml index a19a5437c..3b876d79d 100644 --- a/src/test/resources/projects/simple/pom.xml +++ b/src/test/resources/projects/simple/pom.xml @@ -14,8 +14,8 @@ maven-compiler-plugin 3.8.1 - 7 - 7 + 8 + 8