Skip to content
Merged
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/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@ jobs:
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
jdk: [11, 17, 21]
jdk: [21, 25]
include:
# lengthy build steps should only be performed on linux with Java 17 (Sonarcloud analysis, deployment)
- os: ubuntu-latest
jdk: 17
jdk: 21
isMainBuildEnv: true
namePrefix: 'Main '
fail-fast: false
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
fi
- name: Set up Maven
# https://maven.apache.org/wrapper/#using-a-different-version-of-maven
run: mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.2:wrapper "-Dmaven=3.9.9"
run: mvn --errors --batch-mode --show-version org.apache.maven.plugins:maven-wrapper-plugin:3.3.4:wrapper "-Dmaven=3.9.11"

- name: ${{ matrix.namePrefix }} Build with Maven ${{ env.STEP_NAME_SUFFIX }}
env:
Expand Down
19 changes: 14 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -203,11 +203,11 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.12</version>
<version>0.8.13</version>
</plugin>
<plugin>
<artifactId>maven-invoker-plugin</artifactId>
<version>3.7.0</version>
<version>3.9.1</version>
</plugin>
</plugins>
</pluginManagement>
Expand All @@ -224,8 +224,8 @@
<configuration>
<rules>
<requireJavaVersion>
<version>11</version>
<!-- require at least Java 11 for building, but build for Java 8 -->
<version>21</version>
<!-- require at least Java 21 for building, but build for Java 8 -->
</requireJavaVersion>
<requireMavenVersion>
<version>${maven.version}</version>
Expand All @@ -235,6 +235,15 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<annotationProcessors>
<!-- generate META-INF/services-->
<annotationProcessor>org.kohsuke.metainf_services.AnnotationProcessorImpl</annotationProcessor>
</annotationProcessors>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-invoker-plugin</artifactId>
Expand Down Expand Up @@ -303,7 +312,7 @@
<!-- orders of used formatters are important MPOM-376 -->
<!-- eg. palantir override importOrder, so should be first -->
<palantirJavaFormat>
<version>2.58.0</version>
<version>2.76.0</version>
</palantirJavaFormat>
<removeUnusedImports />
<importOrder>
Expand Down