Merge branch '9.1-jdk21' into 9.1-jdk17

# Conflicts: # 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/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
siouan · Nov 12, 2024 · 2f031ed · 2f031ed
2 parents d89a31c + 92b075d
commit 2f031ed
Show file tree

Hide file tree

Showing 64 changed files with 197 additions and 211 deletions.
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-jdk17")
+    id("org.siouan.frontend-jdk17") 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-jdk17")
+    id("org.siouan.frontend-jdk17") 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-jdk17") version "9.1.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-jdk17", 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.RunNodeTaskType
 
 plugins {
-    id("org.siouan.frontend-jdk17")
+    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-jdk17")
+    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-jdk17")
+    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-jdk17")
+    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-jdk17")
+    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-jdk17") version "9.1.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-jdk17")
+    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-jdk17")
+    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-jdk17")
+    id("org.siouan.frontend-jdk17") 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-jdk17")
+    id("org.siouan.frontend-jdk17") 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-jdk17")
+    id("org.siouan.frontend-jdk17") 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-jdk17")
+    id("org.siouan.frontend-jdk17") 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
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -0,0 +1,33 @@
+[versions]
+assertj-version = "3.26.3"
+commons-compress-version = "1.27.1"
+gradle-plugin-publish-version = "1.3.0"
+httpclient5-version = "5.4.1"
+jacoco-version = "0.8.12"
+json-version = "20240303"
+junit-jupiter-version = "5.11.3"
+junit-pioneer-version = "2.3.0"
+lombok-version = "1.18.34"
+mockito-version = "5.14.2"
+resilience4j-retry-version = "2.2.0"
+sonarqube-version = "5.1.0.4882"
+wiremock-version = "3.9.2"
+
+[libraries]
+assertj-core = { group = "org.assertj", name = "assertj-core", version.ref = "assertj-version" }
+commons-compress = { group = "org.apache.commons", name = "commons-compress", version.ref = "commons-compress-version" }
+httpclient5 = { group = "org.apache.httpcomponents.client5", name = "httpclient5", version.ref = "httpclient5-version" }
+json = { group = "org.json", name = "json", version.ref = "json-version" }
+junit-jupiter-api = { group = "org.junit.jupiter", name = "junit-jupiter-api", version.ref = "junit-jupiter-version" }
+junit-jupiter-engine = { group = "org.junit.jupiter", name = "junit-jupiter-engine", version.ref = "junit-jupiter-version" }
+junit-jupiter-params = { group = "org.junit.jupiter", name = "junit-jupiter-params", version.ref = "junit-jupiter-version" }
+junit-pioneer = { group = "org.junit-pioneer", name = "junit-pioneer", version.ref = "junit-pioneer-version" }
+lombok = { group = "org.projectlombok", name = "lombok", version.ref = "lombok-version" }
+mockito-core = { group = "org.mockito", name = "mockito-core", version.ref = "mockito-version" }
+mockito-junit-jupiter = { group = "org.mockito", name = "mockito-junit-jupiter", version.ref = "mockito-version" }
+resilience4j-retry = { group = "io.github.resilience4j", name = "resilience4j-retry", version.ref = "resilience4j-retry-version" }
+wiremock = { group = "org.wiremock", name = "wiremock", version.ref = "wiremock-version" }
+
+[plugins]
+gradle-plugin-publish = { id = "com.gradle.plugin-publish", version.ref = "gradle-plugin-publish-version" }
+sonarqube = { id  ="org.sonarqube", version.ref = "sonarqube-version" }