Skip to content

Commit

Permalink
Move common build arguments to maven.config and remove unnecessary
Browse files Browse the repository at this point in the history
The property 'project.build.sourceEncoding' is already defined in the
eclipse-platform-parent/pom.xml used as parent for all modules, thus it
is not necessary to explicitly add it in the Jenkinsfile.

Moving the definition of the 'aggregatorBuild' property to the
maven.config simplifies local builds because then the property does not
have to be declared.
  • Loading branch information
HannesWell committed Oct 6, 2023
1 parent dc28786 commit bda9433
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 9 deletions.
1 change: 1 addition & 0 deletions .mvn/maven.config
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-DaggregatorBuild=true
3 changes: 1 addition & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,9 @@ pipeline {
mvn clean verify -e -Dmaven.repo.local=$WORKSPACE/.m2/repository \
-Pbree-libs \
${MVN_ARGS} \
-Dmaven.test.skip=true -DskipTests=true -DaggregatorBuild=true \
-Dmaven.test.skip=true -DskipTests=true \
-DapiBaselineTargetDirectory=${WORKSPACE} \
-Dgpg.passphrase="${KEYRING_PASSPHRASE}" \
-Dproject.build.sourceEncoding=UTF-8 \
-Dcbi-ecj-version=99.99
'''
}
Expand Down
1 change: 0 additions & 1 deletion cje-production/P-build/mb220_buildSdkPatch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ mvn -f eclipse.platform.releng.tychoeclipsebuilder/${PATCH_OR_BRANCH_LABEL}/pom.
-Djgit.dirtyWorkingTree=error \
-Dmaven.repo.local=$LOCAL_REPO \
-Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \
-DaggregatorBuild=true \
-DbuildTimestamp=$TIMESTAMP \
-DbuildType=$BUILD_TYPE \
-DbuildId=$BUILD_ID \
Expand Down
1 change: 0 additions & 1 deletion cje-production/mbscripts/mb220_buildSdkPatch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ mvn clean verify -DskipTests=true ${MVN_ARGS} \
-Djgit.dirtyWorkingTree=error \
-Dmaven.repo.local=$LOCAL_REPO \
-Djava.io.tmpdir=$CJE_ROOT/$TMP_DIR \
-DaggregatorBuild=true \
-DbuildTimestamp=$TIMESTAMP \
-DbuildType=$BUILD_TYPE \
-DbuildId=$BUILD_ID \
Expand Down
2 changes: 1 addition & 1 deletion eclipse-platform-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@
<id>build-individual-bundles</id>
<activation>
<property>
<!-- Enable if aggregatorBuild property is not set -->
<!-- Enable if aggregatorBuild system-property is not set -->
<name>!aggregatorBuild</name>
</property>
</activation>
Expand Down
4 changes: 0 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,6 @@
<artifactId>platform-aggregator</artifactId>
<version>4.30.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<!--Property used in parent pom which if defined disables activation of build-individual-bundles profile -->
<aggregatorBuild>true</aggregatorBuild>
</properties>
<pluginRepositories>
<pluginRepository>
<id>tycho-snapshots</id>
Expand Down

0 comments on commit bda9433

Please sign in to comment.