diff --git a/component-starter-server/pom.xml b/component-starter-server/pom.xml index 32a9e5a9a49d5..a57ab39f52b57 100644 --- a/component-starter-server/pom.xml +++ b/component-starter-server/pom.xml @@ -14,445 +14,474 @@ limitations under the License. --> - 4.0.0 + 4.0.0 - - org.talend.sdk.component - component-runtime - 1.89.0-SNAPSHOT - + + org.talend.sdk.component + component-runtime + 1.89.0-SNAPSHOT + - component-starter-server + component-starter-server - Component Runtime :: Starter Server - Web application allowing to generate maven project skeleton to speed up component development. + Component Runtime :: Starter Server + Web application allowing to generate maven project skeleton to speed up component development. - - v20.12.0 - 10.5.0 - ${talend.build.name.base}.starter - 10 - + + v20.12.0 + 10.5.0 + ${talend.build.name.base}.starter + 10 + - - - - org.apache.johnzon - johnzon-jsonb - - - org.apache.meecrowave - meecrowave-core - ${meecrowave.version} - - - org.eclipse.microprofile.config - microprofile-config-api - - - org.apache.geronimo.config - geronimo-config-impl - - - org.apache.logging.log4j - log4j-slf4j-impl - ${log4j2.version} - - - org.apache.logging.log4j - log4j-web - ${log4j2.version} - - - org.apache.logging.log4j - log4j-api - ${log4j2.version} - - - org.apache.logging.log4j - log4j-core - ${log4j2.version} - - - org.apache.logging.log4j - log4j-jul - ${log4j2.version} - - - - commons-cli - commons-cli - ${commons-cli.version} - - - - com.github.spullara.mustache.java - compiler - 0.9.6 - - - org.eclipse.jgit - org.eclipse.jgit - ${jgit.version} - - - org.slf4j - slf4j-jdk14 - - - - - - org.rrd4j - rrd4j - 3.7 - - - - org.apache.meecrowave - meecrowave-junit - ${meecrowave.version} - test - - - org.apache.geronimo.specs - geronimo-activation_1.1_spec - test - - - org.talend.sdk.component - component-runtime-junit-base - ${project.version} - test - - - org.junit.jupiter - junit-jupiter-params - ${junit5.version} - test - - - org.talend.sdk.component - component-api - ${project.version} - test - - - - - - - true - src/main/resources - - starter-versions.properties - - - - src/main/resources - - starter-versions.properties - - - - - - org.apache.maven.plugins - maven-clean-plugin - - - clean-frontend - - clean - - clean - - ${project.basedir}/src/main/frontend/dist - - - - - - io.github.git-commit-id - git-commit-id-maven-plugin - - true - ${project.build.outputDirectory}/TALEND-INF/git.properties - - - - generate-the-git-infos - - revision - - generate-resources - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - org.apache.logging.log4j.jul.LogManager - - false - 1 - 3 - ${project.build.directory}/test-workdir/rrd/stats.rrd - ${project.build.directory}/test-workdir/rrd/stats.xml - - - - - org.apache.meecrowave - meecrowave-maven-plugin - ${meecrowave.version} - - 8080 - ${project.basedir}/src/main/frontend/dist - false - false - -1 - - - - - - - - + + + org.apache.johnzon johnzon-jsonb - ${johnzon.version} - - + + + org.apache.meecrowave + meecrowave-core + ${meecrowave.version} + + + org.apache.xbean + xbean-finder-shaded + + + org.apache.xbean + xbean-asm9-shaded + + + org.apache.xbean + xbean-reflect + + + + + org.apache.xbean + xbean-finder-shaded + ${xbean.version} + + + org.apache.xbean + xbean-asm9-shaded + ${xbean.version} + + + org.apache.xbean + xbean-reflect + ${xbean.version} + + + org.eclipse.microprofile.config + microprofile-config-api + + + org.apache.geronimo.config + geronimo-config-impl + + org.apache.logging.log4j log4j-slf4j-impl ${log4j2.version} - - + + org.apache.logging.log4j log4j-web ${log4j2.version} - - - - - bundle - - bundle - - package - - true - - - - - - org.codehaus.mojo - build-helper-maven-plugin - ${build-helper-maven-plugin.version} - - - attach-artifacts - - attach-artifact - - prepare-package - - - - ${project.build.outputDirectory}/starter-versions.properties - properties - versions - - - - - - - - - com.github.eirslett - frontend-maven-plugin - - ${project.basedir}/.node - ${project.basedir}/src/main/frontend - - - - install-node-and-npm - - install-node-and-npm - - prepare-package - - ${node.version} - ${npm.version} - - - - npm-install - - npm - - prepare-package - - install - - - - npm-build - - npm - - prepare-package - - run build - ${component.starter.front.build.skip} - - production - false - false - - - - - - watch - - npm - - - - start - - true - true - production - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - copy-package.json - - run - - initialize - - - - - - - - - - org.apache.maven.plugins - maven-resources-plugin - - - copy-web-resources - - copy-resources - - prepare-package - - ${project.build.outputDirectory}/META-INF/resources - - - ${project.basedir}/src/main/frontend/dist - false - - - - - - filter-frontend - - copy-resources - - initialize - - ${project.basedir}/src/main/frontend - - - ${project.basedir}/src/main/frontend - - package.json - - true - - - true - - - - - - io.github.download-maven-plugin - download-maven-plugin - ${download-plugin.version} - - - org.codehaus.gmavenplus - gmavenplus-plugin - - true - - - - - - + + + org.apache.logging.log4j + log4j-api + ${log4j2.version} + + + org.apache.logging.log4j + log4j-core + ${log4j2.version} + + + org.apache.logging.log4j + log4j-jul + ${log4j2.version} + + + + commons-cli + commons-cli + ${commons-cli.version} + + + + com.github.spullara.mustache.java + compiler + 0.9.6 + + org.eclipse.jgit org.eclipse.jgit ${jgit.version} - - org.slf4j - slf4j-jdk14 - + + org.slf4j + slf4j-jdk14 + - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - true - - - - - - - grab-maven-wrapper - - execute - - process-resources - - - - - - + + + + org.rrd4j + rrd4j + 3.7 + + + + org.apache.meecrowave + meecrowave-junit + ${meecrowave.version} + test + + + org.apache.geronimo.specs + geronimo-activation_1.1_spec + test + + + org.talend.sdk.component + component-runtime-junit-base + ${project.version} + test + + + org.junit.jupiter + junit-jupiter-params + ${junit5.version} + test + + + org.talend.sdk.component + component-api + ${project.version} + test + + + + + + + true + src/main/resources + + starter-versions.properties + + + + src/main/resources + + starter-versions.properties + + + + + + org.apache.maven.plugins + maven-clean-plugin + + + clean-frontend + + clean + + clean + + ${project.basedir}/src/main/frontend/dist + + + + + + io.github.git-commit-id + git-commit-id-maven-plugin + + true + ${project.build.outputDirectory}/TALEND-INF/git.properties + + + + generate-the-git-infos + + revision + + generate-resources + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + org.apache.logging.log4j.jul.LogManager + + false + 1 + 3 + ${project.build.directory}/test-workdir/rrd/stats.rrd + ${project.build.directory}/test-workdir/rrd/stats.xml + + + + + org.apache.meecrowave + meecrowave-maven-plugin + ${meecrowave.version} + + 8080 + ${project.basedir}/src/main/frontend/dist + false + false + -1 + + + + + + + + + org.apache.johnzon + johnzon-jsonb + ${johnzon.version} + + + org.apache.logging.log4j + log4j-slf4j-impl + ${log4j2.version} + + + org.apache.logging.log4j + log4j-web + ${log4j2.version} + + + + + bundle + + bundle + + package + + true + + + + + + org.codehaus.mojo + build-helper-maven-plugin + ${build-helper-maven-plugin.version} + + + attach-artifacts + + attach-artifact + + prepare-package + + + + ${project.build.outputDirectory}/starter-versions.properties + properties + versions + + + + + + + + + com.github.eirslett + frontend-maven-plugin + + ${project.basedir}/.node + ${project.basedir}/src/main/frontend + + + + install-node-and-npm + + install-node-and-npm + + prepare-package + + ${node.version} + ${npm.version} + + + + npm-install + + npm + + prepare-package + + install + + + + npm-build + + npm + + prepare-package + + run build + ${component.starter.front.build.skip} + + production + false + false + + + + + + watch + + npm + + + + start + + true + true + production + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + copy-package.json + + run + + initialize + + + + + + + + + + org.apache.maven.plugins + maven-resources-plugin + + + copy-web-resources + + copy-resources + + prepare-package + + ${project.build.outputDirectory}/META-INF/resources + + + ${project.basedir}/src/main/frontend/dist + false + + + + + + filter-frontend + + copy-resources + + initialize + + ${project.basedir}/src/main/frontend + + + ${project.basedir}/src/main/frontend + + package.json + + true + + + true + + + + + + io.github.download-maven-plugin + download-maven-plugin + ${download-plugin.version} + + + org.codehaus.gmavenplus + gmavenplus-plugin + + true + + + + + + + org.eclipse.jgit + org.eclipse.jgit + ${jgit.version} + + + org.slf4j + slf4j-jdk14 + + + + + + + org.codehaus.gmavenplus + gmavenplus-plugin + + true + + + + + + + grab-maven-wrapper + + execute + + process-resources + + + + + + \ No newline at end of file diff --git a/component-starter-server/src/main/frontend/package-lock.json b/component-starter-server/src/main/frontend/package-lock.json index 49c237207c712..73f5cb181a45e 100644 --- a/component-starter-server/src/main/frontend/package-lock.json +++ b/component-starter-server/src/main/frontend/package-lock.json @@ -26,8 +26,8 @@ "react-ace": "^12.0.0", "react-dom": "^18.3.1", "react-i18next": "^13.5.0", - "react-router": "~6.3.0", - "react-router-dom": "~6.3.0", + "react-router": "~6.30.2", + "react-router-dom": "~6.30.2", "uuid": "^10.0.0" }, "devDependencies": { @@ -3703,6 +3703,14 @@ "url": "https://opencollective.com/popperjs" } }, + "node_modules/@remix-run/router": { + "version": "1.23.2", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.23.2.tgz", + "integrity": "sha512-Ic6m2U/rMjTkhERIa/0ZtXJP17QUi2CbWE7cqx4J58M8aA3QTfW+2UlQ4psvTX9IO1RfNVhK3pcpdjej7L+t2w==", + "engines": { + "node": ">=14.0.0" + } + }, "node_modules/@rooks/use-mutation-observer": { "version": "4.11.2", "license": "MIT", @@ -12125,14 +12133,6 @@ "he": "bin/he" } }, - "node_modules/history": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/history/-/history-5.3.0.tgz", - "integrity": "sha512-ZqaKwjjrAYUYfLG+htGaIIZ4nioX2L70ZUMIFysS3xvBsSG4x/n1V6TXV3N8ZYNuFGlDirFg32T7B6WOUPDYcQ==", - "dependencies": { - "@babel/runtime": "^7.7.6" - } - }, "node_modules/hosted-git-info": { "version": "2.8.9", "dev": true, @@ -19616,23 +19616,29 @@ } }, "node_modules/react-router": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.3.0.tgz", - "integrity": "sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==", + "version": "6.30.3", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.30.3.tgz", + "integrity": "sha512-XRnlbKMTmktBkjCLE8/XcZFlnHvr2Ltdr1eJX4idL55/9BbORzyZEaIkBFDhFGCEWBBItsVrDxwx3gnisMitdw==", "dependencies": { - "history": "^5.2.0" + "@remix-run/router": "1.23.2" + }, + "engines": { + "node": ">=14.0.0" }, "peerDependencies": { "react": ">=16.8" } }, "node_modules/react-router-dom": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.3.0.tgz", - "integrity": "sha512-uaJj7LKytRxZNQV8+RbzJWnJ8K2nPsOOEuX7aQstlMZKQT0164C+X2w6bnkqU3sjtLvpd5ojrezAyfZ1+0sStw==", + "version": "6.30.3", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.30.3.tgz", + "integrity": "sha512-pxPcv1AczD4vso7G4Z3TKcvlxK7g7TNt3/FNGMhfqyntocvYKj+GCatfigGDjbLozC4baguJ0ReCigoDJXb0ag==", "dependencies": { - "history": "^5.2.0", - "react-router": "6.3.0" + "@remix-run/router": "1.23.2", + "react-router": "6.30.3" + }, + "engines": { + "node": ">=14.0.0" }, "peerDependencies": { "react": ">=16.8", diff --git a/component-starter-server/src/main/frontend/package-template.json b/component-starter-server/src/main/frontend/package-template.json index cf513efb1d1fb..f6748e1d51f6f 100644 --- a/component-starter-server/src/main/frontend/package-template.json +++ b/component-starter-server/src/main/frontend/package-template.json @@ -21,8 +21,8 @@ "react-ace": "^12.0.0", "react-dom": "^18.3.1", "react-i18next": "^13.5.0", - "react-router": "~6.3.0", - "react-router-dom": "~6.3.0", + "react-router": "~6.30.2", + "react-router-dom": "~6.30.2", "uuid": "^10.0.0", "form-data": ">=4.0.4", "body-parser": "1.20.3", diff --git a/component-starter-server/src/main/frontend/package.json b/component-starter-server/src/main/frontend/package.json index cf513efb1d1fb..f6748e1d51f6f 100644 --- a/component-starter-server/src/main/frontend/package.json +++ b/component-starter-server/src/main/frontend/package.json @@ -21,8 +21,8 @@ "react-ace": "^12.0.0", "react-dom": "^18.3.1", "react-i18next": "^13.5.0", - "react-router": "~6.3.0", - "react-router-dom": "~6.3.0", + "react-router": "~6.30.2", + "react-router-dom": "~6.30.2", "uuid": "^10.0.0", "form-data": ">=4.0.4", "body-parser": "1.20.3", diff --git a/component-tools-webapp/src/main/frontend/package-lock.json b/component-tools-webapp/src/main/frontend/package-lock.json index 0429dcb82cb67..d5f15bd9a2fbf 100644 --- a/component-tools-webapp/src/main/frontend/package-lock.json +++ b/component-tools-webapp/src/main/frontend/package-lock.json @@ -32,7 +32,7 @@ "react": "^18.3.1", "react-dom": "^18.3.1", "react-redux": "^7.2.9", - "react-router-dom": "^6.24.1", + "react-router-dom": "^6.30.2", "redux": "^4.2.1", "redux-thunk": "2.4.2" }, @@ -3750,9 +3750,9 @@ "integrity": "sha512-1dgmkh+3so0+LlBWRhGA33ua4MYr7tUOj+a9Si28vUi0IUFNbff1T3sgpeDJI/LaC75bBYnQ0A3wXjn0OrRNBA==" }, "node_modules/@remix-run/router": { - "version": "1.17.1", - "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.17.1.tgz", - "integrity": "sha512-mCOMec4BKd6BRGBZeSnGiIgwsbLGp3yhVqAD8H+PxiRNEHgDpZb8J1TnrSDlg97t0ySKMQJTHCWBCmBpSmkF6Q==", + "version": "1.23.2", + "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.23.2.tgz", + "integrity": "sha512-Ic6m2U/rMjTkhERIa/0ZtXJP17QUi2CbWE7cqx4J58M8aA3QTfW+2UlQ4psvTX9IO1RfNVhK3pcpdjej7L+t2w==", "engines": { "node": ">=14.0.0" } @@ -18545,11 +18545,11 @@ } }, "node_modules/react-router": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.24.1.tgz", - "integrity": "sha512-PTXFXGK2pyXpHzVo3rR9H7ip4lSPZZc0bHG5CARmj65fTT6qG7sTngmb6lcYu1gf3y/8KxORoy9yn59pGpCnpg==", + "version": "6.30.3", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-6.30.3.tgz", + "integrity": "sha512-XRnlbKMTmktBkjCLE8/XcZFlnHvr2Ltdr1eJX4idL55/9BbORzyZEaIkBFDhFGCEWBBItsVrDxwx3gnisMitdw==", "dependencies": { - "@remix-run/router": "1.17.1" + "@remix-run/router": "1.23.2" }, "engines": { "node": ">=14.0.0" @@ -18559,12 +18559,12 @@ } }, "node_modules/react-router-dom": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.24.1.tgz", - "integrity": "sha512-U19KtXqooqw967Vw0Qcn5cOvrX5Ejo9ORmOtJMzYWtCT4/WOfFLIZGGsVLxcd9UkBO0mSTZtXqhZBsWlHr7+Sg==", + "version": "6.30.3", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.30.3.tgz", + "integrity": "sha512-pxPcv1AczD4vso7G4Z3TKcvlxK7g7TNt3/FNGMhfqyntocvYKj+GCatfigGDjbLozC4baguJ0ReCigoDJXb0ag==", "dependencies": { - "@remix-run/router": "1.17.1", - "react-router": "6.24.1" + "@remix-run/router": "1.23.2", + "react-router": "6.30.3" }, "engines": { "node": ">=14.0.0" diff --git a/component-tools-webapp/src/main/frontend/package-template.json b/component-tools-webapp/src/main/frontend/package-template.json index 642da59a7e506..6d79820fc8889 100644 --- a/component-tools-webapp/src/main/frontend/package-template.json +++ b/component-tools-webapp/src/main/frontend/package-template.json @@ -20,7 +20,7 @@ "react": "^18.3.1", "react-dom": "^18.3.1", "react-redux": "^7.2.9", - "react-router-dom": "^6.24.1", + "react-router-dom": "^6.30.2", "redux": "^4.2.1", "redux-thunk": "2.4.2", "asciidoctor": "3.0.4", @@ -34,7 +34,6 @@ "brace-expansion": "2.0.2", "formidable": "2.1.3", "postcss": "8.4.31" - }, "devDependencies": { "@talend/scripts-config-react-webpack": "^16.8.0", diff --git a/component-tools-webapp/src/main/frontend/package.json b/component-tools-webapp/src/main/frontend/package.json index 642da59a7e506..6d79820fc8889 100644 --- a/component-tools-webapp/src/main/frontend/package.json +++ b/component-tools-webapp/src/main/frontend/package.json @@ -20,7 +20,7 @@ "react": "^18.3.1", "react-dom": "^18.3.1", "react-redux": "^7.2.9", - "react-router-dom": "^6.24.1", + "react-router-dom": "^6.30.2", "redux": "^4.2.1", "redux-thunk": "2.4.2", "asciidoctor": "3.0.4", @@ -34,7 +34,6 @@ "brace-expansion": "2.0.2", "formidable": "2.1.3", "postcss": "8.4.31" - }, "devDependencies": { "@talend/scripts-config-react-webpack": "^16.8.0", diff --git a/pom.xml b/pom.xml index dbdedbb4732e4..20adde94e0b04 100644 --- a/pom.xml +++ b/pom.xml @@ -161,7 +161,7 @@ ${project.groupId}.runtime ${talend.build.name.base}.${project.artifactId} - 4.20 + 4.29 4.9 2.12.2 @@ -173,12 +173,12 @@ 8.0.14 1.2.15 2.0.27 - 9.0.109 + 9.0.113 3.5.11 6.5.0 - 1.5.18 + 1.5.19 1.2.19 1.1 1.1 @@ -297,8 +297,8 @@ 1.2.21 1.7.34 - 2.20.0 - 1.7.14 + 2.25.3 + 1.9.0 0.32 4.5.14 33.4.8-jre diff --git a/vault-client/pom.xml b/vault-client/pom.xml index 5dc9eff2bb5d4..fcf8c23cca721 100644 --- a/vault-client/pom.xml +++ b/vault-client/pom.xml @@ -14,83 +14,112 @@ limitations under the License. --> - 4.0.0 + 4.0.0 - - org.talend.sdk.component - component-runtime - 1.89.0-SNAPSHOT - + + org.talend.sdk.component + component-runtime + 1.89.0-SNAPSHOT + - vault-client + vault-client - Component Runtime :: Vault Client - Vault Client. + Component Runtime :: Vault Client + Vault Client. - - ${talend.build.name.base}.vault.client - + + ${talend.build.name.base}.vault.client + - - - org.apache.meecrowave - meecrowave-core - - - org.eclipse.microprofile.config - microprofile-config-api - - - org.apache.geronimo.config - geronimo-config-impl - - - org.apache.geronimo.specs - geronimo-activation_1.1_spec - test - - - org.apache.logging.log4j - log4j-slf4j-impl - ${log4j2.version} - - - org.apache.logging.log4j - log4j-web - ${log4j2.version} - - - org.apache.logging.log4j - log4j-api - ${log4j2.version} - - - org.apache.logging.log4j - log4j-core - ${log4j2.version} - - - org.apache.logging.log4j - log4j-jul - ${log4j2.version} - - - - org.apache.geronimo.specs - geronimo-jcache_1.0_spec - 1.0-alpha-1 - - - org.apache.geronimo - geronimo-jcache-simple - 1.0.5 - - - - org.apache.meecrowave - meecrowave-junit - ${meecrowave.version} - test - - - + + + org.apache.meecrowave + meecrowave-core + + + org.apache.xbean + xbean-finder-shaded + + + org.apache.xbean + xbean-asm9-shaded + + + org.apache.xbean + xbean-reflect + + + + + org.apache.xbean + xbean-finder-shaded + ${xbean.version} + + + org.apache.xbean + xbean-asm9-shaded + ${xbean.version} + + + org.apache.xbean + xbean-reflect + ${xbean.version} + + + org.eclipse.microprofile.config + microprofile-config-api + + + org.apache.geronimo.config + geronimo-config-impl + + + org.apache.geronimo.specs + geronimo-activation_1.1_spec + test + + + org.apache.logging.log4j + log4j-slf4j-impl + ${log4j2.version} + + + org.apache.logging.log4j + log4j-web + ${log4j2.version} + + + org.apache.logging.log4j + log4j-api + ${log4j2.version} + + + org.apache.logging.log4j + log4j-core + ${log4j2.version} + + + org.apache.logging.log4j + log4j-jul + ${log4j2.version} + + + + org.apache.geronimo.specs + geronimo-jcache_1.0_spec + 1.0-alpha-1 + + + org.apache.geronimo + geronimo-jcache-simple + 1.0.5 + + + + org.apache.meecrowave + meecrowave-junit + ${meecrowave.version} + test + + + \ No newline at end of file