Skip to content

Commit

Permalink
Drop support for Building on Java 8
Browse files Browse the repository at this point in the history
  • Loading branch information
bitwiseman committed Sep 7, 2023
1 parent d0809b9 commit 2822729
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 24 deletions.
36 changes: 14 additions & 22 deletions .github/workflows/maven-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,28 +55,7 @@ jobs:
- name: Maven Site
env:
MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
run: mvn -B clean site -D enable-ci --file pom.xml
test-8:
name: test (${{ matrix.os }}, Java 8)
runs-on: ${{ matrix.os }}-latest
strategy:
fail-fast: false
matrix:
os: [ ubuntu ]
java: [ 8 ]
steps:
- uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java }}
distribution: 'temurin'
cache: 'maven'
# JDK 8
- name: Maven Install with Code Coverage
run: mvn -B clean install -D enable-ci -Djapicmp.skip --file pom.xml
- name: Codecov Report
uses: codecov/[email protected]
run: mvn -B clean site -D enable-ci --file pom.xml
test:
name: test (${{ matrix.os }}, Java ${{ matrix.java }})
runs-on: ${{ matrix.os }}-latest
Expand Down Expand Up @@ -104,3 +83,16 @@ jobs:
env:
MAVEN_OPTS: ${{ env.JAVA_11_PLUS_MAVEN_OPTS }}
run: mvn -B clean install -D enable-ci --file pom.xml "-Dsurefire.argLine=--add-opens java.base/java.net=ALL-UNNAMED"
- name: Codecov Report
if: matrix.os == 'ubuntu' && matrix.java == '17'
uses: codecov/[email protected]
- name: Set up JDK
if: matrix.os == 'ubuntu' && matrix.java == '17'
uses: actions/setup-java@v3
with:
java-version: 8
distribution: 'temurin'
cache: 'maven'
- name: Maven Test (no build) Java 8
if: matrix.os == 'ubuntu' && matrix.java == '17'
run: mvn -B surefire:test -Dsurefire.excludesFile=src/test/resources/slow-or-flaky-tests.txt
5 changes: 3 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -304,12 +304,14 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<argLine>@{jacoco.surefire.argLine} ${surefire.argLine}</argLine>
</configuration>
<executions>
<execution>
<id>default-test</id>
<configuration>
<excludesFile>src/test/resources/slow-or-flaky-tests.txt</excludesFile>
<argLine>@{jacoco.surefire.argLine} ${surefire.argLine}</argLine>
</configuration>
</execution>
</executions>
Expand Down Expand Up @@ -651,7 +653,6 @@
<!-- There are some tests that take longer or are a little
flaky. Run them here. -->
<includesFile>src/test/resources/slow-or-flaky-tests.txt</includesFile>
<argLine>@{jacoco.surefire.argLine} ${surefire.argLine}</argLine>
</configuration>
</execution>
</executions>
Expand Down

0 comments on commit 2822729

Please sign in to comment.