Skip to content

Update dependencies across project and add JDK 25 to test matrix #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snoopdave merged 1 commit into from
Sep 6, 2026
Merged

Update dependencies across project and add JDK 25 to test matrix #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions .github/workflows/codeql-analysis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,22 @@ jobs:

steps:
- name: Set up JDK 17
uses: actions/setup-java@v4
uses: actions/setup-java@v6
with:
java-version: 17
distribution: 'zulu'
problem-matcher: false

- name: Checkout Project
uses: actions/checkout@v4
uses: actions/checkout@v7
with:
persist-credentials: false
submodules: false
show-progress: false

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v4
with:
languages: ${{ matrix.language }}
config-file: ./.github/codeql/codeql-config.yml
Expand All @@ -52,4 +54,4 @@ jobs:
run: mvn -DskipTests=true -V -ntp install

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v4
14 changes: 9 additions & 5 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,24 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ '11', '17', '21', '23' ]
java: [ '11', '17', '21', '25' ]

steps:
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v4
uses: actions/setup-java@v6
with:
java-version: ${{ matrix.java }}
java-version: ${{ matrix.java }}
distribution: 'zulu'
# remove after build warning count is reduced
problem-matcher: false

- name: Setup Xvfb
run: |
echo "DISPLAY=:99.0" >> $GITHUB_ENV
Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &

- name: Checkout Project
uses: actions/checkout@v4
uses: actions/checkout@v7
with:
persist-credentials: false
submodules: false
Expand All @@ -66,6 +68,8 @@ jobs:
if: always()
with:
paths: "app/target/surefire-reports/TEST-*.xml"
show: all
folded: true

