build: initialized JDK 21 build

siouan · Jun 14, 2024 · d2eb93a · d2eb93a
1 parent 13ec65a
commit d2eb93a
Show file tree

Hide file tree

Showing 60 changed files with 164 additions and 141 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -23,10 +23,10 @@ Actual results: ...
 
 **Environment**
 
-- OS: [e.g. Ubuntu 22.04.1, Windows 11 Pro, Mac OS X]
-- JDK: [e.g. Adoptium Temurin JDK 17 64 bits]
-- Gradle: [e.g. Gradle 8.2.1]
-- Frontend Gradle plugin: [e.g. 8.1.0 JDK 17]
+- OS: [e.g. Ubuntu 22.04.4, Windows 11 Pro, Mac OS X]
+- JDK: [e.g. Adoptium Temurin JDK 21 64 bits]
+- Gradle: [e.g. Gradle 8.8]
+- Frontend Gradle plugin: [e.g. 8.1.0 JDK 21]
 
 Settings in `build.gradle[.kts]` file:
 ```groovy

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -20,10 +20,11 @@ Hi,
 Explain what you would like the plugin do: ...
 
 **Target environment**
-
-- OS: [e.g. Ubuntu 18.04.1, Windows 10 Pro, Mac OS X]
-- JDK: [e.g. Oracle JDK 11 64 bits]
-- Gradle: [e.g. Gradle 6.3]
+
+- OS: [e.g. Ubuntu 22.04.4, Windows 11 Pro, Mac OS X]
+- JDK: [e.g. Adoptium Temurin JDK 21 64 bits]
+- Gradle: [e.g. Gradle 8.8]
+- Frontend Gradle plugin: [e.g. 8.1.0 JDK 21]
 
 Settings in `build.gradle[.kts]` file:
 ```groovy

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -42,11 +42,11 @@ jobs:
         with:
           fetch-depth: 1
 
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: temurin
-          java-version: '17'
+          java-version: '21'
           architecture: x64
 
       - name: Cache Gradle's cache and wrapper
@@ -89,4 +89,4 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: ./gradlew :plugin:sonar --console=plain -Dorg.gradle.jvmargs=-Xmx512m
+        run: ./gradlew :plugin:sonar --console=plain -Dorg.gradle.jvmargs=-Xmx512m -Dsonar.verbose=true
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -110,15 +110,15 @@ gradlew pluginUnderTestMetadata
 ## Continuous integration
 
 The project relies on [GitHub Actions][github-actions] to integrate continuously every changes (pull requests) in the
-repository. The configuration actually allows to build and test the plugin with Adoptium Temurin JDK 17 64 bits, on the
+repository. The configuration actually allows to build and test the plugin with Adoptium Temurin JDK 21 64 bits, on the
 environments below:
 
 - Linux Ubuntu 22.04.4
 - Mac OS 14.5
 - Windows Server 2022
 
 Ubuntu is the reference O/S, used to analyze the source code with SonarCloud. Developments are frequently done on a
-Windows 10 Professionnal workstation with Adoptium Temurin JDK 17 64 bits and [IntelliJ IDEA][intellij-idea].
+Windows 10 Professionnal workstation with Adoptium Temurin JDK 21 64 bits and [IntelliJ IDEA][intellij-idea].
 
 [apache-commons-compress]: <https://commons.apache.org/proper/commons-compress/> (Apache Commons Compress)
 [apache-http-components]: <https://hc.apache.org/> (Apache HttpComponents)

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
     <a href="https://github.com/siouan/frontend-gradle-plugin/releases/tag/v8.1.0"><img src="https://img.shields.io/badge/Latest%20release-8.1.0-blue.svg" alt="Latest release 8.1.0"/></a>
     <a href="https://opensource.org/licenses/Apache-2.0"><img src="https://img.shields.io/badge/License-Apache%202.0-green.svg" alt="License Apache 2.0"/></a>
     <br/>
