Skip to content

Commit 2822729

Browse files
committed
Drop support for Building on Java 8
1 parent d0809b9 commit 2822729

File tree

2 files changed

+17
-24
lines changed

2 files changed

+17
-24
lines changed

.github/workflows/maven-build.yml

Lines changed: 14 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -55,28 +55,7 @@ jobs:
5555
- name: Maven Site
5656
env:
5757
MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
58-
run: mvn -B clean site -D enable-ci --file pom.xml
59-
test-8:
60-
name: test (${{ matrix.os }}, Java 8)
61-
runs-on: ${{ matrix.os }}-latest
62-
strategy:
63-
fail-fast: false
64-
matrix:
65-
os: [ ubuntu ]
66-
java: [ 8 ]
67-
steps:
68-
- uses: actions/checkout@v3
69-
- name: Set up JDK
70-
uses: actions/setup-java@v3
71-
with:
72-
java-version: ${{ matrix.java }}
73-
distribution: 'temurin'
74-
cache: 'maven'
75-
# JDK 8
76-
- name: Maven Install with Code Coverage
77-
run: mvn -B clean install -D enable-ci -Djapicmp.skip --file pom.xml
78-
- name: Codecov Report
79-
uses: codecov/[email protected]
58+
run: mvn -B clean site -D enable-ci --file pom.xml
8059
test:
8160
name: test (${{ matrix.os }}, Java ${{ matrix.java }})
8261
runs-on: ${{ matrix.os }}-latest
@@ -104,3 +83,16 @@ jobs:
10483
env:
10584
MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
10685
run: mvn -B clean install -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
86+
- name: Codecov Report
87+
if: matrix.os == 'ubuntu' && matrix.java == '17'
88+
uses: codecov/[email protected]
89+
- name: Set up JDK
90+
if: matrix.os == 'ubuntu' && matrix.java == '17'
91+
uses: actions/setup-java@v3
92+
with:
93+
java-version: 8
94+
distribution: 'temurin'
95+
cache: 'maven'
96+
- name: Maven Test (no build) Java 8
97+
if: matrix.os == 'ubuntu' && matrix.java == '17'
98+
run: mvn -B surefire:test -Dsurefire.excludesFile=src/test/resources/slow-or-flaky-tests.txt

pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,12 +304,14 @@
304304
</plugin>
305305
<plugin>
306306
<artifactId>maven-surefire-plugin</artifactId>
307+
<configuration>
308+
<argLine>@{jacoco.surefire.argLine} ${surefire.argLine}</argLine>
309+
</configuration>
307310
<executions>
308311
<execution>
309312
<id>default-test</id>
310313
<configuration>
311314
<excludesFile>src/test/resources/slow-or-flaky-tests.txt</excludesFile>
312-
<argLine>@{jacoco.surefire.argLine} ${surefire.argLine}</argLine>
313315
</configuration>
314316
</execution>
315317
</executions>
@@ -651,7 +653,6 @@
651653
<!-- There are some tests that take longer or are a little
652654
flaky. Run them here. -->
653655
<includesFile>src/test/resources/slow-or-flaky-tests.txt</includesFile>
654-
<argLine>@{jacoco.surefire.argLine} ${surefire.argLine}</argLine>
655656
</configuration>
656657
</execution>
657658
</executions>

0 commit comments

Comments
 (0)