Skip to content

Commit

Permalink
Introduce maven.config to unify/simplify the build arguments
Browse files Browse the repository at this point in the history
  • Loading branch information
HannesWell committed Jul 9, 2022
1 parent 22a3184 commit 40a8ab2
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Build m2e-core
uses: GabrielBB/xvfb-action@v1
with:
run: mvn clean verify -Dmaven.test.failure.ignore=true --file pom.xml
run: mvn clean verify -B
- name: Upload Test Results
uses: actions/upload-artifact@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "m2e-core-tests"]
path = m2e-core-tests
url = https://github.com/tesla/m2e-core-tests.git
branch = master
url = https://github.com/HannesWell/m2e-core-tests.git
branch = removePomDuplicates
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<extension>
<groupId>org.eclipse.tycho.extras</groupId>
<artifactId>tycho-pomless</artifactId>
<version>2.7.4</version>
<version>${tycho-version}</version>
</extension>
</extensions>
2 changes: 2 additions & 0 deletions .mvn/maven.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
--fail-at-end
-Dtycho-version=2.7.4
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ pipeline {
}
stage('Build') {
steps {
sh 'mvn clean generate-sources -f m2e-maven-runtime/pom.xml -B -Dtycho.mode=maven -Pgenerate-osgi-metadata '
sh 'mvn clean generate-sources -f m2e-maven-runtime/pom.xml -B -Dtycho.mode=maven -Pgenerate-osgi-metadata'
wrap([$class: 'Xvnc', useXauthority: true]) {
sh 'mvn clean verify -f pom.xml -B -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true -Peclipse-sign,uts,its -Dtycho.surefire.timeout=7200'
sh 'mvn clean verify -B -Peclipse-sign,uts,its'
}
}
post {
Expand Down
2 changes: 1 addition & 1 deletion m2e-core-tests
Submodule m2e-core-tests updated 209 files
4 changes: 1 addition & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<tycho-version>2.7.4</tycho-version>

<tycho.testArgLine>-Xmx800m</tycho.testArgLine>
<tycho.surefire.timeout>7200</tycho.surefire.timeout>
<tycho.surefire.timeout>900</tycho.surefire.timeout>
<tycho.surefire.useUIHarness>true</tycho.surefire.useUIHarness>
<tycho.surefire.useUIThread>true</tycho.surefire.useUIThread>
<jacoco.destFile>../target/jacoco.exec</jacoco.destFile>
Expand Down
2 changes: 1 addition & 1 deletion setup/m2e.setup
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
xsi:type="jdt:JRETask"
version="JavaSE-17"
location="${jre.location-17}"
name="JRE for JavaSE-11">
name="JRE for JavaSE-17">
<description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
</setupTask>
<setupTask
Expand Down
2 changes: 1 addition & 1 deletion setup/tychoSnapshotSettings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 https://maven.apache.org/xsd/settings-1.0.0.xsd">
<!-- This Maven-settings file allows to test Tycho snapshots without the need to install them into the local Maven repository
and thus makes it possible to test snapshots of Tycho's extension in the CI.
To use it, add the following arguments to the Maven command: -s setup/tychoSnapshotSettings.xml -U -->
To use it, add the following line of arguments to the '.mvn/maven.config' file: -s setup/tychoSnapshotSettings.xml -U -->
<profiles>
<profile>
<id>tycho-snapshots</id>
Expand Down

0 comments on commit 40a8ab2

Please sign in to comment.