Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
ff34095
Upgrade to Java 17, Derby 10.16.1.1, and fix SLF4J bridge
mraible Aug 11, 2026
68e4af4
Remove OAuth 1.0a, OpenID 2.0 filter, and unused dependencies
mraible Aug 11, 2026
a1c7377
Fork XmlRpcServlet and AtomServlet into Roller codebase
mraible Aug 11, 2026
44e81c8
Migrate to Jakarta EE 10, Spring 7, Struts 7, and EclipseLink 5
mraible Aug 11, 2026
01086d6
Upgrade Jetty Maven plugin to 12, Tomcat to 10.1, and PostgreSQL to 16
mraible Aug 11, 2026
96f4e79
Update CI matrix to require Java 17 minimum
mraible Aug 11, 2026
ecb194d
Fix it-selenium module for Jakarta EE 10 migration
mraible Aug 11, 2026
33fe72e
Fix Struts DTD reference: struts-7.0.dtd does not exist
mraible Aug 11, 2026
6621c85
Rename fileUpload interceptor to actionFileUpload for Struts 7
mraible Aug 11, 2026
2738254
Fix Struts 7 parameter binding, OGNL allowlist, and static content path
mraible Aug 11, 2026
191ff81
Fix mvn jetty:run for the Jetty 12 plugin
mraible Aug 11, 2026
7867dc1
Permit unmatched requests explicitly under Spring Security 7
mraible Aug 11, 2026
2a39596
Serve WebJar assets from META-INF/resources instead of the webjars se…
mraible Aug 11, 2026
b9dff98
Restore the bootstrap form theme via the Jakarta struts2-bootstrap-pl…
mraible Aug 11, 2026
d12aa22
Fix the it-selenium jetty harness for the Jetty 12 plugin
mraible Aug 11, 2026
e62111e
Deliver uploaded files via Struts 7's UploadedFilesAware interface
mraible Aug 12, 2026
47a8cdd
Test against JDK 25 and upgrade Mockito so it can mock there
mraible Aug 12, 2026
dd2b283
Fix AtomPub basic authentication checking the wrong user's password
mraible Aug 12, 2026
14937ad
Run CI on pull requests that target feature branches so stacked PRs g…
mraible Aug 12, 2026
a908293
Restore null path info handling in the forked Atom adapter and stop r…
mraible Aug 13, 2026
b58edfd
Target Jakarta EE 11 so Spring Framework 7 runs on its supported base…
mraible Aug 13, 2026
aec70d0
Refuse stale AtomPub auth schemes and answer missing Content-Type wit…
mraible Aug 13, 2026
067afee
Merge remote-tracking branch 'upstream/master' into feature/jakarta-e…
mraible Sep 25, 2026
14993e2
Address review feedback: drop committed logs, inject servlet objects,…
mraible Sep 25, 2026
fc2d819
Update dependencies to their latest compatible releases and clear kno…
mraible Sep 25, 2026
c5d854b
Update the JDBC driver and mail jars the Docker image downloads
mraible Sep 25, 2026
6129f43
Let the setup token page share UIAction's injected request
mraible Sep 25, 2026
3e81b25
Bind request parameters only to @StrutsParameter-annotated members
mraible Sep 25, 2026
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
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ on:
push:
branches: [master]
pull_request:
branches: [master]
branches: [master, 'feature/**']

jobs:
build-test:
Expand All @@ -32,7 +32,7 @@ jobs:
strategy:
fail-fast: false
matrix:
java: [ '11', '17', '21', '25' ]
java: [ '17', '21', '25' ]

steps:
- name: Set up JDK ${{ matrix.java }}
Expand Down Expand Up @@ -79,7 +79,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') }}
if: ${{ (matrix.java == '17') && (github.event_name == 'push') }}
uses: actions/upload-artifact@v7
with:
name: dev-build
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ docker/postgresql-data
docker/roller-data
assembly-release/release.sh
it-selenium/overlays/
it-selenium/logs/
docker/postgresql-16-data
logs/
Comment thread
snoopdave marked this conversation as resolved.
12 changes: 7 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

# STAGE 1 - BUILD ------------------------------------------------

FROM maven:3-openjdk-17-slim as builder
FROM maven:3-eclipse-temurin-17 AS builder

COPY ./docker /project/docker

Expand All @@ -38,7 +38,7 @@ mvn -Duser.home=/builder/home -DskipTests=true -B clean install

# STAGE 2 - PACKAGE ------------------------------------------------

FROM tomcat:9-jdk17-openjdk-slim
FROM tomcat:11.0-jdk17-temurin

# Remove existing Tomcat webapps

Expand Down Expand Up @@ -70,9 +70,11 @@ RUN mkdir -p data/mediafiles data/searchindex

WORKDIR /usr/local/tomcat/lib
RUN apt-get update && apt-get install -y wget
RUN wget -O postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.3.1.jar
RUN wget https://repo1.maven.org/maven2/javax/mail/mail/1.4.7/mail-1.4.7.jar
#RUN wget https://repo1.maven.org/maven2/javax/activation/activation/1.1.1/activation-1.1.1.jar
RUN wget -O postgresql.jar https://repo1.maven.org/maven2/org/postgresql/postgresql/42.7.13/postgresql-42.7.13.jar
RUN wget https://repo1.maven.org/maven2/org/eclipse/angus/angus-mail/2.0.5/angus-mail-2.0.5.jar
RUN wget https://repo1.maven.org/maven2/jakarta/mail/jakarta.mail-api/2.1.5/jakarta.mail-api-2.1.5.jar
RUN wget https://repo1.maven.org/maven2/jakarta/activation/jakarta.activation-api/2.1.4/jakarta.activation-api-2.1.4.jar
RUN wget https://repo1.maven.org/maven2/org/eclipse/angus/angus-activation/2.0.3/angus-activation-2.0.3.jar

# Add Roller entry-point and go!

Expand Down
Loading
Loading