diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 0000000000000..0f4fa3c8a6eae --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1 @@ +-Dmaven.multiModuleProjectDirectory=${session.rootDirectory} \ No newline at end of file diff --git a/independent-projects/parent/pom.xml b/independent-projects/parent/pom.xml index 5d2c28da28836..bffc08d84c341 100644 --- a/independent-projects/parent/pom.xml +++ b/independent-projects/parent/pom.xml @@ -73,7 +73,7 @@ ${maven.compiler.testSource} - 3.8.6 + 3.9.6 ${maven.compiler.argument.source} ERROR diff --git a/integration-tests/gradle/update-dependencies.sh b/integration-tests/gradle/update-dependencies.sh index 11bea4fa36049..15b710020cccd 100755 --- a/integration-tests/gradle/update-dependencies.sh +++ b/integration-tests/gradle/update-dependencies.sh @@ -87,7 +87,7 @@ echo '' echo 'Sanity check...' echo '' # sanity check; make sure nothing stupid was added like non-existing deps -mvn -Dscan=false dependency:resolve validate -Dsilent -q -f "${PRG_PATH}" $* +${PRG_PATH}/../../mvnw -Dscan=false dependency:resolve validate -Dsilent -q -f "${PRG_PATH}" $* # CI only: verify that no pom.xml was touched (if changes are found, committer forgot to run script or to add changes) if [ "${CI:-}" == true ] && [ $(git status -s -u no '*pom.xml' | wc -l) -ne 0 ] diff --git a/tcks/resteasy-reactive/update-dependencies.sh b/tcks/resteasy-reactive/update-dependencies.sh index cdd12aab128b5..21435d21b92ba 100755 --- a/tcks/resteasy-reactive/update-dependencies.sh +++ b/tcks/resteasy-reactive/update-dependencies.sh @@ -90,7 +90,7 @@ echo '' echo 'Sanity check...' echo '' # sanity check; make sure nothing stupid was added like non-existing deps -mvn -Dscan=false dependency:resolve validate -Dsilent -q -f "${PRG_PATH}" $* +${PRG_PATH}/../../mvnw -Dscan=false dependency:resolve validate -Dsilent -q -f "${PRG_PATH}" $* # CI only: verify that no pom.xml was touched (if changes are found, committer forgot to run script or to add changes) if [ "${CI:-}" == true ] && [ $(git status -s -u no '*pom.xml' | wc -l) -ne 0 ] diff --git a/update-extension-dependencies.sh b/update-extension-dependencies.sh index b82c138e67fc4..e98c85fbe3e67 100755 --- a/update-extension-dependencies.sh +++ b/update-extension-dependencies.sh @@ -14,7 +14,7 @@ then echo '' echo 'Building bom-descriptor-json...' echo '' - mvn -q -e -Dscan=false clean package -f "${PRG_PATH}/devtools/bom-descriptor-json" -Denforcer.skip $* + ./mvnw -q -e -Dscan=false clean package -f "${PRG_PATH}/devtools/bom-descriptor-json" -Denforcer.skip $* else read -n1 -p 'Build the entire project with relocations? [y/n] ' ANSWER echo '' @@ -23,7 +23,7 @@ else echo '' echo 'Building entire project with relocations...' echo '' - mvn -q -e -Dscan=false -Dquickly -Dno-test-modules -Prelocations -T0.8C -f "${PRG_PATH}" $* + ./mvnw -q -e -Dscan=false -Dquickly -Dno-test-modules -Prelocations -T0.8C -f "${PRG_PATH}" $* else echo '' echo 'Aborted!' @@ -112,7 +112,7 @@ echo '' echo 'Sanity check...' echo '' # sanity check; make sure nothing stupid was added like non-existing deps -mvn -Dscan=false dependency:resolve validate -Dsilent -q -f "${PRG_PATH}" -pl devtools/bom-descriptor-json,docs $* +./mvnw -Dscan=false dependency:resolve validate -Dsilent -q -f "${PRG_PATH}" -pl devtools/bom-descriptor-json,docs $* # CI only: verify that no pom.xml was touched (if changes are found, committer forgot to run script or to add changes) if [ "${CI:-}" == true ] && [ $(git status -s -u no '*pom.xml' | wc -l) -ne 0 ]