This is an automated email from the ASF dual-hosted git repository.
snoopdave pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/roller.git
The following commit(s) were added to refs/heads/master by this push:
new 3a5801f0e Update dependencies across project and add JDK 25 to test
matrix (#180)
3a5801f0e is described below
commit 3a5801f0ea81b64fb311e5f9631431df97032b99
Author: Michael Bien <[email protected]>
AuthorDate: Sun Sep 6 13:56:11 2026 +0200
Update dependencies across project and add JDK 25 to test matrix (#180)
- point release updates within the same major version in most cases
- minor CI config update
---
.github/workflows/codeql-analysis.yml | 10 +++---
.github/workflows/main.yml | 14 +++++---
app/pom.xml | 42 +++++++++++-----------
app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp | 6 ++--
db-utils/pom.xml | 2 +-
it-selenium/pom.xml | 8 ++---
.../apache/roller/selenium/InitialLoginTestIT.java | 12 ++++---
.../roller/selenium/view/SingleBlogEntryPage.java | 1 -
pom.xml | 10 +++---
9 files changed, 56 insertions(+), 49 deletions(-)
diff --git a/.github/workflows/codeql-analysis.yml
b/.github/workflows/codeql-analysis.yml
index 083ca5feb..d06a70d93 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -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
@@ -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
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ba177a1d2..16ac36cf3 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -32,14 +32,16 @@ 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: |
@@ -47,7 +49,7 @@ jobs:
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
@@ -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
@@ -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
diff --git a/app/pom.xml b/app/pom.xml
index 5624c06d3..a55d266df 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
diff --git a/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
b/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
index a9036862a..14872d2f2 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
@@ -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" />
diff --git a/db-utils/pom.xml b/db-utils/pom.xml
index dfe199e88..adaf6fd17 100644
--- a/db-utils/pom.xml
+++ b/db-utils/pom.xml
@@ -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>
diff --git a/it-selenium/pom.xml b/it-selenium/pom.xml
index 57dfec683..fabe549a5 100644
--- a/it-selenium/pom.xml
+++ b/it-selenium/pom.xml
@@ -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>
@@ -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>
diff --git
a/it-selenium/src/test/java/org/apache/roller/selenium/InitialLoginTestIT.java
b/it-selenium/src/test/java/org/apache/roller/selenium/InitialLoginTestIT.java
index 95b396678..a5de111cf 100644
---
a/it-selenium/src/test/java/org/apache/roller/selenium/InitialLoginTestIT.java
+++
b/it-selenium/src/test/java/org/apache/roller/selenium/InitialLoginTestIT.java
@@ -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;
@@ -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 {
@@ -62,9 +63,9 @@ public class InitialLoginTestIT {
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/";
}
@@ -109,6 +110,7 @@ public class InitialLoginTestIT {
if (!"".equals(verificationErrorString)) {
fail(verificationErrorString);
}
+ driver.quit();
}
private boolean isElementPresent(By by) {
diff --git
a/it-selenium/src/test/java/org/apache/roller/selenium/view/SingleBlogEntryPage.java
b/it-selenium/src/test/java/org/apache/roller/selenium/view/SingleBlogEntryPage.java
index e96a76202..1ec82be03 100644
---
a/it-selenium/src/test/java/org/apache/roller/selenium/view/SingleBlogEntryPage.java
+++
b/it-selenium/src/test/java/org/apache/roller/selenium/view/SingleBlogEntryPage.java
@@ -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");
diff --git a/pom.xml b/pom.xml
index a83341e1c..44a3aa949 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -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>
@@ -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>
@@ -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>