Skip to content

Commit 8f1ebae

Browse files
committed
build: centralize some JVM and Maven settings
1 parent 6070d98 commit 8f1ebae

File tree

6 files changed

+12
-19
lines changed

6 files changed

+12
-19
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ jobs:
197197
MAVEN_OPTS+=" -Djava.security.egd=file:/dev/./urandom" # https://stackoverflow.com/questions/58991966/what-java-security-egd-option-is-for/59097932#59097932
198198
fi
199199
MAVEN_OPTS+=" -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS" # https://stackoverflow.com/questions/5120470/how-to-time-the-different-stages-of-maven-execution/49494561#49494561
200-
MAVEN_OPTS+=" -Xmx1024m -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dhttps.protocols=TLSv1.3,TLSv1.2"
201200
export MAVEN_OPTS
202201
echo "MAVEN_OPTS: $MAVEN_OPTS"
203202
@@ -210,12 +209,8 @@ jobs:
210209
# prevent "org.eclipse.swt.SWTError: No more handles [gtk_init_check() failed]" on Linux
211210
${{ runner.os == 'Linux' && 'xvfb-run --auto-servernum --server-args="-screen 0 1600x900x24" \' || '' }}
212211
./mvnw \
213-
--errors \
214212
--update-snapshots \
215213
--batch-mode \
216-
--show-version \
217-
-Declipse.p2.mirrors=false \
218-
-Dsurefire.rerunFailingTestsCount=3 \
219214
-Dtm4e.target-platform=${{ matrix.target-platform }} \
220215
$maven_args \
221216
${{ github.event.inputs.additional_maven_args }} \

.github/workflows/codeql.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,16 +150,12 @@ jobs:
150150
MAVEN_OPTS="${MAVEN_OPTS:-}"
151151
MAVEN_OPTS+=" -Djava.security.egd=file:/dev/./urandom" # https://stackoverflow.com/questions/58991966/what-java-security-egd-option-is-for/59097932#59097932
152152
MAVEN_OPTS+=" -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS" # https://stackoverflow.com/questions/5120470/how-to-time-the-different-stages-of-maven-execution/49494561#49494561
153-
MAVEN_OPTS+=" -Xmx1024m -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dhttps.protocols=TLSv1.3,TLSv1.2"
154153
export MAVEN_OPTS
155154
echo "MAVEN_OPTS: $MAVEN_OPTS"
156155
157156
./mvnw \
158-
--errors \
159157
--no-transfer-progress \
160158
--batch-mode \
161-
--show-version \
162-
-Declipse.p2.mirrors=false \
163159
-Dmaven.test.skip=true \
164160
clean verify
165161

.github/workflows/licensecheck.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ jobs:
105105
MAVEN_OPTS+=" -Djava.security.egd=file:/dev/./urandom" # https://stackoverflow.com/questions/58991966/what-java-security-egd-option-is-for/59097932#59097932
106106
fi
107107
MAVEN_OPTS+=" -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS" # https://stackoverflow.com/questions/5120470/how-to-time-the-different-stages-of-maven-execution/49494561#49494561
108-
MAVEN_OPTS+=" -Xmx1024m -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dhttps.protocols=TLSv1.3,TLSv1.2"
109108
export MAVEN_OPTS
110109
echo "MAVEN_OPTS: $MAVEN_OPTS"
111110
@@ -120,11 +119,8 @@ jobs:
120119
fi
121120
122121
(set -x; ./mvnw \
123-
--errors \
124122
--update-snapshots \
125123
--batch-mode \
126-
--show-version \
127-
-Declipse.p2.mirrors=false \
128124
$maven_args \
129125
org.eclipse.dash:license-tool-plugin:license-check \
130126
-Dtycho.target.eager=true \

.mvn/jvm.config

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
-Xmx1024m
2+
-Dfile.encoding=UTF-8
3+
-Djava.awt.headless=true
4+
-Djava.net.preferIPv4Stack=true
5+
-Duser.language=en
6+
-Duser.country=US
7+
-Dhttps.protocols=TLSv1.3,TLSv1.2
8+
-Declipse.p2.mirrors=false
9+
-Dsurefire.rerunFailingTestsCount=3

.mvn/maven.config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# https://maven.apache.org/configure.html
2+
--errors
3+
--show-version

Jenkinsfile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,10 @@ pipeline {
9090
// https://stackoverflow.com/questions/5120470/how-to-time-the-different-stages-of-maven-execution/49494561#49494561
9191
maven_opts += ' -Dorg.slf4j.simpleLogger.showDateTime=true -Dorg.slf4j.simpleLogger.dateTimeFormat=HH:mm:ss,SSS'
9292

93-
maven_opts += ' -Xmx1024m -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dhttps.protocols=TLSv1.3,TLSv1.2'
94-
9593
def maven_args = [
9694
'--no-transfer-progress',
97-
'--errors',
9895
'--update-snapshots',
9996
'--batch-mode',
100-
'--show-version',
101-
'-Declipse.p2.mirrors=false',
102-
'-Dsurefire.rerunFailingTestsCount=3',
10397
'-t /tmp/toolchains.xml'
10498
].join(' ')
10599

0 commit comments

Comments
 (0)