-    <a href="https://github.com/siouan/frontend-gradle-plugin/actions/workflows/build.yml"><img src="https://github.com/siouan/frontend-gradle-plugin/actions/workflows/build.yml/badge.svg?branch=8.1-jdk17" alt="Build status"/></a>
+    <a href="https://github.com/siouan/frontend-gradle-plugin/actions/workflows/build.yml"><img src="https://github.com/siouan/frontend-gradle-plugin/actions/workflows/build.yml/badge.svg?branch=8.1-jdk21" alt="Build status"/></a>
     <a href="https://sonarcloud.io/project/overview?id=siouan_frontend-gradle-plugin"><img src="https://sonarcloud.io/api/project_badges/measure?project=siouan_frontend-gradle-plugin&metric=alert_status" alt="Quality gate status"/></a>
     <a href="https://sonarcloud.io/summary/overall?id=siouan_frontend-gradle-plugin"><img src="https://sonarcloud.io/api/project_badges/measure?project=siouan_frontend-gradle-plugin&metric=coverage" alt="Code coverage"/></a>
     <a href="https://sonarcloud.io/summary/overall?id=siouan_frontend-gradle-plugin"><img src="https://sonarcloud.io/api/project_badges/measure?project=siouan_frontend-gradle-plugin&metric=reliability_rating" alt="Reliability"/></a>

diff --git a/examples/application-with-preinstalled-nodejs-distribution/build.gradle.kts b/examples/application-with-preinstalled-nodejs-distribution/build.gradle.kts
@@ -2,7 +2,7 @@ import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNode
 import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpm
 
 plugins {
-    id("org.siouan.frontend-jdk17")
+    id("org.siouan.frontend-jdk21")
 }
 
 //val preinstalledNodeDistributionDirectory = file(<path-to-nodejs-install-directory>);

diff --git a/examples/application-with-preinstalled-nodejs-distribution/settings.gradle.kts b/examples/application-with-preinstalled-nodejs-distribution/settings.gradle.kts
@@ -1,5 +1,5 @@
 pluginManagement {
     plugins {
-        id("org.siouan.frontend-jdk17") version "8.1.0"
+        id("org.siouan.frontend-jdk21") version "8.1.0"
     }
 }
diff --git a/examples/fullstack-war-application/frontend/build.gradle.kts b/examples/fullstack-war-application/frontend/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("org.siouan.frontend-jdk17")
+    id("org.siouan.frontend-jdk21")
 }
 
 frontend {

diff --git a/examples/fullstack-war-application/settings.gradle.kts b/examples/fullstack-war-application/settings.gradle.kts
@@ -4,7 +4,7 @@ pluginManagement {
         id("war")
         id("org.springframework.boot") version "2.7.12"
         id("io.spring.dependency-management") version "1.1.0"
-        id("org.siouan.frontend-jdk17") version "8.1.0"
+        id("org.siouan.frontend-jdk21") version "8.1.0"
     }
 }
 

