Skip to content

Commit

Permalink
Merge pull request #401 from ascopes/task/java-23
Browse files Browse the repository at this point in the history
Use JDK 23 for builds
  • Loading branch information
ascopes authored Sep 23, 2024
2 parents b97acb2 + 3fa1796 commit 2eb9440
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 23 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
fail-fast: false
matrix:
os-name: [ubuntu-latest, macos-latest, windows-latest]
java-version: [11, 22]
java-version: [11, 23]

steps:
- name: Checkout code
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java-version: [11, 22]
java-version: [11, 23]

steps:
- name: Checkout code
Expand Down Expand Up @@ -129,10 +129,10 @@ jobs:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up JDK 11
- name: Set up JDK 23
uses: actions/setup-java@v4
with:
java-version: 11
java-version: 23
distribution: 'temurin'
cache: maven

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: 22
java-version: 23
distribution: 'temurin'
server-id: ossrh
server-username: OSSRH_USERNAME
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/security.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
- name: Initialize Java environment
uses: actions/setup-java@v4
with:
distribution: zulu
java-version: 22
distribution: temurin
java-version: 23

- name: Submit Dependency Snapshot
uses: advanced-security/maven-dependency-submission-action@v4
Expand Down
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@
<compilerArg>-Xlint:all,-classfile,-processing,-requires-automatic,-serial</compilerArg>
</compilerArgs>
<failOnWarning>true</failOnWarning>
<proc>full</proc>
<showDeprecation>true</showDeprecation>
<release>11</release>
</configuration>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@ public AbstractGenerateMojo() {
log = LoggerFactory.getLogger(getClass());
}

///
/// MOJO dependencies.
///

/**
* The source code generator.
*/
Expand All @@ -88,10 +84,6 @@ public AbstractGenerateMojo() {
@Inject
MavenProject mavenProject;

///
/// MOJO parameters.
///

/**
* Binary plugins to use with the protobuf compiler, sourced from a Maven repository.
*
Expand Down Expand Up @@ -624,10 +616,6 @@ public AbstractGenerateMojo() {
@Parameter
@Nullable List<File> sourceDirectories;

///
/// Language enabling flags
///

/**
* Enable generating C++ sources from the protobuf sources.
*
Expand Down Expand Up @@ -721,10 +709,6 @@ public AbstractGenerateMojo() {
@Parameter(defaultValue = DEFAULT_FALSE)
boolean rustEnabled;

///
/// Internal functionality
///

/**
* Provides the source root registrar for this Mojo.
*
Expand Down

0 comments on commit 2eb9440

Please sign in to comment.