diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 083ca5feb9..d06a70d935 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 ba177a1d2f..16ac36cf3a 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 5624c06d38..a55d266df3 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -38,26 +38,26 @@ limitations under the License.
1.2.0
1.2
1.7.8
- 1.10.15
- 9.7.1
+ 1.10.17
+ 9.10.1
1.70
- 1.9.0
- 1.10.0
- 1.18.0
- 1.13.0
- 3.17.0
- 4.0.5
+ 1.11.0
+ 1.11.0
+ 1.22.1
+ 1.15.0
+ 3.20.0
+ 4.0.9
7.0.0
- 2.24.3
- 9.12.1
+ 2.26.1
+ 9.12.3
20100527
- 3.4.0
- 3.5.2
+ 3.5.1
+ 3.5.6
1.0b3
1.19.0
- 2.0.16
+ 2.0.19
5.3.39
- 5.8.14
+ 5.8.16
2.5.29
2.4.1
1.6
@@ -273,7 +273,7 @@ limitations under the License.
org.webjars
jquery-ui
- 1.14.1
+ 1.14.2+1
@@ -285,7 +285,7 @@ limitations under the License.
org.webjars
jquery-validation
- 1.20.0
+ 1.21.0
@@ -581,14 +581,14 @@ limitations under the License.
org.mockito
mockito-core
- 5.15.2
+ 5.23.0
test
org.instancio
instancio-junit
- 5.3.0
+ 5.6.0
test
@@ -654,7 +654,7 @@ limitations under the License.
maven-resources-plugin
- 3.3.1
+ 3.5.0
@@ -737,7 +737,7 @@ limitations under the License.
maven-antrun-plugin
- 3.1.0
+ 3.2.0
ant-contrib
@@ -795,7 +795,7 @@ limitations under the License.
org.codehaus.mojo
buildnumber-maven-plugin
- 3.2.1
+ 3.3.0
validate
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 a9036862af..14872d2f25 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
-
-
+
+
-
+
diff --git a/db-utils/pom.xml b/db-utils/pom.xml
index dfe199e88a..adaf6fd170 100644
--- a/db-utils/pom.xml
+++ b/db-utils/pom.xml
@@ -54,7 +54,7 @@
org.apache.commons
commons-lang3
- 3.14.0
+ 3.20.0
compile
diff --git a/it-selenium/pom.xml b/it-selenium/pom.xml
index 57dfec683e..fabe549a5b 100644
--- a/it-selenium/pom.xml
+++ b/it-selenium/pom.xml
@@ -48,14 +48,14 @@
org.seleniumhq.selenium
selenium-java
- 4.28.0
+ 4.48.0
test
org.seleniumhq.selenium
selenium-firefox-driver
- 4.28.0
+ 4.48.0
javax.servlet
@@ -122,13 +122,13 @@
can be removed once maven itself bumped the version -->
maven-war-plugin
- 3.4.0
+ 3.5.1
maven-failsafe-plugin
- 3.5.2
+ 3.5.6
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 95b396678e..a5de111cf3 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 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/";
}
@@ -109,6 +110,7 @@ public void tearDown() throws Exception {
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 e96a76202a..1ec82be033 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 a83341e1c5..44a3aa9492 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,10 +40,10 @@ limitations under the License.
- 10.11.1.1
+ 10.15.2.0
1.4.7
2.3.1
- 10.0.24
+ 10.0.26
UTF-8
UTF-8
6.1.6
@@ -62,7 +62,7 @@ limitations under the License.
org.apache.maven.plugins
maven-compiler-plugin
- 3.13.0
+ 3.15.0
11
true
@@ -93,7 +93,7 @@ limitations under the License.
org.codehaus.mojo
versions-maven-plugin
- 2.18.0
+ 2.21.0
file:version-rules.xml
@@ -107,7 +107,7 @@ limitations under the License.
org.junit.jupiter
junit-jupiter-engine
- 5.11.4
+ 5.14.4
test