Skip to content

Commit

Permalink
Upgrade some dependencies and plugins, and the CI actions in the .git…
Browse files Browse the repository at this point in the history
…hub maven.yaml file.
  • Loading branch information
davewichers committed Sep 6, 2023
1 parent cbf5bb5 commit 6cad4da
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 26 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/maven.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Set up JDK 8
uses: actions/setup-java@v3
with:
java-version: 1.8
- name: Run spotless check
java-version: '8'
distribution: 'zulu'
- name: Run Spotless check
run: mvn spotless:check
- name: Run unit tests
run: mvn test
Expand Down
42 changes: 21 additions & 21 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -619,7 +619,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.15</version>
<version>1.16.0</version>
</dependency>

<!-- mvn dependency:analyze says this is an unused declared dependency, but its wrong. Get this runtime error if it's not included: Caused by: org.springframework.beans.factory.CannotLoadBeanClassException: Cannot find class [org.apache.commons.dbcp.BasicDataSource] for bean with name 'dataSource' defined in class path resource [context.xml]; nested exception is java.lang.ClassNotFoundException: org.apache.commons.dbcp.BasicDataSource -->
Expand All @@ -640,7 +640,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
<version>2.0.7</version>
<version>2.0.9</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -750,7 +750,7 @@
<dependency>
<groupId>org.apache.httpcomponents.core5</groupId>
<artifactId>httpcore5</artifactId>
<version>5.2.1</version>
<version>5.2.2</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -860,12 +860,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.5.0</version>
<version>3.6.0</version>
<configuration>
<usedDependencies>
<dependency>com.sun.jersey:jersey-servlet</dependency>
Expand All @@ -879,7 +879,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.0.0</version>
<version>3.0.1</version>
</plugin>
</plugins>
</pluginManagement>
Expand All @@ -893,7 +893,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.1</version>
</plugin>

<plugin>
Expand All @@ -916,12 +916,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.0</version>
<dependencies>
<dependency>
<groupId>org.codehaus.mojo</groupId>
<artifactId>extra-enforcer-rules</artifactId>
<version>1.6.2</version>
<version>1.7.0</version>
</dependency>
</dependencies>
<executions>
Expand Down Expand Up @@ -961,7 +961,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-help-plugin</artifactId>
<version>3.3.0</version>
<version>3.4.0</version>
</plugin>

<plugin>
Expand All @@ -979,13 +979,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-pmd-plugin</artifactId>
<version>3.20.0</version>
<version>3.21.0</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.4.2</version>
<version>3.4.5</version>
</plugin>

<plugin>
Expand All @@ -998,7 +998,7 @@
<!-- Note: This uses the maven-fluido-skin version specified next. The skin is referenced in src/site/site.xml. -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>4.0.0-M7</version>
<version>4.0.0-M9</version>
<dependencies>
<!-- Explicitly declare these dependencies so the versions plugin and library bots will flag available updates. The fluido-skin plugin is referenced in src/site/site.xml using the same fluido version property. -->
<dependency>
Expand All @@ -1012,13 +1012,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0</version>
<version>3.1.2</version>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>3.3.2</version>
<version>3.4.0</version>
<configuration>
<webXml>${maven.war.webxml}</webXml>
</configuration>
Expand All @@ -1027,13 +1027,13 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven3-plugin</artifactId>
<version>1.10.3</version>
<version>1.10.9</version>
</plugin>

<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.15.0</version>
<version>2.16.0</version>
</plugin>

<!-- SpotBugs Static Analysis - the successor to FindBugs -->
Expand Down Expand Up @@ -1222,16 +1222,16 @@
<version.apacheds>1.5.7</version.apacheds>
<version.apache-shared-ldap>0.9.19</version.apache-shared-ldap>
<version.exec.maven>1.6.0</version.exec.maven>
<version.fluido>2.0.0-M6</version.fluido>
<version.fluido>2.0.0-M7</version.fluido>
<!-- hibernate is up to rev 6+. But 4.0.0. causes this error: symbol: org.hibernate.classic.Session not found -->
<version.hibernate>3.6.10.Final</version.hibernate>
<version.spotbugs.maven>4.7.3.4</version.spotbugs.maven>
<version.spotbugs.maven>4.7.3.5</version.spotbugs.maven>
<version.spotbugs>4.7.3</version.spotbugs>
<!-- Spring 6.x requires Java 17 -->
<version.springframework>5.3.27</version.springframework>
<version.springframework>5.3.29</version.springframework>
<!-- Tomcat 10 moves from Java EE to Jakarta EE, moving packages javax.* to jakarta.* - code changes likely required to address this change. -->
<tomcat.major.version>9</tomcat.major.version>
<version.tomcat>9.0.74</version.tomcat>
<version.tomcat>9.0.80</version.tomcat>
<tomcat.url>https://archive.apache.org/dist/tomcat/tomcat-${tomcat.major.version}/v${version.tomcat}/bin/apache-tomcat-${version.tomcat}.zip</tomcat.url>
</properties>

Expand Down

0 comments on commit 6cad4da

Please sign in to comment.