Merge branch '9.1-jdk21' into 9.1-jdk11

# Conflicts: # README.md # examples/application-with-preinstalled-nodejs-distribution/build.gradle.kts # examples/application-with-preinstalled-nodejs-distribution/settings.gradle.kts # examples/fullstack-war-application/frontend/build.gradle.kts # examples/fullstack-war-application/settings.gradle.kts # examples/multiple-package-managers-with-shared-nodejs-distribution/node-subproject/build.gradle.kts # examples/multiple-package-managers-with-shared-nodejs-distribution/npm-10-subproject/build.gradle.kts # examples/multiple-package-managers-with-shared-nodejs-distribution/npm-6-subproject/build.gradle.kts # examples/multiple-package-managers-with-shared-nodejs-distribution/pnpm-6-subproject/build.gradle.kts # examples/multiple-package-managers-with-shared-nodejs-distribution/pnpm-9-subproject/build.gradle.kts # examples/multiple-package-managers-with-shared-nodejs-distribution/settings.gradle.kts # examples/multiple-package-managers-with-shared-nodejs-distribution/yarn-1-subproject/build.gradle.kts # examples/multiple-package-managers-with-shared-nodejs-distribution/yarn-4-subproject/build.gradle.kts # examples/npm-application/build.gradle.kts # examples/npm-application/settings.gradle.kts # examples/pnpm-application/build.gradle.kts # examples/pnpm-application/settings.gradle.kts # examples/yarn-application-with-node-modules-linker/build.gradle.kts # examples/yarn-application-with-node-modules-linker/settings.gradle.kts # examples/yarn-application-with-pnp-linker/build.gradle.kts # examples/yarn-application-with-pnp-linker/settings.gradle.kts # plugin/build.gradle.kts # site/build.gradle.kts
siouan · Nov 12, 2024 · dc58a29 · dc58a29
2 parents 7d52a6a + 92b075d
commit dc58a29
Show file tree

Hide file tree

Showing 93 changed files with 2,486 additions and 2,057 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -24,9 +24,9 @@ Actual results: ...
 **Environment**
 
 - OS: [e.g. Ubuntu 24.04, Windows 11 Pro, Mac OS X]
-- JDK: [e.g. Adoptium Temurin JDK 21 64 bits]
+- JDK: [e.g. Adoptium Temurin JDK 11 64 bits]
 - Gradle: [e.g. Gradle 8.10.2]
-- Frontend Gradle plugin: [e.g. 9.0.0 JDK 21]
+- Frontend Gradle plugin: [e.g. 9.1.0 JDK 11]
 
 Settings in `build.gradle[.kts]` file:
 ```groovy

diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -22,9 +22,9 @@ Explain what you would like the plugin do: ...
 **Target environment**
 
 - OS: [e.g. Ubuntu 24.04, Windows 11 Pro, Mac OS X]
-- JDK: [e.g. Adoptium Temurin JDK 21 64 bits]
+- JDK: [e.g. Adoptium Temurin JDK 11 64 bits]
 - Gradle: [e.g. Gradle 8.10.2]
-- Frontend Gradle plugin: [e.g. 9.0.0 JDK 21]
+- Frontend Gradle plugin: [e.g. 9.1.0 JDK 11]
 
 Settings in `build.gradle[.kts]` file:
 ```groovy

diff --git a/README.md b/README.md
@@ -2,9 +2,9 @@
 <a href="https://www.npmjs.com/" title="npm">npm</a>, <a href="https://pnpm.io/" title="pnpm">pnpm</a>,
 <a href="https://yarnpkg.com/" title="Yarn">Yarn</a> builds</h2> 
 <p align="center">
-    <a href="https://github.com/siouan/frontend-gradle-plugin/releases/tag/v9.0.0"><img src="https://img.shields.io/badge/Latest%20release-9.0.0-blue.svg" alt="Latest release 9.0.0"/></a>
+    <a href="https://github.com/siouan/frontend-gradle-plugin/releases/tag/v9.1.0"><img src="https://img.shields.io/badge/Latest%20release-9.1.0-blue.svg" alt="Latest release 9.1.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=9.0-jdk11" 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=9.1-jdk11" 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>
@@ -42,15 +42,35 @@
 ### They use this plugin, thanks to these organizations!
 
 <p align="center">
