From 8866e7b6366e47af6e3e0a5d95e1dd8e49d5b2d1 Mon Sep 17 00:00:00 2001 From: Thorsten Scherler Date: Fri, 28 Oct 2022 15:18:53 +0200 Subject: [PATCH 01/10] [yarn2] add profile for yarn 2 which do not support the mutex argunment anymore Signed-off-by: Thorsten Scherler --- pom.xml | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/pom.xml b/pom.xml index dca136393f..ee77d11a56 100644 --- a/pom.xml +++ b/pom.xml @@ -1361,6 +1361,73 @@ + + yarn2-execution + + + .mvn_exec_yarn2 + + + + + + com.github.eirslett + frontend-maven-plugin + ${frontend-version} + + + + + install node and yarn + + install-node-and-yarn + + initialize + + v${node.version} + v${yarn.version} + ${nodeDownloadRoot} + + + + + + yarn install + + yarn + + initialize + + + + yarn mvnbuild + + yarn + + generate-sources + + + run mvnbuild + + + + + yarn mvntest + + yarn + + test + + + run mvntest + + + + + + + + clean-node From 7556d863d9cd6780d432567369c543b16ca44779 Mon Sep 17 00:00:00 2001 From: Thorsten Scherler Date: Mon, 31 Oct 2022 15:52:55 +0100 Subject: [PATCH 02/10] [yarn2] remove the target but set a default argument that can be overridden Signed-off-by: Thorsten Scherler --- pom.xml | 2796 +++++++++++++++++++++++++++---------------------------- 1 file changed, 1366 insertions(+), 1430 deletions(-) diff --git a/pom.xml b/pom.xml index ee77d11a56..85bfb94315 100644 --- a/pom.xml +++ b/pom.xml @@ -22,528 +22,533 @@ ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ~ THE SOFTWARE. --> - - 4.0.0 + + 4.0.0 - org.jenkins-ci.plugins - plugin - 4.49-SNAPSHOT - pom + org.jenkins-ci.plugins + plugin + 4.49-SNAPSHOT + pom - Jenkins Plugin Parent POM - The Jenkins Plugins Parent POM Project - 2016 + Jenkins Plugin Parent POM + The Jenkins Plugins Parent POM Project + 2016 - - scm:git:https://github.com/jenkinsci/plugin-pom.git - scm:git:git@github.com:jenkinsci/plugin-pom.git - HEAD - https://github.com/jenkinsci/plugin-pom - + + scm:git:https://github.com/jenkinsci/plugin-pom.git + scm:git:git@github.com:jenkinsci/plugin-pom.git + HEAD + https://github.com/jenkinsci/plugin-pom + - - - false - maven.jenkins-ci.org - https://repo.jenkins-ci.org/releases/ - - - maven.jenkins-ci.org - https://repo.jenkins-ci.org/snapshots/ - - + + + false + maven.jenkins-ci.org + https://repo.jenkins-ci.org/releases/ + + + maven.jenkins-ci.org + https://repo.jenkins-ci.org/snapshots/ + + - - UTF-8 - UTF-8 - UTF-8 + + UTF-8 + UTF-8 + UTF-8 - - true + + true - - - -Xms768M -Xmx768M -XX:+HeapDumpOnOutOfMemoryError -XX:+TieredCompilation -XX:TieredStopAtLevel=1 @{jenkins.addOpens} @{jenkins.insaneHook} + + + -Xms768M -Xmx768M -XX:+HeapDumpOnOutOfMemoryError -XX:+TieredCompilation -XX:TieredStopAtLevel=1 @{jenkins.addOpens} @{jenkins.insaneHook} - 2.249 - ${jenkins.version} + 2.249 + ${jenkins.version} - - - 1868.v03b_7c6673e2e + + + 1868.v03b_7c6673e2e - 3.35 - 1.20 + 3.35 + 1.20 - - Medium - - Default + Medium + + Default - - true - - true + + true + + true - you-must-override-the-node.version-property - you-must-override-the-npm.version-property - 0.23.0 - 1.12.1 - https://repo.jenkins-ci.org/nodejs-dist/ - https://repo.jenkins-ci.org/npm-dist/ + you-must-override-the-node.version-property + you-must-override-the-npm.version-property + 0.23.0 + + + + ---mutex network + 1.12.1 + https://repo.jenkins-ci.org/nodejs-dist/ + https://repo.jenkins-ci.org/npm-dist/ - - + + - - + + - - + + - - true + + true - 4.8.1 - 1.27 - 1.22 + 4.8.1 + 1.27 + 1.22 - - false - https://repo.jenkins-ci.org/incrementals/ - HEAD - - ${project.build.directory}/tmp - + + false + https://repo.jenkins-ci.org/incrementals/ + HEAD + + ${project.build.directory}/tmp + - - - - org.jenkins-ci.main - jenkins-bom - ${jenkins-bom.version} - pom - import - - - org.jenkins-ci.main - jenkins-core - ${jenkins.version} - - - javax.servlet - servlet-api - - - - - org.jenkins-ci.main - jenkins-war - ${jenkins.version} - executable-war - test - - - javax.servlet - servlet-api - - - - - org.jenkins-ci.main - jenkins-test-harness - ${jenkins-test-harness.version} - - - - - javax.servlet - javax.servlet-api - 3.1.0 - - - junit - junit - 4.13.2 - - - org.junit - junit-bom - 5.9.1 - pom - import - - - org.codehaus.mojo - animal-sniffer-annotations - ${animal.sniffer.version} - - - org.codehaus.mojo.signature - java18 - 1.0 - signature - - - org.hamcrest - hamcrest-core - 2.2 - - - org.jenkins-ci - test-annotations - 1.4 - - - org.mockito - mockito-bom - ${mockito.version} - pom - import - - - org.objenesis - objenesis - 3.3 - - - + + + + org.jenkins-ci.main + jenkins-bom + ${jenkins-bom.version} + pom + import + + + org.jenkins-ci.main + jenkins-core + ${jenkins.version} + + + javax.servlet + servlet-api + + + + + org.jenkins-ci.main + jenkins-war + ${jenkins.version} + executable-war + test + + + javax.servlet + servlet-api + + + + + org.jenkins-ci.main + jenkins-test-harness + ${jenkins-test-harness.version} + + + + + javax.servlet + javax.servlet-api + 3.1.0 + + + junit + junit + 4.13.2 + + + org.junit + junit-bom + 5.9.1 + pom + import + + + org.codehaus.mojo + animal-sniffer-annotations + ${animal.sniffer.version} + + + org.codehaus.mojo.signature + java18 + 1.0 + signature + + + org.hamcrest + hamcrest-core + 2.2 + + + org.jenkins-ci + test-annotations + 1.4 + + + org.mockito + mockito-bom + ${mockito.version} + pom + import + + + org.objenesis + objenesis + 3.3 + + + - - - - org.jenkins-ci.main - jenkins-core - provided - - - - org.jenkins-ci.main - jenkins-war - executable-war - test - + + + + org.jenkins-ci.main + jenkins-core + provided + + + + org.jenkins-ci.main + jenkins-war + executable-war + test + - - - javax.servlet - javax.servlet-api - provided - + + + javax.servlet + javax.servlet-api + provided + - - - net.jcip - jcip-annotations - provided - true - + + + net.jcip + jcip-annotations + provided + true + - - - - org.codehaus.mojo - animal-sniffer-annotations - provided - true - - - - - commons-logging - commons-logging - provided - + + + + org.codehaus.mojo + animal-sniffer-annotations + provided + true + + + + + commons-logging + commons-logging + provided + - - org.jenkins-ci.main - jenkins-test-harness - test - - - org.jenkins-ci - test-annotations - test - - - org.junit.jupiter - junit-jupiter - test - - - org.junit.vintage - junit-vintage-engine - test - - + + org.jenkins-ci.main + jenkins-test-harness + test + + + org.jenkins-ci + test-annotations + test + + + org.junit.jupiter + junit-jupiter + test + + + org.junit.vintage + junit-vintage-engine + test + + - - - repo.jenkins-ci.org - https://repo.jenkins-ci.org/public/ - - + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + - - - repo.jenkins-ci.org - https://repo.jenkins-ci.org/public/ - - + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + - - - ${project.artifactId} - - - - maven-antrun-plugin - 3.1.0 - - - maven-clean-plugin - 3.2.0 - - - maven-compiler-plugin - 3.10.1 - - - maven-dependency-plugin - 3.3.0 - - - maven-jar-plugin - 3.3.0 - - - maven-resources-plugin - 3.3.0 - - - maven-surefire-plugin - 3.0.0-M7 - - - maven-failsafe-plugin - 3.0.0-M7 - - - maven-deploy-plugin - 3.0.0 - - - maven-enforcer-plugin - 3.1.0 - - - maven-install-plugin - 3.0.1 - - - maven-javadoc-plugin - 3.4.1 - - true - - https://javadoc.jenkins.io/ - - all,-missing - en_US - - - - maven-release-plugin - 3.0.0-M6 - - - maven-site-plugin - 3.12.1 - - - maven-project-info-reports-plugin - 3.4.1 - - - maven-source-plugin - 3.2.1 - - - maven-war-plugin - 3.3.2 - - - maven-eclipse-plugin - 2.10 - - - target/eclipse-classes - - - org.eclipse.jdt.groovy.core.groovyNature - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - 2.1.0 - - - org.codehaus.mojo - build-helper-maven-plugin - 3.3.0 - - - add-source - - add-source - - generate-sources - - - ${project.build.directory}/generated-sources/localizer - - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.8 - - - org.kohsuke.stapler - maven-stapler-plugin - ${stapler-plugin.version} - - - org.jenkins-ci.tools - maven-hpi-plugin - ${hpi-plugin.version} - - - org.codehaus.mojo - animal-sniffer-maven-plugin - ${animal.sniffer.version} - - - org.jvnet.localizer - localizer-maven-plugin - 1.31 - - - org.kohsuke - access-modifier-checker - ${access-modifier-checker.version} - - - com.cloudbees - maven-license-plugin - 1.15 - - - - io.jenkins.tools.incrementals - incrementals-maven-plugin - 1.4 - - - org.jenkins-ci.* - io.jenkins.* - - false - false - - - - com.github.spotbugs - spotbugs-maven-plugin - 4.2.3 - - - - - - maven-jar-plugin - - - maybe-test-jar - - test-jar - - - - the.hpl - InjectedTest.class - test-dependencies/ - - ${no-test-jar} - - - - - - maven-enforcer-plugin - - - org.codehaus.mojo - extra-enforcer-rules - 1.6.1 - - - - - display-info - - display-info - enforce - - validate - - - - [3.8.1,) - 3.8.1 required to no longer download dependencies via HTTP (use HTTPS instead). - - - [1.8.0,) - - + org.eclipse.jdt.groovy.core.groovyNature + + + + + org.codehaus.gmavenplus + gmavenplus-plugin + 2.1.0 + + + org.codehaus.mojo + build-helper-maven-plugin + 3.3.0 + + + add-source + + add-source + + generate-sources + + + ${project.build.directory}/generated-sources/localizer + + + + + + + org.jacoco + jacoco-maven-plugin + 0.8.8 + + + org.kohsuke.stapler + maven-stapler-plugin + ${stapler-plugin.version} + + + org.jenkins-ci.tools + maven-hpi-plugin + ${hpi-plugin.version} + + + org.codehaus.mojo + animal-sniffer-maven-plugin + ${animal.sniffer.version} + + + org.jvnet.localizer + localizer-maven-plugin + 1.31 + + + org.kohsuke + access-modifier-checker + ${access-modifier-checker.version} + + + com.cloudbees + maven-license-plugin + 1.15 + + + + io.jenkins.tools.incrementals + incrementals-maven-plugin + 1.4 + + + org.jenkins-ci.* + io.jenkins.* + + false + false + + + + com.github.spotbugs + spotbugs-maven-plugin + 4.2.3 + + + + + + maven-jar-plugin + + + maybe-test-jar + + test-jar + + + + the.hpl + InjectedTest.class + test-dependencies/ + + ${no-test-jar} + + + + + + maven-enforcer-plugin + + + org.codehaus.mojo + extra-enforcer-rules + 1.6.1 + + + + + display-info + + display-info + enforce + + validate + + + + [3.8.1,) + 3.8.1 required to no longer download dependencies via HTTP (use HTTPS instead). + + + [1.8.0,) + + - - 1.8 - - test - - - - org.jenkins-ci.main:jenkins-core - org.jenkins-ci.main:cli - org.jenkins-ci.main:jenkins-test-harness - org.jenkins-ci.main:remoting - org.kohsuke.stapler:stapler - org.kohsuke.stapler:stapler-groovy - org.kohsuke.stapler:stapler-jelly - org.kohsuke.stapler:stapler-jrebel - org.jenkins-ci:task-reactor - - com.google.code.findbugs:annotations - com.github.spotbugs:spotbugs-annotations - - + org.jenkins-ci.main:jenkins-core + org.jenkins-ci.main:cli + org.jenkins-ci.main:jenkins-test-harness + org.jenkins-ci.main:remoting + org.kohsuke.stapler:stapler + org.kohsuke.stapler:stapler-groovy + org.kohsuke.stapler:stapler-jelly + org.kohsuke.stapler:stapler-jrebel + org.jenkins-ci:task-reactor + + com.google.code.findbugs:annotations + com.github.spotbugs:spotbugs-annotations + + - - - - javax.servlet:servlet-api - org.sonatype.sisu:sisu-guice - log4j:log4j:*:jar:compile - log4j:log4j:*:jar:runtime - commons-logging:commons-logging:*:jar:compile - commons-logging:commons-logging:*:jar:runtime + + + + javax.servlet:servlet-api + org.sonatype.sisu:sisu-guice + log4j:log4j:*:jar:compile + log4j:log4j:*:jar:runtime + commons-logging:commons-logging:*:jar:compile + commons-logging:commons-logging:*:jar:runtime - - org.apache.logging.log4j:*:(,2.15.0-rc1] + + org.apache.logging.log4j:*:(,2.15.0-rc1] - - org.testng:testng - - - - - com.google.code.findbugs:annotations - com.google.code.findbugs:jsr305 - com.google.guava:guava - commons-logging:commons-logging - javax.servlet:javax.servlet-api - javax.servlet:servlet-api - net.java.dev.jna:jna - org.kohsuke:access-modifier-annotation - + org.testng:testng + + + + + com.google.code.findbugs:annotations + com.google.code.findbugs:jsr305 + com.google.guava:guava + commons-logging:commons-logging + javax.servlet:javax.servlet-api + javax.servlet:servlet-api + net.java.dev.jna:jna + org.kohsuke:access-modifier-annotation + - com.github.spotbugs:spotbugs-annotations - - org.ow2.asm:asm - - - - - - - no-snapshots-in-release - - enforce - - validate - - - - - No SNAPSHOT versions are allowed for releases - true - - false - - - - - - - - com.github.spotbugs - spotbugs-maven-plugin - - ${spotbugs.failOnError} - - - - spotbugs - - check - - verify - - - - true - false - ${spotbugs.effort} - ${spotbugs.threshold} - - - - - - org.codehaus.mojo - animal-sniffer-maven-plugin - - - org.codehaus.mojo.signature - java18 - - - - - check - - check - - test - - - - - maven-eclipse-plugin - - - org.jenkins-ci.tools - maven-hpi-plugin - true - - true - - /jenkins - - - ${hudson.Main.development} - - - - - org.kohsuke.stapler - maven-stapler-plugin - - - maven-release-plugin - - forked-path - false - clean install - deploy - ${arguments} - jenkins-release,!consume-incrementals,${releaseProfiles} - - - - org.jvnet.localizer - localizer-maven-plugin - - - - generate - - - Messages.properties - target/generated-sources/localizer - true - - - - - - org.kohsuke - access-modifier-checker - - - - useBeta - ${useBeta} - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - ${project.build.directory}/generated-test-sources/groovy-stubs - - - - test-in-groovy - - addTestSources - generateTestStubs - compileTests - - - - - - - maven-antrun-plugin - - - createTempDir - - run - - generate-test-resources - - - - - - - - - - maven-surefire-plugin - - - -1 - ${surefireTempDir} - true - - alphabetical - false - - - - maven-failsafe-plugin - - - -1 - ${surefireTempDir} - true - - alphabetical - false - - - - com.cloudbees - maven-license-plugin - - - - process - - prepare-package - - - target/${project.artifactId}/WEB-INF/licenses.xml - + No SNAPSHOT versions are allowed for releases + true + + false + + + + + + + + com.github.spotbugs + spotbugs-maven-plugin + + ${spotbugs.failOnError} + + + + spotbugs + + check + + verify + + + + true + false + ${spotbugs.effort} + ${spotbugs.threshold} + + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + + org.codehaus.mojo.signature + java18 + + + + + check + + check + + test + + + + + maven-eclipse-plugin + + + org.jenkins-ci.tools + maven-hpi-plugin + true + + true + + /jenkins + + + ${hudson.Main.development} + + + + + org.kohsuke.stapler + maven-stapler-plugin + + + maven-release-plugin + + forked-path + false + clean install + deploy + ${arguments} + jenkins-release,!consume-incrementals,${releaseProfiles} + + + + org.jvnet.localizer + localizer-maven-plugin + + + + generate + + + Messages.properties + target/generated-sources/localizer + true + + + + + + org.kohsuke + access-modifier-checker + + + + useBeta + ${useBeta} + + + + + + org.codehaus.gmavenplus + gmavenplus-plugin + + + ${project.build.directory}/generated-test-sources/groovy-stubs + + + + test-in-groovy + + addTestSources + generateTestStubs + compileTests + + + + + + + maven-antrun-plugin + + + createTempDir + + run + + generate-test-resources + + + + + + + + + + maven-surefire-plugin + + + -1 + ${surefireTempDir} + true + + alphabetical + false + + + + maven-failsafe-plugin + + + -1 + ${surefireTempDir} + true + + alphabetical + false + + + + com.cloudbees + maven-license-plugin + + + + process + + prepare-package + + + target/${project.artifactId}/WEB-INF/licenses.xml + - - - - + + + + - - - org.codehaus.mojo - mrm-maven-plugin - 1.4.1 - false - - - - start - stop - - - repository.proxy.url - - - - - - - - - maven-invoker-plugin - 3.3.0 - false - - - integration-test - - install - run - - - true - true - ${project.build.directory}/its - ${basedir}/target/local-repo - src/it/settings.xml - - ${repository.proxy.url} - - - - - - - + + + org.codehaus.mojo + mrm-maven-plugin + 1.4.1 + false + + + + start + stop + + + repository.proxy.url + + + + + + + + + maven-invoker-plugin + 3.3.0 + false + + + integration-test + + install + run + + + true + true + ${project.build.directory}/its + ${basedir}/target/local-repo + src/it/settings.xml + + ${repository.proxy.url} + + + + + + + - - - jdk-8-and-below - - (,1.8] - - - 1.8 - 1.8 - 1.8 - 1.8 - - - - - - jdk-9-and-above - - [9,) - - - - 8 - 8 - - true - - true - - --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED - - + + + + + jdk-9-and-above + + [9,) + + + + 8 + 8 + + true + + true + + --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED + + - - - - maven-enforcer-plugin - - - display-info - - - - 11 - - - - - - - - - - - jenkins-release - - ${release.skipTests} - ${release.skipTests} - ${release.skipTests} - - - - - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - attach-test-sources - - test-jar-no-fork - - - ${no-test-jar} - - - - - - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - - - only-eclipse - - - m2e.version - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - [1.0,) - - display-info - - - - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - [1.0,) - - compileTests - generateTestStubs - - - - - - - - - - - - - - - - always-check-remote-repositories - - always - - - - skip-node-tests - - - skipTests - true - - - - --skipTests --skipLint - - - - skip-node-lint - - - skipLint - true - - - - --skipLint - - - - spotbugs-exclusion-file - - - ${basedir}/src/spotbugs/excludesFilter.xml - - - - - - com.github.spotbugs - spotbugs-maven-plugin - - - spotbugs - - ${project.basedir}/src/spotbugs/excludesFilter.xml - - - - - - - - - all-tests - - - !test - - - - true - - - - specific-test - - - test - - - - false - - - - enable-jacoco - - - - org.jacoco - jacoco-maven-plugin - - - **/Messages.class - - com/gargoylesoftware/** - - - - - - prepare-agent - - - - report - - report - - - - - - - - - node-execution - - - .mvn_exec_node - - - - - - com.github.eirslett - frontend-maven-plugin - ${frontend-version} + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + [1.0,) + + display-info + + + + + + + + + org.codehaus.gmavenplus + gmavenplus-plugin + [1.0,) + + compileTests + generateTestStubs + + + + + + + + + + + + + + + + always-check-remote-repositories + + always + + + + skip-node-tests + + + skipTests + true + + + + --skipTests --skipLint + + + + skip-node-lint + + + skipLint + true + + + + --skipLint + + + + spotbugs-exclusion-file + + + ${basedir}/src/spotbugs/excludesFilter.xml + + + + + + com.github.spotbugs + spotbugs-maven-plugin + + + spotbugs + + ${project.basedir}/src/spotbugs/excludesFilter.xml + + + + + + + + + all-tests + + + !test + + + + true + + + + specific-test + + + test + + + + false + + + + enable-jacoco + + + + org.jacoco + jacoco-maven-plugin + + + **/Messages.class + + com/gargoylesoftware/** + + + + + + prepare-agent + + + + report + + report + + + + + + + + + node-execution + + + .mvn_exec_node + + + + + + com.github.eirslett + frontend-maven-plugin + ${frontend-version} - + - - install node and npm - - install-node-and-npm - - initialize - - v${node.version} - ${npm.version} - ${nodeDownloadRoot} - ${npmDownloadRoot} - - + + install node and npm + + install-node-and-npm + + initialize + + v${node.version} + ${npm.version} + ${nodeDownloadRoot} + ${npmDownloadRoot} + + - - npm install - - npm - - initialize - - - install ${npm.loglevel} - - + + npm install + + npm + + initialize + + + install ${npm.loglevel} + + - - npm mvnbuild - - npm - - generate-sources - - - run mvnbuild - - + + npm mvnbuild + + npm + + generate-sources + + + run mvnbuild + + - - npm mvntest - - npm - - test - - - run mvntest - - + + npm mvntest + + npm + + test + + + run mvntest + + - - - - - + + + + + - - yarn-execution - - - .mvn_exec_yarn - - - - - - com.github.eirslett - frontend-maven-plugin - ${frontend-version} + + yarn-execution + + + .mvn_exec_yarn + + + + + + com.github.eirslett + frontend-maven-plugin + ${frontend-version} - + - - install node and yarn - - install-node-and-yarn - - initialize - - v${node.version} - v${yarn.version} - ${nodeDownloadRoot} - - - + + install node and yarn + + install-node-and-yarn + + initialize + + v${node.version} + v${yarn.version} + ${nodeDownloadRoot} + + + - - yarn install - - yarn - - initialize - - - - --mutex network - - + + yarn install + + yarn + + initialize + + ${yarn.args} + + - - yarn mvnbuild - - yarn - - generate-sources - - - run mvnbuild - - - - - yarn mvntest - - yarn - - test - - - run mvntest - - - - - - - - - - yarn2-execution - - - .mvn_exec_yarn2 - - - - - - com.github.eirslett - frontend-maven-plugin - ${frontend-version} - - - - - install node and yarn - - install-node-and-yarn - - initialize - - v${node.version} - v${yarn.version} - ${nodeDownloadRoot} - - - + + yarn mvnbuild + + yarn + + generate-sources + + + run mvnbuild + + - - yarn install - - yarn - - initialize - + + yarn mvntest + + yarn + + test + + + run mvntest + + - - yarn mvnbuild - - yarn - - generate-sources - - - run mvnbuild - - - - - yarn mvntest - - yarn - - test - - - run mvntest - - - - - - - - - - clean-node - - - cleanNode - - - package.json - - - - - - org.apache.maven.plugins - maven-clean-plugin - - - - node - false - - - node_modules - false - - - - - - - - - - consume-incrementals - - - - false - - incrementals - ${incrementals.url} - - - - - - false - - incrementals - ${incrementals.url} - - - - - might-produce-incrementals - - - - org.codehaus.mojo - flatten-maven-plugin - 1.3.0 - - true - - - - flatten - - flatten - - process-resources - - oss - ${project.build.directory} - ${project.artifactId}-${project.version}.pom - - - - - - maven-enforcer-plugin - - - io.jenkins.tools.incrementals - incrementals-enforcer-rules - 1.4 - - - - - display-info - - - - [1.0-beta-4,) - - - - - - - - maven-release-plugin - - incrementals:reincrementalify - - - - - - - produce-incrementals - - - set.changelist - true - - - - - incrementals - ${incrementals.url} - - - - - - - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - attach-test-sources - - test-jar-no-fork - - - ${no-test-jar} - - - - - - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - - - - block-MRP - - - changelist.format - - - - - - maven-release-plugin - - not-set-up-for-MRP - - - - - - - - jmh-benchmark - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*Benchmark.java - **/Benchmark*.java - - - - - - + + + + + + + clean-node + + + cleanNode + + + package.json + + + + + + org.apache.maven.plugins + maven-clean-plugin + + + + node + false + + + node_modules + false + + + + + + + + + + consume-incrementals + + + + false + + incrementals + ${incrementals.url} + + + + + + false + + incrementals + ${incrementals.url} + + + + + might-produce-incrementals + + + + org.codehaus.mojo + flatten-maven-plugin + 1.3.0 + + true + + + + flatten + + flatten + + process-resources + + oss + ${project.build.directory} + ${project.artifactId}-${project.version}.pom + + + + + + maven-enforcer-plugin + + + io.jenkins.tools.incrementals + incrementals-enforcer-rules + 1.4 + + + + + display-info + + + + [1.0-beta-4,) + + + + + + + + maven-release-plugin + + incrementals:reincrementalify + + + + + + + produce-incrementals + + + set.changelist + true + + + + + incrementals + ${incrementals.url} + + + + + + + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + attach-test-sources + + test-jar-no-fork + + + ${no-test-jar} + + + + + + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + + + + + block-MRP + + + changelist.format + + + + + + maven-release-plugin + + not-set-up-for-MRP + + + + + + + + jmh-benchmark + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*Benchmark.java + **/Benchmark*.java + + + + + + - - - quick-build - - - true - true - true - true - true - true - true - true - - - + + + quick-build + + + true + true + true + true + true + true + true + true + + + From b7b5e4efdae95d019116d40903c4acb16077bf9a Mon Sep 17 00:00:00 2001 From: Thorsten Scherler Date: Wed, 2 Nov 2022 12:06:36 +0100 Subject: [PATCH 03/10] [yarn2] fix formating Signed-off-by: Thorsten Scherler --- pom.xml | 2731 +++++++++++++++++++++++++++---------------------------- 1 file changed, 1365 insertions(+), 1366 deletions(-) diff --git a/pom.xml b/pom.xml index 85bfb94315..f0905156b7 100644 --- a/pom.xml +++ b/pom.xml @@ -22,533 +22,532 @@ ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN ~ THE SOFTWARE. --> - - 4.0.0 + + 4.0.0 - org.jenkins-ci.plugins - plugin - 4.49-SNAPSHOT - pom + org.jenkins-ci.plugins + plugin + 4.49-SNAPSHOT + pom - Jenkins Plugin Parent POM - The Jenkins Plugins Parent POM Project - 2016 + Jenkins Plugin Parent POM + The Jenkins Plugins Parent POM Project + 2016 - - scm:git:https://github.com/jenkinsci/plugin-pom.git - scm:git:git@github.com:jenkinsci/plugin-pom.git - HEAD - https://github.com/jenkinsci/plugin-pom - + + scm:git:https://github.com/jenkinsci/plugin-pom.git + scm:git:git@github.com:jenkinsci/plugin-pom.git + HEAD + https://github.com/jenkinsci/plugin-pom + - - - false - maven.jenkins-ci.org - https://repo.jenkins-ci.org/releases/ - - - maven.jenkins-ci.org - https://repo.jenkins-ci.org/snapshots/ - - + + + false + maven.jenkins-ci.org + https://repo.jenkins-ci.org/releases/ + + + maven.jenkins-ci.org + https://repo.jenkins-ci.org/snapshots/ + + - - UTF-8 - UTF-8 - UTF-8 + + UTF-8 + UTF-8 + UTF-8 - - true + + true - - - -Xms768M -Xmx768M -XX:+HeapDumpOnOutOfMemoryError -XX:+TieredCompilation -XX:TieredStopAtLevel=1 @{jenkins.addOpens} @{jenkins.insaneHook} + + + -Xms768M -Xmx768M -XX:+HeapDumpOnOutOfMemoryError -XX:+TieredCompilation -XX:TieredStopAtLevel=1 @{jenkins.addOpens} @{jenkins.insaneHook} - 2.249 - ${jenkins.version} + 2.249 + ${jenkins.version} - - - 1868.v03b_7c6673e2e + + + 1868.v03b_7c6673e2e - 3.35 - 1.20 + 3.35 + 1.20 - - Medium - - Default - - - true - - true + Medium + + Default - you-must-override-the-node.version-property - you-must-override-the-npm.version-property - 0.23.0 - - - - ---mutex network - 1.12.1 - https://repo.jenkins-ci.org/nodejs-dist/ - https://repo.jenkins-ci.org/npm-dist/ + + true + + true - - + you-must-override-the-node.version-property + you-must-override-the-npm.version-property + 0.23.0 + + + + ---mutex network + 1.12.1 + https://repo.jenkins-ci.org/nodejs-dist/ + https://repo.jenkins-ci.org/npm-dist/ - - + + - - + + - - true + + - 4.8.1 - 1.27 - 1.22 + + true - - false - https://repo.jenkins-ci.org/incrementals/ - HEAD - - ${project.build.directory}/tmp - + 4.8.1 + 1.27 + 1.22 - - - - org.jenkins-ci.main - jenkins-bom - ${jenkins-bom.version} - pom - import - - - org.jenkins-ci.main - jenkins-core - ${jenkins.version} - - - javax.servlet - servlet-api - - - - - org.jenkins-ci.main - jenkins-war - ${jenkins.version} - executable-war - test - - - javax.servlet - servlet-api - - - - - org.jenkins-ci.main - jenkins-test-harness - ${jenkins-test-harness.version} - - - - - javax.servlet - javax.servlet-api - 3.1.0 - - - junit - junit - 4.13.2 - - - org.junit - junit-bom - 5.9.1 - pom - import - - - org.codehaus.mojo - animal-sniffer-annotations - ${animal.sniffer.version} - - - org.codehaus.mojo.signature - java18 - 1.0 - signature - - - org.hamcrest - hamcrest-core - 2.2 - - - org.jenkins-ci - test-annotations - 1.4 - - - org.mockito - mockito-bom - ${mockito.version} - pom - import - - - org.objenesis - objenesis - 3.3 - - - + + false + https://repo.jenkins-ci.org/incrementals/ + HEAD + + ${project.build.directory}/tmp + + - - - org.jenkins-ci.main - jenkins-core - provided - - - - org.jenkins-ci.main - jenkins-war - executable-war - test - - - - + + org.jenkins-ci.main + jenkins-bom + ${jenkins-bom.version} + pom + import + + + org.jenkins-ci.main + jenkins-core + ${jenkins.version} + + + javax.servlet + servlet-api + + + + + org.jenkins-ci.main + jenkins-war + ${jenkins.version} + executable-war + test + + javax.servlet - javax.servlet-api - provided - + servlet-api + + + + + org.jenkins-ci.main + jenkins-test-harness + ${jenkins-test-harness.version} + + + + + javax.servlet + javax.servlet-api + 3.1.0 + + + junit + junit + 4.13.2 + + + org.junit + junit-bom + 5.9.1 + pom + import + + + org.codehaus.mojo + animal-sniffer-annotations + ${animal.sniffer.version} + + + org.codehaus.mojo.signature + java18 + 1.0 + signature + + + org.hamcrest + hamcrest-core + 2.2 + + + org.jenkins-ci + test-annotations + 1.4 + + + org.mockito + mockito-bom + ${mockito.version} + pom + import + + + org.objenesis + objenesis + 3.3 + + + - - - net.jcip - jcip-annotations - provided - true - + + + + org.jenkins-ci.main + jenkins-core + provided + + + + org.jenkins-ci.main + jenkins-war + executable-war + test + - - - - org.codehaus.mojo - animal-sniffer-annotations - provided - true - - - - - commons-logging - commons-logging - provided - + + + javax.servlet + javax.servlet-api + provided + - - org.jenkins-ci.main - jenkins-test-harness - test - - - org.jenkins-ci - test-annotations - test - - - org.junit.jupiter - junit-jupiter - test - - - org.junit.vintage - junit-vintage-engine - test - - + + + net.jcip + jcip-annotations + provided + true + - - - repo.jenkins-ci.org - https://repo.jenkins-ci.org/public/ - - + + + + org.codehaus.mojo + animal-sniffer-annotations + provided + true + + + + + commons-logging + commons-logging + provided + - - - repo.jenkins-ci.org - https://repo.jenkins-ci.org/public/ - - + + org.jenkins-ci.main + jenkins-test-harness + test + + + org.jenkins-ci + test-annotations + test + + + org.junit.jupiter + junit-jupiter + test + + + org.junit.vintage + junit-vintage-engine + test + + + + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + + + + + repo.jenkins-ci.org + https://repo.jenkins-ci.org/public/ + + - - - ${project.artifactId} - - - - maven-antrun-plugin - 3.1.0 - - - maven-clean-plugin - 3.2.0 - - - maven-compiler-plugin - 3.10.1 - - - maven-dependency-plugin - 3.3.0 - - - maven-jar-plugin - 3.3.0 - - - maven-resources-plugin - 3.3.0 - - - maven-surefire-plugin - 3.0.0-M7 - - - maven-failsafe-plugin - 3.0.0-M7 - - - maven-deploy-plugin - 3.0.0 - - - maven-enforcer-plugin - 3.1.0 - - - maven-install-plugin - 3.0.1 - - - maven-javadoc-plugin - 3.4.1 - - true - - https://javadoc.jenkins.io/ - - all,-missing - en_US - - - - maven-release-plugin - 3.0.0-M6 - - - maven-site-plugin - 3.12.1 - - - maven-project-info-reports-plugin - 3.4.1 - - - maven-source-plugin - 3.2.1 - - - maven-war-plugin - 3.3.2 - - - maven-eclipse-plugin - 2.10 - - - target/eclipse-classes - - - org.eclipse.jdt.groovy.core.groovyNature - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - 2.1.0 - - - org.codehaus.mojo - build-helper-maven-plugin - 3.3.0 - - - add-source - - add-source - - generate-sources - - - ${project.build.directory}/generated-sources/localizer - - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.8 - - - org.kohsuke.stapler - maven-stapler-plugin - ${stapler-plugin.version} - - - org.jenkins-ci.tools - maven-hpi-plugin - ${hpi-plugin.version} - - - org.codehaus.mojo - animal-sniffer-maven-plugin - ${animal.sniffer.version} - - - org.jvnet.localizer - localizer-maven-plugin - 1.31 - - - org.kohsuke - access-modifier-checker - ${access-modifier-checker.version} - - - com.cloudbees - maven-license-plugin - 1.15 - - - - io.jenkins.tools.incrementals - incrementals-maven-plugin - 1.4 - - - org.jenkins-ci.* - io.jenkins.* - - false - false - - - - com.github.spotbugs - spotbugs-maven-plugin - 4.2.3 - - - - - - maven-jar-plugin - - - maybe-test-jar - - test-jar - - - - the.hpl - InjectedTest.class - test-dependencies/ - - ${no-test-jar} - - - - - - maven-enforcer-plugin - - - org.codehaus.mojo - extra-enforcer-rules - 1.6.1 - - - - - display-info - - display-info - enforce - - validate - - - - [3.8.1,) - 3.8.1 required to no longer download dependencies via HTTP (use HTTPS instead). - - - [1.8.0,) - - + org.eclipse.jdt.groovy.core.groovyNature + + + + + org.codehaus.gmavenplus + gmavenplus-plugin + 2.1.0 + + + org.codehaus.mojo + build-helper-maven-plugin + 3.3.0 + + + add-source + + add-source + + generate-sources + + + ${project.build.directory}/generated-sources/localizer + + + + + + + org.jacoco + jacoco-maven-plugin + 0.8.8 + + + org.kohsuke.stapler + maven-stapler-plugin + ${stapler-plugin.version} + + + org.jenkins-ci.tools + maven-hpi-plugin + ${hpi-plugin.version} + + + org.codehaus.mojo + animal-sniffer-maven-plugin + ${animal.sniffer.version} + + + org.jvnet.localizer + localizer-maven-plugin + 1.31 + + + org.kohsuke + access-modifier-checker + ${access-modifier-checker.version} + + + com.cloudbees + maven-license-plugin + 1.15 + + + + io.jenkins.tools.incrementals + incrementals-maven-plugin + 1.4 + + + org.jenkins-ci.* + io.jenkins.* + + false + false + + + + com.github.spotbugs + spotbugs-maven-plugin + 4.2.3 + + + + + + maven-jar-plugin + + + maybe-test-jar + + test-jar + + + + the.hpl + InjectedTest.class + test-dependencies/ + + ${no-test-jar} + + + + + + maven-enforcer-plugin + + + org.codehaus.mojo + extra-enforcer-rules + 1.6.1 + + + + + display-info + + display-info + enforce + + validate + + + + [3.8.1,) + 3.8.1 required to no longer download dependencies via HTTP (use HTTPS instead). + + + [1.8.0,) + + - - 1.8 - - test - - - - org.jenkins-ci.main:jenkins-core - org.jenkins-ci.main:cli - org.jenkins-ci.main:jenkins-test-harness - org.jenkins-ci.main:remoting - org.kohsuke.stapler:stapler - org.kohsuke.stapler:stapler-groovy - org.kohsuke.stapler:stapler-jelly - org.kohsuke.stapler:stapler-jrebel - org.jenkins-ci:task-reactor - - com.google.code.findbugs:annotations - com.github.spotbugs:spotbugs-annotations - - + org.jenkins-ci.main:jenkins-core + org.jenkins-ci.main:cli + org.jenkins-ci.main:jenkins-test-harness + org.jenkins-ci.main:remoting + org.kohsuke.stapler:stapler + org.kohsuke.stapler:stapler-groovy + org.kohsuke.stapler:stapler-jelly + org.kohsuke.stapler:stapler-jrebel + org.jenkins-ci:task-reactor + + com.google.code.findbugs:annotations + com.github.spotbugs:spotbugs-annotations + + - - - - javax.servlet:servlet-api - org.sonatype.sisu:sisu-guice - log4j:log4j:*:jar:compile - log4j:log4j:*:jar:runtime - commons-logging:commons-logging:*:jar:compile - commons-logging:commons-logging:*:jar:runtime + + + + javax.servlet:servlet-api + org.sonatype.sisu:sisu-guice + log4j:log4j:*:jar:compile + log4j:log4j:*:jar:runtime + commons-logging:commons-logging:*:jar:compile + commons-logging:commons-logging:*:jar:runtime - - org.apache.logging.log4j:*:(,2.15.0-rc1] + + org.apache.logging.log4j:*:(,2.15.0-rc1] - - org.testng:testng - - - - - com.google.code.findbugs:annotations - com.google.code.findbugs:jsr305 - com.google.guava:guava - commons-logging:commons-logging - javax.servlet:javax.servlet-api - javax.servlet:servlet-api - net.java.dev.jna:jna - org.kohsuke:access-modifier-annotation - + org.testng:testng + + + + + com.google.code.findbugs:annotations + com.google.code.findbugs:jsr305 + com.google.guava:guava + commons-logging:commons-logging + javax.servlet:javax.servlet-api + javax.servlet:servlet-api + net.java.dev.jna:jna + org.kohsuke:access-modifier-annotation + - com.github.spotbugs:spotbugs-annotations - - org.ow2.asm:asm - - - - - - - no-snapshots-in-release - - enforce - - validate - - - - - No SNAPSHOT versions are allowed for releases - true - - false - - - - - - - - com.github.spotbugs - spotbugs-maven-plugin - - ${spotbugs.failOnError} - - - - spotbugs - - check - - verify - - - - true - false - ${spotbugs.effort} - ${spotbugs.threshold} - - - - - - org.codehaus.mojo - animal-sniffer-maven-plugin - - - org.codehaus.mojo.signature - java18 - - - - - check - - check - - test - - - - - maven-eclipse-plugin - - - org.jenkins-ci.tools - maven-hpi-plugin - true - - true - - /jenkins - - - ${hudson.Main.development} - - - - - org.kohsuke.stapler - maven-stapler-plugin - - - maven-release-plugin - - forked-path - false - clean install - deploy - ${arguments} - jenkins-release,!consume-incrementals,${releaseProfiles} - - - - org.jvnet.localizer - localizer-maven-plugin - - - - generate - - - Messages.properties - target/generated-sources/localizer - true - - - - - - org.kohsuke - access-modifier-checker - - - - useBeta - ${useBeta} - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - - - ${project.build.directory}/generated-test-sources/groovy-stubs - - - - test-in-groovy - - addTestSources - generateTestStubs - compileTests - - - - - - - maven-antrun-plugin - - - createTempDir - - run - - generate-test-resources - - - - - - - - - - maven-surefire-plugin - - - -1 - ${surefireTempDir} - true - - alphabetical - false - - - - maven-failsafe-plugin - - - -1 - ${surefireTempDir} - true - - alphabetical - false - - - - com.cloudbees - maven-license-plugin - - - - process - - prepare-package - - - target/${project.artifactId}/WEB-INF/licenses.xml - + No SNAPSHOT versions are allowed for releases + true + + false + + + + + + + + com.github.spotbugs + spotbugs-maven-plugin + + ${spotbugs.failOnError} + + + + spotbugs + + check + + verify + + + + true + false + ${spotbugs.effort} + ${spotbugs.threshold} + + + + + + org.codehaus.mojo + animal-sniffer-maven-plugin + + + org.codehaus.mojo.signature + java18 + + + + + check + + check + + test + + + + + maven-eclipse-plugin + + + org.jenkins-ci.tools + maven-hpi-plugin + true + + true + + /jenkins + + + ${hudson.Main.development} + + + + + org.kohsuke.stapler + maven-stapler-plugin + + + maven-release-plugin + + forked-path + false + clean install + deploy + ${arguments} + jenkins-release,!consume-incrementals,${releaseProfiles} + + + + org.jvnet.localizer + localizer-maven-plugin + + + + generate + + + Messages.properties + target/generated-sources/localizer + true + + + + + + org.kohsuke + access-modifier-checker + + + + useBeta + ${useBeta} + + + + + + org.codehaus.gmavenplus + gmavenplus-plugin + + + ${project.build.directory}/generated-test-sources/groovy-stubs + + + + test-in-groovy + + addTestSources + generateTestStubs + compileTests + + + + + + + maven-antrun-plugin + + + createTempDir + + run + + generate-test-resources + + + + + + + + + + maven-surefire-plugin + + + -1 + ${surefireTempDir} + true + + alphabetical + false + + + + maven-failsafe-plugin + + + -1 + ${surefireTempDir} + true + + alphabetical + false + + + + com.cloudbees + maven-license-plugin + + + + process + + prepare-package + + + target/${project.artifactId}/WEB-INF/licenses.xml + - - - - + + + + - - - org.codehaus.mojo - mrm-maven-plugin - 1.4.1 - false - - - - start - stop - - - repository.proxy.url - - - - - - - - - maven-invoker-plugin - 3.3.0 - false - - - integration-test - - install - run - - - true - true - ${project.build.directory}/its - ${basedir}/target/local-repo - src/it/settings.xml - - ${repository.proxy.url} - - - - - - - + + + org.codehaus.mojo + mrm-maven-plugin + 1.4.1 + false + + + + start + stop + + + repository.proxy.url + + + + + + + + + maven-invoker-plugin + 3.3.0 + false + + + integration-test + + install + run + + + true + true + ${project.build.directory}/its + ${basedir}/target/local-repo + src/it/settings.xml + + ${repository.proxy.url} + + + + + + + - - - jdk-8-and-below - - (,1.8] - - - 1.8 - 1.8 - 1.8 - 1.8 - - - - - - jdk-9-and-above - - [9,) - - - - 8 - 8 - - true - - true - - --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED - - + + + + + jdk-9-and-above + + [9,) + + + + 8 + 8 + + true + + true + + --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED + + - - - - maven-enforcer-plugin - - - display-info - - - - 11 - - - - - - - - - - - jenkins-release - - ${release.skipTests} - ${release.skipTests} - ${release.skipTests} - - - - - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - attach-test-sources - - test-jar-no-fork - - - ${no-test-jar} - - - - - - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - - - only-eclipse - - - m2e.version - - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - [1.0,) - - display-info - - - - - - - - - org.codehaus.gmavenplus - gmavenplus-plugin - [1.0,) - - compileTests - generateTestStubs - - - - - - - - - - - - - - - - always-check-remote-repositories - - always - - - - skip-node-tests - - - skipTests - true - - - - --skipTests --skipLint - - - - skip-node-lint - - - skipLint - true - - - - --skipLint - - - - spotbugs-exclusion-file - - - ${basedir}/src/spotbugs/excludesFilter.xml - - - - - - com.github.spotbugs - spotbugs-maven-plugin - - - spotbugs - - ${project.basedir}/src/spotbugs/excludesFilter.xml - - - - - - - - - all-tests - - - !test - - - - true - - - - specific-test - - - test - - - - false - - - - enable-jacoco - - - - org.jacoco - jacoco-maven-plugin - - - **/Messages.class - - com/gargoylesoftware/** - - - - - - prepare-agent - - - - report - - report - - - - - - - - - node-execution - - - .mvn_exec_node - - - - - - com.github.eirslett - frontend-maven-plugin - ${frontend-version} + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + org.apache.maven.plugins + maven-enforcer-plugin + [1.0,) + + display-info + + + + + + + + + org.codehaus.gmavenplus + gmavenplus-plugin + [1.0,) + + compileTests + generateTestStubs + + + + + + + + + + + + + + + + always-check-remote-repositories + + always + + + + skip-node-tests + + + skipTests + true + + + + --skipTests --skipLint + + + + skip-node-lint + + + skipLint + true + + + + --skipLint + + + + spotbugs-exclusion-file + + + ${basedir}/src/spotbugs/excludesFilter.xml + + + + + + com.github.spotbugs + spotbugs-maven-plugin + + + spotbugs + + ${project.basedir}/src/spotbugs/excludesFilter.xml + + + + + + + + + all-tests + + + !test + + + + true + + + + specific-test + + + test + + + + false + + + + enable-jacoco + + + + org.jacoco + jacoco-maven-plugin + + + **/Messages.class + + com/gargoylesoftware/** + + + + + + prepare-agent + + + + report + + report + + + + + + + + + node-execution + + + .mvn_exec_node + + + + + + com.github.eirslett + frontend-maven-plugin + ${frontend-version} - + - - install node and npm - - install-node-and-npm - - initialize - - v${node.version} - ${npm.version} - ${nodeDownloadRoot} - ${npmDownloadRoot} - - + + install node and npm + + install-node-and-npm + + initialize + + v${node.version} + ${npm.version} + ${nodeDownloadRoot} + ${npmDownloadRoot} + + - - npm install - - npm - - initialize - - - install ${npm.loglevel} - - + + npm install + + npm + + initialize + + + install ${npm.loglevel} + + - - npm mvnbuild - - npm - - generate-sources - - - run mvnbuild - - + + npm mvnbuild + + npm + + generate-sources + + + run mvnbuild + + - - npm mvntest - - npm - - test - - - run mvntest - - + + npm mvntest + + npm + + test + + + run mvntest + + - - - - - + + + + + - - yarn-execution - - - .mvn_exec_yarn - - - - - - com.github.eirslett - frontend-maven-plugin - ${frontend-version} + + yarn-execution + + + .mvn_exec_yarn + + + + + + com.github.eirslett + frontend-maven-plugin + ${frontend-version} - + - - install node and yarn - - install-node-and-yarn - - initialize - - v${node.version} - v${yarn.version} - ${nodeDownloadRoot} - - - + + install node and yarn + + install-node-and-yarn + + initialize + + v${node.version} + v${yarn.version} + ${nodeDownloadRoot} + + + - - yarn install - - yarn - - initialize - - ${yarn.args} - - + + yarn install + + yarn + + initialize + + ${yarn.args} + + - - yarn mvnbuild - - yarn - - generate-sources - - - run mvnbuild - - + + yarn mvnbuild + + yarn + + generate-sources + + + run mvnbuild + + - - yarn mvntest - - yarn - - test - - - run mvntest - - + + yarn mvntest + + yarn + + test + + + run mvntest + + - - - - - - - clean-node - - - cleanNode - - - package.json - - - - - - org.apache.maven.plugins - maven-clean-plugin - - - - node - false - - - node_modules - false - - - - - - - - - - consume-incrementals - - - - false - - incrementals - ${incrementals.url} - - - - - - false - - incrementals - ${incrementals.url} - - - - - might-produce-incrementals - - - - org.codehaus.mojo - flatten-maven-plugin - 1.3.0 - - true - - - - flatten - - flatten - - process-resources - - oss - ${project.build.directory} - ${project.artifactId}-${project.version}.pom - - - - - - maven-enforcer-plugin - - - io.jenkins.tools.incrementals - incrementals-enforcer-rules - 1.4 - - - - - display-info - - - - [1.0-beta-4,) - - - - - - - - maven-release-plugin - - incrementals:reincrementalify - - - - - - - produce-incrementals - - - set.changelist - true - - - - - incrementals - ${incrementals.url} - - - - - - - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - attach-test-sources - - test-jar-no-fork - - - ${no-test-jar} - - - - - - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - - - - - block-MRP - - - changelist.format - - - - - - maven-release-plugin - - not-set-up-for-MRP - - - - - - - - jmh-benchmark - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*Benchmark.java - **/Benchmark*.java - - - - - - + + + + + + + clean-node + + + cleanNode + + + package.json + + + + + + org.apache.maven.plugins + maven-clean-plugin + + + + node + false + + + node_modules + false + + + + + + + + + + consume-incrementals + + + + false + + incrementals + ${incrementals.url} + + + + + + false + + incrementals + ${incrementals.url} + + + + + might-produce-incrementals + + + + org.codehaus.mojo + flatten-maven-plugin + 1.3.0 + + true + + + + flatten + + flatten + + process-resources + + oss + ${project.build.directory} + ${project.artifactId}-${project.version}.pom + + + + + + maven-enforcer-plugin + + + io.jenkins.tools.incrementals + incrementals-enforcer-rules + 1.4 + + + + + display-info + + + + [1.0-beta-4,) + + + + + + + + maven-release-plugin + + incrementals:reincrementalify + + + + + + + produce-incrementals + + + set.changelist + true + + + + + incrementals + ${incrementals.url} + + + + + + + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + attach-test-sources + + test-jar-no-fork + + + ${no-test-jar} + + + + + + maven-javadoc-plugin + + + attach-javadocs + + jar + + + + + + + + + + block-MRP + + + changelist.format + + + + + + maven-release-plugin + + not-set-up-for-MRP + + + + + + + + jmh-benchmark + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*Benchmark.java + **/Benchmark*.java + + + + + + - - - quick-build - - - true - true - true - true - true - true - true - true - - - + + + quick-build + + + true + true + true + true + true + true + true + true + + + From 8afa5268c42312a3e8620a37d27357f8c93fe813 Mon Sep 17 00:00:00 2001 From: Thorsten Scherler Date: Thu, 3 Nov 2022 05:32:00 -0400 Subject: [PATCH 04/10] Update pom.xml thanks for spotting Co-authored-by: Basil Crow --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6b634097e7..5a0b0b8221 100644 --- a/pom.xml +++ b/pom.xml @@ -93,7 +93,7 @@ - ---mutex network + --mutex network 1.12.1 https://repo.jenkins-ci.org/nodejs-dist/ https://repo.jenkins-ci.org/npm-dist/ From e076190c0e120b57ad132501771696ec8e3353eb Mon Sep 17 00:00:00 2001 From: Thorsten Scherler Date: Fri, 4 Nov 2022 08:02:19 -0400 Subject: [PATCH 05/10] Update pom.xml Co-authored-by: James Nord --- pom.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 5a0b0b8221..2e8aab73b8 100644 --- a/pom.xml +++ b/pom.xml @@ -91,9 +91,7 @@ you-must-override-the-npm.version-property you-must-override-the-yarn.version-property - - - --mutex network + --mutex network 1.12.1 https://repo.jenkins-ci.org/nodejs-dist/ https://repo.jenkins-ci.org/npm-dist/ From a630140e915e8a87420a1fcee6224eadb9ee7466 Mon Sep 17 00:00:00 2001 From: Thorsten Scherler Date: Fri, 4 Nov 2022 13:11:47 +0100 Subject: [PATCH 06/10] [yarn2] Adopt PR feedback Signed-off-by: Thorsten Scherler --- .vscode/settings.json | 3 +++ pom.xml | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000000..0e14d8e27d --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "disabled" +} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 2e8aab73b8..1215cde719 100644 --- a/pom.xml +++ b/pom.xml @@ -90,8 +90,11 @@ you-must-override-the-node.version-property you-must-override-the-npm.version-property you-must-override-the-yarn.version-property + + + + - --mutex network 1.12.1 https://repo.jenkins-ci.org/nodejs-dist/ https://repo.jenkins-ci.org/npm-dist/ @@ -1328,7 +1331,7 @@ initialize - ${yarn.args} + ${frontend.yarn.arguments} From 50f36bc4366c1920e655f4a2cdb9a2e4b211252e Mon Sep 17 00:00:00 2001 From: Thorsten Scherler Date: Fri, 4 Nov 2022 13:13:55 +0100 Subject: [PATCH 07/10] [yarn2] vscode should not have been committed Signed-off-by: Thorsten Scherler --- .vscode/settings.json | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 0e14d8e27d..0000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "java.configuration.updateBuildConfiguration": "disabled" -} \ No newline at end of file From 738c2587d58d383722dd07fc7c07cbf293256798 Mon Sep 17 00:00:00 2001 From: Thorsten Scherler Date: Fri, 4 Nov 2022 13:14:53 +0100 Subject: [PATCH 08/10] [yarn2] remove legacy comment Signed-off-by: Thorsten Scherler --- pom.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/pom.xml b/pom.xml index 1215cde719..d270d8a10d 100644 --- a/pom.xml +++ b/pom.xml @@ -93,8 +93,6 @@ - - 1.12.1 https://repo.jenkins-ci.org/nodejs-dist/ https://repo.jenkins-ci.org/npm-dist/ From 5e9ca3249ad0c5b6993ce8fca140c2980f4f1921 Mon Sep 17 00:00:00 2001 From: Thorsten Scherler Date: Fri, 4 Nov 2022 14:31:29 -0400 Subject: [PATCH 09/10] Update pom.xml Co-authored-by: James Nord --- pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pom.xml b/pom.xml index d270d8a10d..d9d35dfd36 100644 --- a/pom.xml +++ b/pom.xml @@ -90,9 +90,6 @@ you-must-override-the-node.version-property you-must-override-the-npm.version-property you-must-override-the-yarn.version-property - - - 1.12.1 https://repo.jenkins-ci.org/nodejs-dist/ https://repo.jenkins-ci.org/npm-dist/ From 612216a2b56cad0f8fc7191b4e0fe585dc71307f Mon Sep 17 00:00:00 2001 From: Thorsten Scherler Date: Mon, 7 Nov 2022 21:24:41 +0100 Subject: [PATCH 10/10] [yarn2] remove config section since it not needed Signed-off-by: Thorsten Scherler --- pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pom.xml b/pom.xml index d9d35dfd36..319e5fd9c9 100644 --- a/pom.xml +++ b/pom.xml @@ -1325,9 +1325,6 @@ yarn initialize - - ${frontend.yarn.arguments} -