diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 67d303f9d..0e1690eb9 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -30,17 +30,20 @@ jobs:
steps:
- name: Set up JDK 17
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
with:
java-version: 17
distribution: 'zulu'
- name: Checkout Project
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
+ with:
+ persist-credentials: false
+ submodules: false
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
- uses: github/codeql-action/init@v1
+ uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
config-file: ./.github/codeql/codeql-config.yml
@@ -49,4 +52,4 @@ jobs:
run: mvn -DskipTests=true -V -ntp install
- name: Perform CodeQL Analysis
- uses: github/codeql-action/analyze@v1
+ uses: github/codeql-action/analyze@v2
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 33a6c6089..64e7dcaa5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,9 +17,6 @@
name: Apache Roller
-# junit report action
-# https://github.com/marketplace/actions/junit-report-action
-
on:
push:
branches: [master]
@@ -30,21 +27,30 @@ jobs:
build-test:
name: Build+Test on Linux/JDK ${{ matrix.java }}
runs-on: ubuntu-latest
+ timeout-minutes: 30
strategy:
fail-fast: false
matrix:
- java: [ '11', '17', '18' ]
+ java: [ '11', '17', '20' ]
steps:
- name: Set up JDK ${{ matrix.java }}
- uses: actions/setup-java@v2
+ uses: actions/setup-java@v3
with:
java-version: ${{ matrix.java }}
distribution: 'zulu'
+ - 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@v3
+ with:
+ persist-credentials: false
+ submodules: false
- name: Build Roller and run JUnit Tests
run: mvn -V -ntp install
@@ -52,23 +58,19 @@ jobs:
- name: Run Integration Tests
run: |
cd it-selenium
- bash -c "wget -c https://github.com/mozilla/geckodriver/releases/download/v0.30.0/geckodriver-v0.30.0-linux64.tar.gz -O - | tar -xz"
- mvn -V -ntp install
+ mvn -V -ntp -Dwebdriver.gecko.driver=$GECKOWEBDRIVER/geckodriver install
-# TODO: needs submodule workaround since apache does not allow third party actions anymore
-# - name: Publish JUnit Report
-# uses: mikepenz/action-junit-report@v3
-# if: always()
-# with:
-# check_name: JUnit Reports for Linux/JDK ${{ matrix.java }}
-# report_paths: 'app/target/surefire-reports/TEST-*.xml'
-#
-# - name: Publish IT Report
-# uses: mikepenz/action-junit-report@v3
-# if: always()
-# with:
-# check_name: IT Reports for Linux/JDK ${{ matrix.java }}
-# report_paths: 'it-selenium/target/failsafe-reports/TEST-*.xml'
+ - name: Publish JUnit Report
+ uses: test-summary/action@v2
+ if: always()
+ with:
+ paths: "app/target/surefire-reports/TEST-*.xml"
+
+ - name: Publish IT Report
+ uses: test-summary/action@v2
+ if: always()
+ with:
+ paths: "it-selenium/target/failsafe-reports/TEST-*.xml"
# only on integration and only once in this matrix
- name: Upload Dev Build on Integration
diff --git a/app/pom.xml b/app/pom.xml
index 4431c026f..8c89d2816 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -39,24 +39,24 @@ limitations under the License.
1.4.7
1.2
1.7.8
- 1.10.12
- 9.3
+ 1.10.13
+ 9.4
1.70
1.7
1.9.4
1.15
- 3.0.2
+ 4.0.1
5.1.0
- 2.17.2
- 9.2.0
+ 2.20.0
+ 9.5.0
20100527
- 3.2.3
+ 3.3.2
2.22.2
1.0b3
- 1.18.0
+ 1.19.0
1.7.36
- 5.3.20
- 5.7.1
+ 5.3.25
+ 5.8.2
2.5.29
2.3
1.6
@@ -266,13 +266,13 @@ limitations under the License.
org.webjars
jquery
- 3.6.0
+ 3.6.1
org.webjars
jquery-ui
- 1.13.1
+ 1.13.2
@@ -284,7 +284,7 @@ limitations under the License.
org.webjars
jquery-validation
- 1.19.3
+ 1.19.5
@@ -365,7 +365,7 @@ limitations under the License.
org.apache.commons
commons-text
- 1.9
+ 1.10.0
@@ -812,7 +812,7 @@ limitations under the License.
org.codehaus.mojo
buildnumber-maven-plugin
- 1.4
+ 3.0.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 113c72e94..94ba96f33 100644
--- a/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
+++ b/app/src/main/webapp/WEB-INF/jsps/tiles/head.jsp
@@ -5,12 +5,12 @@ You can override it with your own file via WEB-INF/tiles-def.xml
<%@ include file="/WEB-INF/jsps/taglibs-struts2.jsp" %>
-
+
-
-
+
+
-
+
diff --git a/app/src/test/java/org/apache/roller/weblogger/business/CommentTest.java b/app/src/test/java/org/apache/roller/weblogger/business/CommentTest.java
index 7b5f21451..dd2d81523 100644
--- a/app/src/test/java/org/apache/roller/weblogger/business/CommentTest.java
+++ b/app/src/test/java/org/apache/roller/weblogger/business/CommentTest.java
@@ -28,6 +28,8 @@
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.List;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
import static org.junit.jupiter.api.Assertions.*;
@@ -48,6 +50,7 @@ public class CommentTest {
/**
* All tests in this suite require a user, weblog, and an entry.
*/
+ @BeforeEach
public void setUp() throws Exception {
// setup weblogger
@@ -63,7 +66,8 @@ public void setUp() throws Exception {
throw new Exception("Test setup failed", ex);
}
}
-
+
+ @AfterEach
public void tearDown() throws Exception {
try {
diff --git a/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java b/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java
index 62eac5eaf..1a55027a1 100644
--- a/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java
+++ b/app/src/test/java/org/apache/roller/weblogger/business/MediaFileTest.java
@@ -32,6 +32,7 @@
import java.io.File;
import java.sql.Timestamp;
import java.util.*;
+import org.junit.jupiter.api.BeforeEach;
import static org.junit.jupiter.api.Assertions.*;
@@ -47,13 +48,11 @@ public class MediaFileTest {
public MediaFileTest() {
}
+ @BeforeEach
public void setUp() throws Exception {
TestUtils.setupWeblogger();
}
- public void tearDown() throws Exception {
- }
-
/**
* Test creation of directory by path
*/
diff --git a/pom.xml b/pom.xml
index b42a6def9..80f438395 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@ limitations under the License.
UTF-8
10.11.1.1
2.3.1
- 10.0.5
+ 10.0.14
6.1.2-SNAPSHOT
@@ -59,7 +59,7 @@ limitations under the License.
org.apache.maven.plugins
maven-compiler-plugin
- 3.8.1
+ 3.11.0
11
true
@@ -90,7 +90,7 @@ limitations under the License.
org.codehaus.mojo
versions-maven-plugin
- 2.8.1
+ 2.15.0
file:version-rules.xml
@@ -113,7 +113,7 @@ limitations under the License.
org.junit.jupiter
junit-jupiter-engine
- 5.8.2
+ 5.9.2
test