Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make mvnd 1.X work and require Maven 3.9.6 to build Quarkus #41648

Merged
merged 3 commits into from
Aug 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .mvn/maven.config
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-Dmaven.multiModuleProjectDirectory=${session.rootDirectory}
2 changes: 1 addition & 1 deletion independent-projects/parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<maven.compiler.argument.testSource>${maven.compiler.testSource}</maven.compiler.argument.testSource>

<!-- maven-enforcer-plugin -->
<maven.min.version>3.8.6</maven.min.version>
<maven.min.version>3.9.6</maven.min.version>
<jdk.min.version>${maven.compiler.argument.source}</jdk.min.version>
<insecure.repositories>ERROR</insecure.repositories>

Expand Down
2 changes: 1 addition & 1 deletion integration-tests/gradle/update-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
Expand Down
2 changes: 1 addition & 1 deletion tcks/resteasy-reactive/update-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]
Expand Down
6 changes: 3 additions & 3 deletions update-extension-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 ''
Expand All @@ -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!'
Expand Down Expand Up @@ -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 ]
Expand Down
Loading