-<a href="https://akhq.io/" title="AKHQ - Kafka GUI for Apache Kafka"><img src="resources/akhq.svg" alt="AKHQ logo" height="64" /></a>
+<a href="https://akhq.io/" title="AKHQ - Kafka GUI for Apache Kafka"><picture>
+    <source media="(prefers-color-scheme: dark)" srcset="resources/akhq-dark.svg" />
+    <source media="(prefers-color-scheme: light)" srcset="resources/akhq-light.png" />
+    <img src="resources/akhq-light.png" alt="AKHQ logo" height="64" />
+</picture></a>
 &nbsp;&nbsp;&nbsp;&nbsp;
-<a href="https://kestra.io/" title="Kestra - Event-driven declarative orchestration platform"><img src="resources/kestra.svg" alt="Kestra logo" height="64"></a>
+<a href="https://kestra.io/" title="Kestra - Event-driven declarative orchestration platform"><picture>
+    <source media="(prefers-color-scheme: dark)" srcset="resources/kestra-dark.svg" />
+    <source media="(prefers-color-scheme: light)" srcset="resources/kestra-light.png" />
+    <img src="resources/kestra-light.png" alt="Kestra logo" height="64" />
+</picture></a>
 &nbsp;&nbsp;&nbsp;&nbsp;
-<a href="https://egeria-project.org/" title="Egeria - Open Metadata and Governance"><img src="resources/egeria.png" alt="Egeria logo" height="64" /></a>
+<a href="https://egeria-project.org/" title="Egeria - Open Metadata and Governance"><picture>
+    <source media="(prefers-color-scheme: dark)" srcset="resources/egeria-dark.png" />
+    <source media="(prefers-color-scheme: light)" srcset="resources/egeria-light.png" />
+    <img src="resources/egeria-light.png" alt="Egeria logo" height="64" />
+</picture></a>
 <br/>
-<a href="https://x-road.global/" title="X-Road - Data Exchange Layer"><img src="resources/x-road.png" alt="X-Road logo" height="64" /></a>
+<a href="https://x-road.global/" title="X-Road - Data Exchange Layer"><picture>
+    <source media="(prefers-color-scheme: dark)" srcset="resources/x-road-dark.png" />
+    <source media="(prefers-color-scheme: light)" srcset="resources/x-road-light.png" />
+    <img src="resources/x-road-light.png" alt="X-Road logo" height="64" />
+</picture></a>
 &nbsp;&nbsp;&nbsp;&nbsp;
-<a href="https://serverpackcreator.de/" title="ServerPackCreator - Quick and easy generation of server packs of your favourite Minecraft modpacks"><img src="resources/serverpackcreator.png" alt="ServerPackCreator logo" height="64" /></a>
+<a href="https://serverpackcreator.de/" title="ServerPackCreator - Quick and easy generation of server packs of your favourite Minecraft modpacks"><picture>
+    <source media="(prefers-color-scheme: dark)" srcset="resources/serverpackcreator-dark.png" />
+    <source media="(prefers-color-scheme: light)" srcset="resources/serverpackcreator-light.png" />
+    <img src="resources/serverpackcreator-light.png" alt="ServerPackCreator logo" height="64" />
+</picture></a>
 </p>
 
 ### IDE

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.RunNodeTaskType
 import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpmTaskType
 
 plugins {
-    id("org.siouan.frontend-jdk11")
+    id("org.siouan.frontend-jdk11") version "9.1.0"
 }
 
 //val preinstalledNodeDistributionDirectory = file(<path-to-nodejs-install-directory>);
@@ -18,10 +18,10 @@ frontend {
 
 tasks.register<RunNodeTaskType>("nodeVersion") {
     dependsOn("installNode")
-    script.set("-v")
+    args.set("-v")
 }
 
 tasks.register<RunNpmTaskType>("npmVersion") {
     dependsOn("installPackageManager")
-    script.set("-v")
+    args.set("-v")
 }
diff --git a/examples/application-with-preinstalled-nodejs-distribution/settings.gradle.kts b/examples/application-with-preinstalled-nodejs-distribution/settings.gradle.kts
diff --git a/examples/fullstack-war-application/backend/build.gradle.kts b/examples/fullstack-war-application/backend/build.gradle.kts
@@ -1,8 +1,8 @@
 plugins {
     id("java")
     id("war")
-    id("org.springframework.boot")
-    id("io.spring.dependency-management")
+    id("org.springframework.boot") version "3.3.5"
+    id("io.spring.dependency-management") version "1.1.6"
 }
 
 version = "1.0.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-jdk11")
