diff --git a/Jenkinsfile b/Jenkinsfile index 273aca7..79866ab 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -185,7 +185,9 @@ pipeline { sh "mkdir -p ${WORKSPACE}/p2-update-site/ide/p2/nightly" sshagent(['projects-storage.eclipse.org-bot-ssh']) { dir('server') { - sh "mvn clean verify -Prelease -B -Dmaven.repo.local=${env.WORKSPACE}/.m2 -Dlocal.p2.root=${WORKSPACE}/p2-update-site" + // Unlike the 'ci' image, the jnlp container has no Maven on the PATH. + // Use the installation provided by the mounted Jiro tools volume. + sh "/opt/tools/apache-maven/latest/bin/mvn clean verify -Prelease -B -Dmaven.repo.local=${env.WORKSPACE}/.m2 -Dlocal.p2.root=${WORKSPACE}/p2-update-site" } } } diff --git a/client/package.json b/client/package.json index ae6714e..2611496 100644 --- a/client/package.json +++ b/client/package.json @@ -13,8 +13,8 @@ "format": "prettier --write .", "format:check": "prettier --check .", "generate:index": "pnpm -r generate:index && pnpm lint:fix", - "headers:check": "glsp checkHeaders ../../glsp-eclipse-integration -f ts tsx java -e \"**/src-gen/**\"", - "headers:fix": "glsp checkHeaders ../../glsp-eclipse-integration -f ts tsx java -e \"**/src-gen/**\" --autoFix", + "headers:check": "glsp checkHeaders .. -f ts tsx java -e \"**/src-gen/**\"", + "headers:fix": "glsp checkHeaders .. -f ts tsx java -e \"**/src-gen/**\" --autoFix", "preinstall": "npx only-allow pnpm", "lint": "pnpm compile && eslint .", "lint:ci": "pnpm lint --output-file eslint_report.json --format json",