diff --git a/...ultiple-package-managers-with-shared-nodejs-distribution/node-subproject/build.gradle.kts b/...ultiple-package-managers-with-shared-nodejs-distribution/node-subproject/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNode
 
 plugins {
-    id("org.siouan.frontend-jdk17")
+    id("org.siouan.frontend-jdk21")
 }
 
 frontend {

diff --git a/...ltiple-package-managers-with-shared-nodejs-distribution/npm-6-subproject/build.gradle.kts b/...ltiple-package-managers-with-shared-nodejs-distribution/npm-6-subproject/build.gradle.kts
@@ -2,7 +2,7 @@ import org.siouan.frontendgradleplugin.infrastructure.gradle.ResolvePackageManag
 import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpm
 
 plugins {
-    id("org.siouan.frontend-jdk17")
+    id("org.siouan.frontend-jdk21")
 }
 
 frontend {

diff --git a/...ltiple-package-managers-with-shared-nodejs-distribution/npm-9-subproject/build.gradle.kts b/...ltiple-package-managers-with-shared-nodejs-distribution/npm-9-subproject/build.gradle.kts
@@ -2,7 +2,7 @@ import org.siouan.frontendgradleplugin.infrastructure.gradle.ResolvePackageManag
 import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpm
 
 plugins {
-    id("org.siouan.frontend-jdk17")
+    id("org.siouan.frontend-jdk21")
 }
 
 frontend {

diff --git a/...tiple-package-managers-with-shared-nodejs-distribution/pnpm-6-subproject/build.gradle.kts b/...tiple-package-managers-with-shared-nodejs-distribution/pnpm-6-subproject/build.gradle.kts
@@ -2,7 +2,7 @@ import org.siouan.frontendgradleplugin.infrastructure.gradle.ResolvePackageManag
 import org.siouan.frontendgradleplugin.infrastructure.gradle.RunPnpm
 
 plugins {
-    id("org.siouan.frontend-jdk17")
+    id("org.siouan.frontend-jdk21")
 }
 
 frontend {

diff --git a/...tiple-package-managers-with-shared-nodejs-distribution/pnpm-8-subproject/build.gradle.kts b/...tiple-package-managers-with-shared-nodejs-distribution/pnpm-8-subproject/build.gradle.kts
@@ -2,7 +2,7 @@ import org.siouan.frontendgradleplugin.infrastructure.gradle.ResolvePackageManag
 import org.siouan.frontendgradleplugin.infrastructure.gradle.RunPnpm
 
 plugins {
-    id("org.siouan.frontend-jdk17")
+    id("org.siouan.frontend-jdk21")
 }
 
 frontend {

diff --git a/examples/multiple-package-managers-with-shared-nodejs-distribution/settings.gradle.kts b/examples/multiple-package-managers-with-shared-nodejs-distribution/settings.gradle.kts
@@ -1,6 +1,6 @@
 pluginManagement {
     plugins {
-        id("org.siouan.frontend-jdk17") version "8.1.0"
+        id("org.siouan.frontend-jdk21") version "8.1.0"
     }
 }
 

diff --git a/...tiple-package-managers-with-shared-nodejs-distribution/yarn-1-subproject/build.gradle.kts b/...tiple-package-managers-with-shared-nodejs-distribution/yarn-1-subproject/build.gradle.kts
@@ -2,7 +2,7 @@ import org.siouan.frontendgradleplugin.infrastructure.gradle.ResolvePackageManag
 import org.siouan.frontendgradleplugin.infrastructure.gradle.RunYarn
 
 plugins {
-    id("org.siouan.frontend-jdk17")
+    id("org.siouan.frontend-jdk21")
 }
 
 frontend {

diff --git a/examples/npm-application/build.gradle.kts b/examples/npm-application/build.gradle.kts
@@ -3,7 +3,7 @@ import kotlin.io.path.Path
 import org.siouan.frontendgradleplugin.infrastructure.gradle.InstallFrontendTask
 
 plugins {
-    id("org.siouan.frontend-jdk17")
+    id("org.siouan.frontend-jdk21")
 }
 
 frontend {

diff --git a/examples/npm-application/settings.gradle.kts b/examples/npm-application/settings.gradle.kts
@@ -1,5 +1,5 @@
 pluginManagement {
     plugins {
-        id("org.siouan.frontend-jdk17") version "8.1.0"
+        id("org.siouan.frontend-jdk21") version "8.1.0"
     }
 }
diff --git a/examples/pnpm-application/build.gradle.kts b/examples/pnpm-application/build.gradle.kts
@@ -3,7 +3,7 @@ import kotlin.io.path.Path
 import org.siouan.frontendgradleplugin.infrastructure.gradle.InstallFrontendTask
 
 plugins {
-    id("org.siouan.frontend-jdk17")
+    id("org.siouan.frontend-jdk21")
 }
 
 frontend {

diff --git a/examples/pnpm-application/settings.gradle.kts b/examples/pnpm-application/settings.gradle.kts
@@ -1,5 +1,5 @@
 pluginManagement {
     plugins {
-        id("org.siouan.frontend-jdk17") version "8.1.0"
+        id("org.siouan.frontend-jdk21") version "8.1.0"
     }
 }
diff --git a/examples/yarn-application-with-node-modules-linker/build.gradle.kts b/examples/yarn-application-with-node-modules-linker/build.gradle.kts
@@ -3,7 +3,7 @@ import kotlin.io.path.Path
 import org.siouan.frontendgradleplugin.infrastructure.gradle.InstallFrontendTask
 
 plugins {
-    id("org.siouan.frontend-jdk17")
+    id("org.siouan.frontend-jdk21")
 }
 
 frontend {

diff --git a/examples/yarn-application-with-node-modules-linker/settings.gradle.kts b/examples/yarn-application-with-node-modules-linker/settings.gradle.kts
@@ -1,5 +1,5 @@
 pluginManagement {
     plugins {
-        id("org.siouan.frontend-jdk17") version "8.1.0"
+        id("org.siouan.frontend-jdk21") version "8.1.0"
     }
 }
diff --git a/examples/yarn-application-with-pnp-linker/build.gradle.kts b/examples/yarn-application-with-pnp-linker/build.gradle.kts
@@ -3,7 +3,7 @@ import kotlin.io.path.Path
 import org.siouan.frontendgradleplugin.infrastructure.gradle.InstallFrontendTask
 
 plugins {
-    id("org.siouan.frontend-jdk17")
+    id("org.siouan.frontend-jdk21")
 }
 
 frontend {

diff --git a/examples/yarn-application-with-pnp-linker/settings.gradle.kts b/examples/yarn-application-with-pnp-linker/settings.gradle.kts
@@ -1,5 +1,5 @@
 pluginManagement {
     plugins {
-        id("org.siouan.frontend-jdk17") version "8.1.0"
+        id("org.siouan.frontend-jdk21") version "8.1.0"
     }
 }
diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts
@@ -28,7 +28,7 @@ description = fgpDescription
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
+        languageVersion = JavaLanguageVersion.of(21)
     }
     withJavadocJar()
     withSourcesJar()
@@ -106,7 +106,7 @@ sonarqube {
         property("sonar.organization", "siouan")
         property("sonar.projectKey", "siouan_frontend-gradle-plugin")
         property("sonar.projectName", "frontend-gradle-plugin")
-        property("sonar.projectVersion", "${fgpVersion}-jdk17")
+        property("sonar.projectVersion", "${fgpVersion}-jdk21")
 
         property("sonar.links.homepage", "https://github.com/siouan/frontend-gradle-plugin")
         property("sonar.links.ci", "https://github.com/siouan/frontend-gradle-plugin/actions")
@@ -120,7 +120,6 @@ sonarqube {
         property("sonar.java.test.binaries", "build/classes/java/test,build/classes/java/integrationTest")
         property("sonar.junit.reportPaths", "build/test-results/test/,build/test-results/integrationTest/")
         property("sonar.jacoco.xmlReportPaths", "build/reports/jacoco/report.xml")
-        property("sonar.verbose", true)
 
         // Irrelevant duplications detected on task inputs
         property(

diff --git a/plugin/buildSrc/build.gradle.kts b/plugin/buildSrc/build.gradle.kts
@@ -8,6 +8,6 @@ dependencies {
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
+        languageVersion = JavaLanguageVersion.of(21)
     }
 }
diff --git a/plugin/gradle.properties b/plugin/gradle.properties
@@ -1,4 +1,4 @@
-fgpArtifactId=frontend-jdk17
+fgpArtifactId=frontend-jdk21
 fgpGroup=org.siouan
 fgpVersion=8.1.0
 fgpDisplayName=Frontend Gradle plugin

diff --git a/...va/org/siouan/frontendgradleplugin/infrastructure/gradle/AssembleFrontedTaskFuncTest.java b/...va/org/siouan/frontendgradleplugin/infrastructure/gradle/AssembleFrontedTaskFuncTest.java
@@ -9,7 +9,6 @@
 import static org.siouan.frontendgradleplugin.test.PluginTaskOutcome.SUCCESS;
 import static org.siouan.frontendgradleplugin.test.PluginTaskOutcome.UP_TO_DATE;
 import static org.siouan.frontendgradleplugin.test.Resources.getResourcePath;
-import static org.siouan.frontendgradleplugin.test.Resources.getResourceUrl;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -42,7 +41,7 @@ void setUp() throws IOException {
     void should_skip_task_when_package_json_file_does_not_exist() throws IOException {
         final FrontendMapBuilder frontendMapBuilder = new FrontendMapBuilder()
             .nodeVersion("20.14.0")
-            .nodeDistributionUrl(getResourceUrl("node-v20.14.0.zip"))
+            .nodeDistributionUrl(getResourcePath("node-v20.14.0.zip"))
             .assembleScript("run assemble")
             .packageJsonDirectory(packageJsonDirectoryPath);
         createBuildFile(projectDirectoryPath, frontendMapBuilder.toMap());
@@ -61,7 +60,7 @@ void should_skip_task_when_script_is_not_defined() throws IOException {
         Files.copy(getResourcePath("package-any-manager.json"), packageJsonDirectoryPath.resolve("package.json"));
         final FrontendMapBuilder frontendMapBuilder = new FrontendMapBuilder()
             .nodeVersion("20.14.0")
-            .nodeDistributionUrl(getResourceUrl("node-v20.14.0.zip"))
+            .nodeDistributionUrl(getResourcePath("node-v20.14.0.zip"))
             .packageJsonDirectory(packageJsonDirectoryPath);
         createBuildFile(projectDirectoryPath, frontendMapBuilder.toMap());
 
@@ -79,7 +78,7 @@ void should_skip_task_when_running_gradle_task_and_script_is_not_defined() throw
         Files.copy(getResourcePath("package-any-manager.json"), packageJsonDirectoryPath.resolve("package.json"));
         final FrontendMapBuilder frontendMapBuilder = new FrontendMapBuilder()
             .nodeVersion("20.14.0")
-            .nodeDistributionUrl(getResourceUrl("node-v20.14.0.zip"))
+            .nodeDistributionUrl(getResourcePath("node-v20.14.0.zip"))
             .packageJsonDirectory(packageJsonDirectoryPath);
         createBuildFile(projectDirectoryPath, frontendMapBuilder.toMap());
 
@@ -97,7 +96,7 @@ void should_assemble_frontend() throws IOException {
         Files.copy(getResourcePath("package-any-manager.json"), packageJsonDirectoryPath.resolve("package.json"));
         final FrontendMapBuilder frontendMapBuilder = new FrontendMapBuilder()
             .nodeVersion("20.14.0")
-            .nodeDistributionUrl(getResourceUrl("node-v20.14.0.zip"))
+            .nodeDistributionUrl(getResourcePath("node-v20.14.0.zip"))
             .packageJsonDirectory(packageJsonDirectoryPath)
             .assembleScript("run assemble");
         createBuildFile(projectDirectoryPath, frontendMapBuilder.toMap());

diff --git a/...org/siouan/frontendgradleplugin/infrastructure/gradle/AuthenticationAndProxyFuncTest.java b/...org/siouan/frontendgradleplugin/infrastructure/gradle/AuthenticationAndProxyFuncTest.java
@@ -10,7 +10,7 @@
 import static org.siouan.frontendgradleplugin.test.PluginTaskOutcome.SUCCESS;
 
 import java.io.IOException;
-import java.net.URL;
+import java.net.URI;
 import java.nio.file.Path;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
@@ -168,7 +168,7 @@ void should_install_node_when_authentication_succeeds_on_proxy_server() throws I
     private FrontendMapBuilder configureNodeServerAndPluginWithDirectConnection(final String distributionServerPassword)
         throws IOException {
         return configureServerAndPlugin(
-            new URL("http", DISTRIBUTION_SERVER_HOST, DISTRIBUTION_SERVER_PORT, "/").toString(),
+            URI.create("http://" + DISTRIBUTION_SERVER_HOST + ':' + DISTRIBUTION_SERVER_PORT + "/").toString(),
             NODE_DISTRIBUTION_URL_PATH_PATTERN, DISTRIBUTION_SERVER_USERNAME, distributionServerPassword, null, null,
             null, null);
     }

diff --git a/...java/org/siouan/frontendgradleplugin/infrastructure/gradle/CheckFrontendTaskFuncTest.java b/...java/org/siouan/frontendgradleplugin/infrastructure/gradle/CheckFrontendTaskFuncTest.java
@@ -9,7 +9,6 @@
 import static org.siouan.frontendgradleplugin.test.PluginTaskOutcome.SUCCESS;
 import static org.siouan.frontendgradleplugin.test.PluginTaskOutcome.UP_TO_DATE;
 import static org.siouan.frontendgradleplugin.test.Resources.getResourcePath;
-import static org.siouan.frontendgradleplugin.test.Resources.getResourceUrl;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -34,7 +33,7 @@ class CheckFrontendTaskFuncTest {
     void should_skip_task_when_package_json_file_does_not_exist() throws IOException {
         final FrontendMapBuilder frontendMapBuilder = new FrontendMapBuilder()
             .nodeVersion("20.14.0")
-            .nodeDistributionUrl(getResourceUrl("node-v20.14.0.zip"))
+            .nodeDistributionUrl(getResourcePath("node-v20.14.0.zip"))
             .checkScript("run check");
         createBuildFile(projectDirectoryPath, frontendMapBuilder.toMap());
 
@@ -52,7 +51,7 @@ void should_skip_task_when_script_is_not_defined() throws IOException {
         Files.copy(getResourcePath("package-any-manager.json"), projectDirectoryPath.resolve("package.json"));
         final FrontendMapBuilder frontendMapBuilder = new FrontendMapBuilder()
             .nodeVersion("20.14.0")
-            .nodeDistributionUrl(getResourceUrl("node-v20.14.0.zip"));
+            .nodeDistributionUrl(getResourcePath("node-v20.14.0.zip"));
         createBuildFile(projectDirectoryPath, frontendMapBuilder.toMap());
 
         final BuildResult result1 = runGradle(projectDirectoryPath, CHECK_TASK_NAME);
@@ -69,7 +68,7 @@ void should_skip_task_when_running_gradle_task_and_script_is_not_defined() throw
         Files.copy(getResourcePath("package-any-manager.json"), projectDirectoryPath.resolve("package.json"));
         final FrontendMapBuilder frontendMapBuilder = new FrontendMapBuilder()
             .nodeVersion("20.14.0")
-            .nodeDistributionUrl(getResourceUrl("node-v20.14.0.zip"));
+            .nodeDistributionUrl(getResourcePath("node-v20.14.0.zip"));
         createBuildFile(projectDirectoryPath, frontendMapBuilder.toMap());
 
         final BuildResult result1 = runGradle(projectDirectoryPath, GRADLE_CHECK_TASK_NAME);
@@ -86,7 +85,7 @@ void should_check_frontend() throws IOException {
         Files.copy(getResourcePath("package-any-manager.json"), projectDirectoryPath.resolve("package.json"));
         final FrontendMapBuilder frontendMapBuilder = new FrontendMapBuilder()
             .nodeVersion("20.14.0")
-            .nodeDistributionUrl(getResourceUrl("node-v20.14.0.zip"))
+            .nodeDistributionUrl(getResourcePath("node-v20.14.0.zip"))
             .checkScript("run check");
         createBuildFile(projectDirectoryPath, frontendMapBuilder.toMap());