+    id("org.siouan.frontend-jdk11") version "9.1.0"
 }
 
 frontend {

diff --git a/examples/fullstack-war-application/settings.gradle.kts b/examples/fullstack-war-application/settings.gradle.kts
@@ -1,11 +1 @@
-pluginManagement {
-    plugins {
-        id("java")
-        id("war")
-        id("org.springframework.boot") version "3.3.4"
-        id("io.spring.dependency-management") version "1.1.6"
-        id("org.siouan.frontend-jdk11") version "9.0.0"
-    }
-}
-
 include("backend", "frontend")
diff --git a/examples/multiple-package-managers-with-shared-nodejs-distribution/gradle.properties b/examples/multiple-package-managers-with-shared-nodejs-distribution/gradle.properties
@@ -1,2 +1 @@
-org.gradle.caching=false
 org.gradle.parallel=true
diff --git a/examples/multiple-package-managers-with-shared-nodejs-distribution/gradle/libs.versions.toml b/examples/multiple-package-managers-with-shared-nodejs-distribution/gradle/libs.versions.toml
@@ -0,0 +1,5 @@
+[versions]
+frontend-version = "9.1.0"
+
+[plugins]
+frontend = { id  ="org.siouan.frontend-jdk11", version.ref = "frontend-version" }
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
+import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNodeTaskType
 
 plugins {
-    id("org.siouan.frontend-jdk11")
+    alias(libs.plugins.frontend)
 }
 
 frontend {
@@ -11,7 +11,7 @@ frontend {
 
 tasks.register<RunNodeTaskType>("nodeVersion") {
     dependsOn("installNode")
-    script.set("--version")
+    args.set("--version")
 }
 
 tasks.named<Task>("build") {

diff --git a/...tiple-package-managers-with-shared-nodejs-distribution/npm-10-subproject/build.gradle.kts b/...tiple-package-managers-with-shared-nodejs-distribution/npm-10-subproject/build.gradle.kts
@@ -2,7 +2,7 @@ import org.siouan.frontendgradleplugin.infrastructure.gradle.ResolvePackageManag
 import org.siouan.frontendgradleplugin.infrastructure.gradle.RunNpmTaskType
 
 plugins {
-    id("org.siouan.frontend-jdk11")
+    alias(libs.plugins.frontend)
 }
 
 frontend {
@@ -16,7 +16,7 @@ tasks.named<ResolvePackageManagerTask>("resolvePackageManager") {
 
 tasks.register<RunNpmTaskType>("npm9Version") {
     dependsOn("installPackageManager")
-    script.set("--version")
+    args.set("--version")
 }
 
 tasks.named<Task>("build") {

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.RunNpmTaskType
 
 plugins {
-    id("org.siouan.frontend-jdk11")
+    alias(libs.plugins.frontend)
 }
 
 frontend {
@@ -16,7 +16,7 @@ tasks.named<ResolvePackageManagerTask>("resolvePackageManager") {
 
 tasks.register<RunNpmTaskType>("npm6Version") {
     dependsOn("installPackageManager")
-    script.set("--version")
+    args.set("--version")
 }
 
 tasks.named<Task>("build") {

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.RunPnpmTaskType
 
 plugins {
-    id("org.siouan.frontend-jdk11")
+    alias(libs.plugins.frontend)
 }
 
 frontend {
@@ -16,7 +16,7 @@ tasks.named<ResolvePackageManagerTask>("resolvePackageManager") {
 
 tasks.register<RunPnpmTaskType>("pnpm6Version") {
     dependsOn("installPackageManager")
-    script.set("--version")
+    args.set("--version")
 }
 
 tasks.named<Task>("build") {

diff --git a/...tiple-package-managers-with-shared-nodejs-distribution/pnpm-9-subproject/build.gradle.kts b/...tiple-package-managers-with-shared-nodejs-distribution/pnpm-9-subproject/build.gradle.kts
@@ -2,7 +2,7 @@ import org.siouan.frontendgradleplugin.infrastructure.gradle.ResolvePackageManag
 import org.siouan.frontendgradleplugin.infrastructure.gradle.RunPnpmTaskType
 
 plugins {
-    id("org.siouan.frontend-jdk11")
+    alias(libs.plugins.frontend)
 }
 
 frontend {
@@ -16,7 +16,7 @@ tasks.named<ResolvePackageManagerTask>("resolvePackageManager") {
 
 tasks.register<RunPnpmTaskType>("pnpm8Version") {
     dependsOn("installPackageManager")
-    script.set("--version")
+    args.set("--version")
 }
 
 tasks.named<Task>("build") {

diff --git a/.../multiple-package-managers-with-shared-nodejs-distribution/pnpm-9-subproject/package.json b/.../multiple-package-managers-with-shared-nodejs-distribution/pnpm-9-subproject/package.json
@@ -1,4 +1,4 @@
 {
   "private": true,
-  "packageManager": "[email protected].2"
+  "packageManager": "[email protected].3"
 }
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,7 +1 @@
-pluginManagement {
-    plugins {
-        id("org.siouan.frontend-jdk11") version "9.0.0"
-    }
-}
-
 include("node-subproject", "npm-6-subproject", "npm-10-subproject", "pnpm-6-subproject", "pnpm-9-subproject", "yarn-1-subproject", "yarn-4-subproject")
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.RunYarnTaskType
 
 plugins {
-    id("org.siouan.frontend-jdk11")
+    alias(libs.plugins.frontend)
 }
 
 frontend {
@@ -16,7 +16,7 @@ tasks.named<ResolvePackageManagerTask>("resolvePackageManager") {
 
 tasks.register<RunYarnTaskType>("yarn1Version") {
     dependsOn("installPackageManager")
-    script.set("--version")
+    args.set("--version")
 }
 
 tasks.named<Task>("build") {

diff --git a/.../multiple-package-managers-with-shared-nodejs-distribution/yarn-1-subproject/package.json b/.../multiple-package-managers-with-shared-nodejs-distribution/yarn-1-subproject/package.json
@@ -1,4 +1,4 @@
 {
   "private": true,
-  "packageManager": "[email protected].19"
+  "packageManager": "[email protected].22"
 }
diff --git a/...tiple-package-managers-with-shared-nodejs-distribution/yarn-4-subproject/build.gradle.kts b/...tiple-package-managers-with-shared-nodejs-distribution/yarn-4-subproject/build.gradle.kts
@@ -1,7 +1,7 @@
 import org.siouan.frontendgradleplugin.infrastructure.gradle.RunYarnTaskType
 
 plugins {
-    id("org.siouan.frontend-jdk11")
+    alias(libs.plugins.frontend)
 }
 
 frontend {
@@ -15,7 +15,7 @@ tasks.named<Task>("resolvePackageManager") {
 
 tasks.register<RunYarnTaskType>("yarn3Version") {
     dependsOn("installPackageManager")
-    script.set("--version")
+    args.set("--version")
 }
 
 tasks.named<Task>("build") {

diff --git a/.../multiple-package-managers-with-shared-nodejs-distribution/yarn-4-subproject/package.json b/.../multiple-package-managers-with-shared-nodejs-distribution/yarn-4-subproject/package.json
@@ -1,4 +1,4 @@
 {
   "private": true,
-  "packageManager": "[email protected].0"
+  "packageManager": "[email protected].1"
 }
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-jdk11")
+    id("org.siouan.frontend-jdk11") version "9.1.0"
 }
 
 frontend {

diff --git a/examples/npm-application/settings.gradle.kts b/examples/npm-application/settings.gradle.kts
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-jdk11")
+    id("org.siouan.frontend-jdk11") version "9.1.0"
 }
 
 frontend {

diff --git a/examples/pnpm-application/package.json b/examples/pnpm-application/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "packageManager": "[email protected].2",
+  "packageManager": "[email protected].3",
   "scripts": {
     "build": "echo Building frontend",
     "check": "echo Checking frontend && pnpm run lint && pnpm run test",

diff --git a/examples/pnpm-application/settings.gradle.kts b/examples/pnpm-application/settings.gradle.kts
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-jdk11")
+    id("org.siouan.frontend-jdk11") version "9.1.0"
 }
 
 frontend {

diff --git a/examples/yarn-application-with-node-modules-linker/package.json b/examples/yarn-application-with-node-modules-linker/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "packageManager": "[email protected].0",
+  "packageManager": "[email protected].1",
   "scripts": {
     "build": "echo Building frontend",
     "check": "echo Checking frontend && yarn run lint && yarn run test",

diff --git a/examples/yarn-application-with-node-modules-linker/settings.gradle.kts b/examples/yarn-application-with-node-modules-linker/settings.gradle.kts
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-jdk11")
+    id("org.siouan.frontend-jdk11") version "9.1.0"
 }
 
 frontend {

diff --git a/examples/yarn-application-with-pnp-linker/package.json b/examples/yarn-application-with-pnp-linker/package.json
@@ -1,6 +1,6 @@
 {
   "private": true,
-  "packageManager": "[email protected].0",
+  "packageManager": "[email protected].1",
   "scripts": {
     "build": "echo Building frontend",
     "check": "echo Checking frontend && yarn run lint && yarn run test",

diff --git a/examples/yarn-application-with-pnp-linker/settings.gradle.kts b/examples/yarn-application-with-pnp-linker/settings.gradle.kts