diff --git a/.gitignore b/.gitignore index cb0de5f4..8149e9db 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,7 @@ maven-eclipse.xml infinitest.filters node_modules/ +node/ npm-debug.log .nodejs diff --git a/.maven-settings.xml b/.maven-settings.xml index 8fe6ea8f..fb12e792 100644 --- a/.maven-settings.xml +++ b/.maven-settings.xml @@ -42,19 +42,6 @@ - - maven-nodejs-proxy - https://maven-nodejs-proxy.pvtool.org - default - - true - never - - - false - - - oss-snapshots https://oss.sonatype.org/content/repositories/snapshots diff --git a/bundle/.nvmrc b/bundle/.nvmrc index 7fd02374..ee09fac7 100644 --- a/bundle/.nvmrc +++ b/bundle/.nvmrc @@ -1 +1 @@ -v16.15.0 +v20.11.1 diff --git a/bundle/package.json b/bundle/package.json index 6c8ee223..361ac2c9 100644 --- a/bundle/package.json +++ b/bundle/package.json @@ -21,8 +21,5 @@ "grunt-eslint": "24.0.0", "grunt-html2js": "0.8.0", "load-grunt-tasks": "5.1.0" - }, - "engines": { - "node": "16.15.0" } } diff --git a/bundle/pom.xml b/bundle/pom.xml index e01a42c9..579126ef 100644 --- a/bundle/pom.xml +++ b/bundle/pom.xml @@ -209,30 +209,41 @@ - io.wcm.maven.plugins - nodejs-maven-plugin + com.github.eirslett + frontend-maven-plugin - generate-sources - run + install node and npm + + install-node-and-npm + + process-resources + + v20.11.1 + 10.2.4 + + + + npm install + + npm + + process-resources + + install + + + + grunt build + + grunt + + process-resources + + build + - - 16.15.0 - - - ${project.basedir} - - - ${project.basedir} - grunt-cli - grunt - - build - - - -