From 1db5a019971f3d144f5c7d48d8f085ac69226623 Mon Sep 17 00:00:00 2001 From: slominskir Date: Wed, 12 Nov 2025 10:51:40 -0500 Subject: [PATCH 1/6] Bump Wildfly to v37 Fixes #2 --- Dockerfile | 2 +- build.gradle | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 734dae8..97e96dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ ARG BUILD_IMAGE=gradle:9-jdk21 -ARG RUN_IMAGE=quay.io/wildfly/wildfly:26.1.3.Final-jdk17 +ARG RUN_IMAGE=jeffersonlab/wildfly:2.2.0 ################## Stage 0 FROM ${BUILD_IMAGE} AS builder diff --git a/build.gradle b/build.gradle index f54c36e..42571ab 100644 --- a/build.gradle +++ b/build.gradle @@ -16,8 +16,12 @@ repositories { mavenCentral() } dependencies { - providedCompile 'javax:javaee-api:8.0.1', - 'javax.servlet:jstl:1.2' + // Wildfly 37.0.1.Final provides: + providedCompile 'jakarta.platform:jakarta.jakartaee-api:10.0.0', + 'org.glassfish.web:jakarta.servlet.jsp.jstl:3.0.1' +} +tasks.named('jar') { + enabled = false } war { archiveFileName = 'resize.war' From 9a9fa63180e273d2619e596600f099ba6bc5cd10 Mon Sep 17 00:00:00 2001 From: slominskir Date: Wed, 12 Nov 2025 10:54:24 -0500 Subject: [PATCH 2/6] javax -> jakarta --- .../org/jlab/resize/ConverterController.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/jlab/resize/ConverterController.java b/src/main/java/org/jlab/resize/ConverterController.java index 9119f4a..bbf1ba6 100644 --- a/src/main/java/org/jlab/resize/ConverterController.java +++ b/src/main/java/org/jlab/resize/ConverterController.java @@ -1,5 +1,13 @@ package org.jlab.resize; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.annotation.MultipartConfig; +import jakarta.servlet.annotation.WebServlet; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Part; import java.awt.Dimension; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -16,14 +24,6 @@ import java.util.TimerTask; import java.util.logging.Level; import java.util.logging.Logger; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.annotation.MultipartConfig; -import javax.servlet.annotation.WebServlet; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.Part; import org.jlab.resize.util.IOUtil; /** From 5feb0291bc54ff54f8b7621c65dd1e89a957a2fa Mon Sep 17 00:00:00 2001 From: Ryan Slominski Date: Wed, 12 Nov 2025 13:58:52 -0500 Subject: [PATCH 3/6] Servlet v6 --- src/main/webapp/WEB-INF/web.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml index 50f22c6..3e0022a 100644 --- a/src/main/webapp/WEB-INF/web.xml +++ b/src/main/webapp/WEB-INF/web.xml @@ -1,8 +1,8 @@ - + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"> appName image-magic From 95b63233bfff21c32c610e26a606f0a9695ec650 Mon Sep 17 00:00:00 2001 From: Ryan Slominski Date: Wed, 12 Nov 2025 17:35:40 -0500 Subject: [PATCH 4/6] Remove ImageMagick --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 97e96dc..18fcaf4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,7 +24,6 @@ RUN if [ -z "${CUSTOM_CRT_URL}" ] ; then echo "No custom cert needed"; else \ curl -sS -o /etc/pki/ca-trust/source/anchors/customcert.crt $CUSTOM_CRT_URL \ && update-ca-trust \ && keytool -import -alias custom -file /etc/pki/ca-trust/source/anchors/customcert.crt -cacerts -storepass changeit -noprompt \ - ; fi \ - && yum install -y ImageMagick + ; fi USER jboss ENV MOGRIFY='/usr/bin/mogrify' \ No newline at end of file From cd7940d86f94bcd07adb20df7446aaab741a586b Mon Sep 17 00:00:00 2001 From: Ryan Slominski Date: Wed, 12 Nov 2025 17:37:20 -0500 Subject: [PATCH 5/6] README --- README.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index ce27215..0071c9f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # resize [![CI](https://github.com/JeffersonLab/resize/actions/workflows/ci.yaml/badge.svg)](https://github.com/JeffersonLab/resize/actions/workflows/ci.yaml) [![Docker](https://img.shields.io/docker/v/jeffersonlab/resize?sort=semver&label=DockerHub)](https://hub.docker.com/r/jeffersonlab/resize) -A [Java EE 8](https://en.wikipedia.org/wiki/Jakarta_EE) web application for resizing images via a wrapper to [ImageMagick](https://imagemagick.org/), developed for use by [Presenter](https://github.com/JeffersonLab/presenter). +A [Jakarta EE 10](https://en.wikipedia.org/wiki/Jakarta_EE) web application for resizing images via a wrapper to [ImageMagick](https://imagemagick.org/), developed for use by [Presenter](https://github.com/JeffersonLab/presenter). ![Screenshot](https://github.com/JeffersonLab/resize/raw/main/Screenshot.png?raw=true "Screenshot") @@ -31,7 +31,7 @@ http://localhost:8080/resize This application requires a Java 17+ JVM and standard library to run, plus a Java EE 8+ application server (developed with Wildfly). 1. Install ImageMagick -2. Download [Wildfly 26.1.3](https://www.wildfly.org/downloads/) +2. Download [Wildfly 37.0.1](https://www.wildfly.org/downloads/) 3. [Configure](https://github.com/JeffersonLab/resize#configure) Wildfly and start it 4. Download [resize.war](https://github.com/JeffersonLab/resize/releases) and deploy it to Wildfly 5. Navigate your web browser to [localhost:8080/resize](http://localhost:8080/resize) @@ -60,10 +60,10 @@ gradlew build - The [Create release](https://github.com/JeffersonLab/java-workflows/blob/main/.github/workflows/gh-release.yaml) GitHub Action to tag the source and create release notes summarizing any pull requests. Edit the release notes to add any missing details. A war file artifact is attached to the release. ## Deploy -At JLab this app is found internally at [wildfly6.acc.jlab.org/resize](https://wildfly6.acc.jlab.org/resize) and at [wildflytest6.acc.jlab.org/resize](https://wildflytest6.acc.jlab.org/resize). The `ace.jlab.org` and `acctest.acc.jlab.org` proxy servers do not proxy this internal only service. A [deploy script](https://github.com/JeffersonLab/wildfly/blob/main/scripts/deploy.sh) is provided to automate wget and deploy. Example: +At JLab this app is found internally at [wildfly5.acc.jlab.org/resize](https://wildfly6.acc.jlab.org/resize) and at [wildflytest5.acc.jlab.org/resize](https://wildflytest6.acc.jlab.org/resize). The `ace.jlab.org` and `acctest.acc.jlab.org` proxy servers do not proxy this internal only service. A [deploy script](https://github.com/JeffersonLab/wildfly/blob/main/scripts/deploy.sh) is provided to automate wget and deploy. Example: ``` -/root/setup/deploy.sh resize v1.2.3 +/opt/wildfly/cd/deploy.sh resize v1.2.3 ``` -**JLab Internal Docs**: [InstallGuideWildflyRHEL9](https://accwiki.acc.jlab.org/do/view/SysAdmin/InstallGuideWildflyRHEL9) +**JLab Internal Docs**: [RHEL9 Wildfly](https://acgdocs.acc.jlab.org/en/ace/builds/rhel9-wildfly) From 00c1388a2f4419dd03771dd6ecc01cff9166893b Mon Sep 17 00:00:00 2001 From: ryans Date: Mon, 5 Jan 2026 17:36:38 -0500 Subject: [PATCH 6/6] Comment out docker publish --- .github/workflows/cd.yaml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 99bdfa8..2fb128e 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -14,15 +14,16 @@ jobs: files: build/libs/resize.war secrets: inherit - docker_publish: - permissions: - contents: read - needs: - - release - uses: jeffersonlab/container-workflows/.github/workflows/docker-publish.yaml@v2 - with: - semvertag: ${{ needs.release.outputs.semvertag }} - secrets: inherit + # COMMENTED OUT BECAUSE OF ISSUE #4 + #docker_publish: + # permissions: + # contents: read + # needs: + # - release + # uses: jeffersonlab/container-workflows/.github/workflows/docker-publish.yaml@v2 + # with: + # semvertag: ${{ needs.release.outputs.semvertag }} + # secrets: inherit acctest_deploy: permissions: