Skip to content

Commit 08e57e0

Browse files
committed
build maven-plugins/pom.xml explicitly
this ensures that tycho is only used when building in root with `mvn clean verify` but not when building with `mvn -f maven-plugins/pom.xml` adjust CI build scripts to call `mvn -f maven-plugins/pom.xml` Signed-off-by: Christoph Rueger <chrisrueger@gmail.com>
1 parent 4bf0336 commit 08e57e0

File tree

4 files changed

+3
-26
lines changed

4 files changed

+3
-26
lines changed

.github/scripts/ci-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ fi
2121
./mvnw --version
2222
./gradlew --no-daemon -Dmaven.repo.local=dist/m2 --continue :build "$@"
2323
./gradlew --no-daemon -Dmaven.repo.local=dist/m2 --continue :gradle-plugins:build
24-
./mvnw -f old_pom.xml -Djdk.xml.maxGeneralEntitySizeLimit=0 -Djdk.xml.totalEntitySizeLimit=0 -Djdk.xml.entityExpansionLimit=0 -Dmaven.repo.local=dist/m2 --batch-mode --no-transfer-progress install
24+
./mvnw -f maven-plugins/pom.xml -Dmaven.repo.local=dist/m2 --batch-mode --no-transfer-progress install

.github/scripts/ci-publish.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/usr/bin/env bash
22
set -ev
33
./gradlew --no-daemon -Dmaven.repo.local=dist/m2 :publish :gradle-plugins:publish "$@"
4-
./mvnw -f old_pom.xml -Djdk.xml.maxGeneralEntitySizeLimit=0 -Djdk.xml.totalEntitySizeLimit=0 -Djdk.xml.entityExpansionLimit=0 -Dmaven.repo.local=dist/m2 --batch-mode -Pdist -Dreleaserepo=file:dist/bundles deploy
4+
./mvnw -f maven-plugins/pom.xml -Dmaven.repo.local=dist/m2 --batch-mode -Pdist -Dreleaserepo=file:dist/bundles deploy

.github/scripts/codeql-build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ set -ev
44
./mvnw --version
55
./gradlew --no-daemon -Dmaven.repo.local=dist/m2 --continue testClasses :dist:jarDependencies "$@"
66
./gradlew --no-daemon -Dmaven.repo.local=dist/m2 --continue :gradle-plugins:testClasses
7-
./mvnw -f old_pom.xml -Djdk.xml.maxGeneralEntitySizeLimit=0 -Djdk.xml.totalEntitySizeLimit=0 -Djdk.xml.entityExpansionLimit=0 -Dmaven.repo.local=dist/m2 --batch-mode --no-transfer-progress test-compile
7+
./mvnw -f maven-plugins/pom.xml -Dmaven.repo.local=dist/m2 --batch-mode --no-transfer-progress test-compile

old_pom.xml

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)