Skip to content

Commit

Permalink
Various upgrades
Browse files Browse the repository at this point in the history
  • Loading branch information
ilgrosso committed Apr 16, 2024
1 parent efd16ca commit e5b1692
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 4 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ jobs:
distribution: 'zulu'
java-version: 8

- name: Setup Maven
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.6

- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ jobs:
distribution: 'zulu'
java-version: 8

- name: Setup Maven
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.9.6

- name: Cache local Maven repository
uses: actions/cache@v3
with:
Expand Down
32 changes: 28 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@

<properties>
<connid.version>1.5.2.0</connid.version>
<cxf.version>3.5.7</cxf.version>
<cxf.version>3.5.8</cxf.version>
<jackson.version>2.14.3</jackson.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -167,7 +167,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.11.0</version>
<version>3.13.0</version>
<inherited>false</inherited>
<configuration>
<source>${targetJdk}</source>
Expand All @@ -188,10 +188,34 @@
</configuration>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.4.1</version>
<executions>
<execution>
<id>default-cli</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireJavaVersion>
<version>${targetJdk}</version>
</requireJavaVersion>
<requireMavenVersion>
<version>3.9.5</version>
</requireMavenVersion>
</rules>
</configuration>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-plugin</artifactId>
<version>2.6.0</version>
<version>2.8.0</version>
<configuration>
<javaVersion>${targetJdk}</javaVersion>
</configuration>
Expand All @@ -209,7 +233,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.15</version>
<version>0.16.1</version>
<configuration>
<excludes>
<exclude>**/nbactions.xml</exclude>
Expand Down

0 comments on commit e5b1692

Please sign in to comment.