Skip to content

Commit

Permalink
Merge branch 'master' into TurquoiseSpace
Browse files Browse the repository at this point in the history
  • Loading branch information
matcdac authored Dec 9, 2023
2 parents a8b5395 + 9694ff1 commit efe5d45
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
run: echo "::set-output name=date::$(date +'%Y-%m-%d_%H-%M-%S_%Z')"

- name: Setup JDK
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: ${{ matrix.java }}
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<hamcrest.version>2.2</hamcrest.version>
<apache.maven-compiler-plugin.version>3.11.0</apache.maven-compiler-plugin.version>
<apache.maven-source-plugin.version>3.3.0</apache.maven-source-plugin.version>
<apache.maven-javadoc-plugin.version>3.6.2</apache.maven-javadoc-plugin.version>
<apache.maven-javadoc-plugin.version>3.6.3</apache.maven-javadoc-plugin.version>
<sonatype.plugins.nexus-staging-maven-plugin.version>1.6.13</sonatype.plugins.nexus-staging-maven-plugin.version>
<apache.maven-release-plugin.version>3.0.1</apache.maven-release-plugin.version>
<apache.maven-surefire-plugin.version>3.2.2</apache.maven-surefire-plugin.version>
Expand Down

0 comments on commit efe5d45

Please sign in to comment.