- name: Publish IT Report
uses: test-summary/action@v2
Expand All @@ -76,7 +80,7 @@ jobs:
# only on integration and only once in this matrix
- name: Upload Dev Build on Integration
if: ${{ (matrix.java == '11') && (github.event_name == 'push') }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: dev-build
path: ./app/target/roller.war
Expand Down
42 changes: 21 additions & 21 deletions app/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,26 +38,26 @@ limitations under the License.
<java-activation.version>1.2.0</java-activation.version>
<jstl.version>1.2</jstl.version>
<angular.version>1.7.8</angular.version>
<ant.version>1.10.15</ant.version>
<asm.version>9.7.1</asm.version>
<ant.version>1.10.17</ant.version>
<asm.version>9.10.1</asm.version>
<bouncycastle.version>1.70</bouncycastle.version>
<commons-validator.version>1.9.0</commons-validator.version>
<commons-beanutils.version>1.10.0</commons-beanutils.version>
<commons-codec.version>1.18.0</commons-codec.version>
<commons-text.version>1.13.0</commons-text.version>
<commons-lang3.version>3.17.0</commons-lang3.version>
<eclipse-link.version>4.0.5</eclipse-link.version>
<commons-validator.version>1.11.0</commons-validator.version>
<commons-beanutils.version>1.11.0</commons-beanutils.version>
<commons-codec.version>1.22.1</commons-codec.version>
<commons-text.version>1.15.0</commons-text.version>
<commons-lang3.version>3.20.0</commons-lang3.version>
<eclipse-link.version>4.0.9</eclipse-link.version>
<guice.version>7.0.0</guice.version>
<log4j2.version>2.24.3</log4j2.version>
<lucene.version>9.12.1</lucene.version> <!-- lucene 10 requires JDK 21 -->
<log4j2.version>2.26.1</log4j2.version>
<lucene.version>9.12.3</lucene.version> <!-- lucene 10 requires JDK 21 -->
<oauth-core.version>20100527</oauth-core.version>
<maven-war.version>3.4.0</maven-war.version>
<maven-surefire.version>3.5.2</maven-surefire.version>
<maven-war.version>3.5.1</maven-war.version>
<maven-surefire.version>3.5.6</maven-surefire.version>
<maven-antrun.version>1.0b3</maven-antrun.version>
<rome.version>1.19.0</rome.version> <!-- locked in place since next version removes popono -->
<slf4j.version>2.0.16</slf4j.version>
<slf4j.version>2.0.19</slf4j.version>
<spring.version>5.3.39</spring.version>
<spring.security.version>5.8.14</spring.security.version>
<spring.security.version>5.8.16</spring.security.version>
<struts.version>2.5.29</struts.version> <!-- .30+ breaks selenium tests -->
<velocity.version>2.4.1</velocity.version>
<webjars.version>1.6</webjars.version>
Expand Down Expand Up @@ -273,7 +273,7 @@ limitations under the License.
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery-ui</artifactId>
<version>1.14.1</version>
<version>1.14.2+1</version>
</dependency>

<dependency>
Expand All @@ -285,7 +285,7 @@ limitations under the License.
<dependency>
<groupId>org.webjars</groupId>
<artifactId>jquery-validation</artifactId>
<version>1.20.0</version>
<version>1.21.0</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -581,14 +581,14 @@ limitations under the License.
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.15.2</version>
<version>5.23.0</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.instancio</groupId>
<artifactId>instancio-junit</artifactId>
<version>5.3.0</version>
<version>5.6.0</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -654,7 +654,7 @@ limitations under the License.

<plugin>
<artifactId>maven-resources-plugin</artifactId>
<version>3.3.1</version>
<version>3.5.0</version>

<executions>

Expand Down Expand Up @@ -737,7 +737,7 @@ limitations under the License.

<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
<dependencies>
<dependency>
<groupId>ant-contrib</groupId>
Expand Down Expand Up @@ -795,7 +795,7 @@ limitations under the License.
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>3.2.1</version>
<version>3.3.0</version>
<executions>
<execution>
<phase>validate</phase>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ You can override it with your own file via WEB-INF/tiles-def.xml

<script src="<s:url value='/webjars/jquery/3.7.1/jquery.min.js' />"></script>

<script src="<s:url value='/webjars/jquery-ui/1.14.1/jquery-ui.min.js' />"></script>
<link href="<s:url value='/webjars/jquery-ui/1.14.1/jquery-ui.css' />" rel="stylesheet" />
<script src="<s:url value='/webjars/jquery-ui/1.14.2+1/jquery-ui.min.js' />"></script>
<link href="<s:url value='/webjars/jquery-ui/1.14.2+1/jquery-ui.css' />" rel="stylesheet" />

<script src="<s:url value='/webjars/jquery-validation/1.20.0/jquery.validate.min.js' />"></script>
<script src="<s:url value='/webjars/jquery-validation/1.21.0/jquery.validate.min.js' />"></script>

<link href="<s:url value='/webjars/bootstrap/3.4.1/css/bootstrap.min.css' />" rel="stylesheet" />
<link href="<s:url value='/webjars/bootstrap/3.4.1/css/bootstrap-theme.min.css' />" rel="stylesheet" />
Expand Down
2 changes: 1 addition & 1 deletion db-utils/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.14.0</version>
<version>3.20.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
Expand Down
8 changes: 4 additions & 4 deletions it-selenium/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,14 @@
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<version>4.28.0</version>
<version>4.48.0</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-firefox-driver</artifactId>
<version>4.28.0</version>
<version>4.48.0</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
Expand Down Expand Up @@ -122,13 +122,13 @@
can be removed once maven itself bumped the version -->
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>3.4.0</version>
<version>3.5.1</version>
</plugin>

<!-- Activates integration tests (by default, classes under tests that end with "IT") -->
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.5.2</version>
<version>3.5.6</version>
<executions>
<execution>
<goals>
Expand Down
12 changes: 7 additions & 5 deletions it-selenium/src/test/java/org/apache/roller/selenium/InitialLoginTestIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@
package org.apache.roller.selenium;

import java.awt.GraphicsEnvironment;
import java.util.concurrent.TimeUnit;
import java.time.Duration;
import java.time.temporal.ChronoUnit;
import org.apache.roller.selenium.core.CreateWeblogPage;
import org.apache.roller.selenium.core.LoginPage;
import org.apache.roller.selenium.core.MainMenuPage;
Expand Down Expand Up @@ -48,7 +49,7 @@ public class InitialLoginTestIT {
private WebDriver driver;
private String baseUrl;
private boolean acceptNextAlert = true;
private StringBuffer verificationErrors = new StringBuffer();
private final StringBuffer verificationErrors = new StringBuffer();

@Before
public void setUp() throws Exception {
Expand All @@ -62,9 +63,9 @@ public void setUp() throws Exception {
options.setProfile(profile);

driver = new FirefoxDriver(options);
driver.manage().timeouts().implicitlyWait(5, TimeUnit.SECONDS)
.pageLoadTimeout(5, TimeUnit.SECONDS)
.setScriptTimeout(5, TimeUnit.SECONDS);
driver.manage().timeouts().implicitlyWait(Duration.of(5, ChronoUnit.SECONDS))
.pageLoadTimeout(Duration.of(5, ChronoUnit.SECONDS))
.scriptTimeout(Duration.of(5, ChronoUnit.SECONDS));
baseUrl = "http://localhost:8080/roller/";
}

Expand Down Expand Up @@ -109,6 +110,7 @@ public void tearDown() throws Exception {
if (!"".equals(verificationErrorString)) {
fail(verificationErrorString);
}
driver.quit();
}

private boolean isElementPresent(By by) {
Expand Down
1 change: 0 additions & 1 deletion it-selenium/src/test/java/org/apache/roller/selenium/view/SingleBlogEntryPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ public class SingleBlogEntryPage extends AbstractRollerPage {

public SingleBlogEntryPage(WebDriver driver) {
this.driver = driver;
String pageTitle = "Single blog entry view";
/* id_permalink added to basic template's permalink.vm only to distinguish
this page from by-month or by-day views of blog entries */
verifyIdOnPage("id_permalink");
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ limitations under the License.
</scm>

<properties>
<derby.version>10.11.1.1</derby.version>
<derby.version>10.15.2.0</derby.version> <!-- 10.16 requires JDK 17 -->
<java-mail.version>1.4.7</java-mail.version>
<jaxb.version>2.3.1</jaxb.version>
<jetty.plugin.version>10.0.24</jetty.plugin.version> <!-- Jetty 11 requires Jakarta package names -->
<jetty.plugin.version>10.0.26</jetty.plugin.version> <!-- Jetty 11 requires Jakarta package names -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<roller.version>6.1.6</roller.version>
Expand All @@ -62,7 +62,7 @@ limitations under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.13.0</version>
<version>3.15.0</version>
<configuration>
<release>11</release>
<fork>true</fork>
Expand Down Expand Up @@ -93,7 +93,7 @@ limitations under the License.
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>versions-maven-plugin</artifactId>
<version>2.18.0</version>
<version>2.21.0</version>
<configuration>
<rulesUri>file:version-rules.xml</rulesUri>
</configuration>
Expand All @@ -107,7 +107,7 @@ limitations under the License.
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>5.11.4</version>
<version>5.14.4</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down