Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v4
uses: actions/checkout@v6

- name: Initialize CodeQL
uses: github/codeql-action/init@v3
uses: github/codeql-action/init@v4
with:
languages: ${{ matrix.language }}
build-mode: ${{ matrix.build-mode }}

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
uses: github/codeql-action/analyze@v4
with:
category: "/language:${{matrix.language}}"
8 changes: 4 additions & 4 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ jobs:
contents: read
strategy:
matrix:
java: [8, 11, 17, 21]
java: [11, 17, 21, 25]
os: [ubuntu-latest, windows-latest, macos-latest]
runs-on: ${{ matrix.os }}
env:
maven_commands: test javadoc:javadoc # default is install
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
java-version: ${{ matrix.java }}
distribution: 'zulu'
Expand All @@ -37,7 +37,7 @@ jobs:
if: startsWith(github.ref, 'refs/tags')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- name: Create a GitHub release
run: gh release create --generate-notes "${GITHUB_REF#refs/tags/}"
env:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ following before submitting a pull request:

* verify that the branch merges cleanly into ```master```
* verify that the branch builds using Maven
* verify that the branch does not use syntax or API specific to Java 1.9+
* verify that the branch does not use syntax or API specific to Java > 11
* run the unit tests (```mvn test```) and correct any failures
* make sure that your commits contain the correct authorship information
* make sure that the commit messages or pull request comment contains
Expand Down
30 changes: 6 additions & 24 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,8 @@
</dependencies>

<properties>
<testng.version>7.9.0</testng.version>

<!-- NB: Avoid platform encoding warning when copying resources. -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
Expand Down Expand Up @@ -214,11 +216,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<!-- Require the Java 8 platform. -->
<!-- Require the Java 11 platform. -->
<configuration>
<release>8</release>
<source>8</source>
<target>8</target>
<release>11</release>
</configuration>
</plugin>

Expand Down Expand Up @@ -325,11 +325,11 @@
<artifactId>maven-javadoc-plugin</artifactId>
<!-- NB: The same version declaration and configuration block also
appears in the <reporting> section, and must be kept in sync. -->
<version>3.10.0</version>
<version>3.12.0</version>
<configuration>
<failOnError>true</failOnError>
<links>
<link>http://docs.oracle.com/javase/8/docs/api/</link>
<link>https://docs.oracle.com/en/java/javase/11/docs/api/</link>
</links>
</configuration>
<executions>
Expand Down Expand Up @@ -455,23 +455,5 @@
</plugins>
</build>
</profile>
<profile>
<id>jdk8-only</id>
<activation>
<jdk>(,11)</jdk>
</activation>
<properties>
<testng.version>7.5</testng.version>
</properties>
</profile>
<profile>
<id>jdk11+</id>
<activation>
<jdk>[11,)</jdk>
</activation>
<properties>
<testng.version>7.9.0</testng.version>
</properties>
</profile>
</profiles>
</project>
Loading