Bump Wildfly to v37

README.md

@@ -1,5 +1,5 @@
 # weather [![CI](https://github.com/JeffersonLab/weather/actions/workflows/ci.yaml/badge.svg)](https://github.com/JeffersonLab/weather/actions/workflows/ci.yaml)
-A [Java EE 8](https://en.wikipedia.org/wiki/Jakarta_EE) web application for displaying Jefferson Lab weather for use in [Presenter](https://github.com/JeffersonLab/presenter).
+A [Jakarta EE 10](https://en.wikipedia.org/wiki/Jakarta_EE) web application for displaying Jefferson Lab weather for use in [Presenter](https://github.com/JeffersonLab/presenter).
 
 ![Screenshot](https://github.com/JeffersonLab/weather/raw/main/Screenshot.png?raw=true "Screenshot")
 
@@ -14,9 +14,9 @@ A [Java EE 8](https://en.wikipedia.org/wiki/Jakarta_EE) web application for disp
 ---
 
 ## Install
-This application requires a Java 17+ JVM and standard library to run, plus a Java EE 8+ application server (developed with Wildfly).
+This application requires a Java 17+ JVM and standard library to run, plus a Jakarta EE 10 application server (developed with Wildfly).
 
-1. Download [Wildfly 26.1.3](https://www.wildfly.org/downloads/)
+1. Download [Wildfly 37.0.1](https://www.wildfly.org/downloads/)
 2. [Configure](https://github.com/JeffersonLab/weather#configure) Wildfly and start it
 3. Download [weather.war](https://github.com/JeffersonLab/weather/releases) and deploy it to Wildfly
 4. Navigate your web browser to [localhost:8080/weather](http://localhost:8080/weather)
@@ -60,13 +60,13 @@ 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 at [ace.jlab.org/weather](https://ace.jlab.org/weather) and internally at [acctest.acc.jlab.org/weather](https://acctest.acc.jlab.org/weather).  However, those servers are proxies for `wildfly6.acc.jlab.org` and `wildflytest6.acc.jlab.org` respectively.   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 at [ace.jlab.org/weather](https://ace.jlab.org/weather) and internally at [acctest.acc.jlab.org/weather](https://acctest.acc.jlab.org/weather).  However, those servers are proxies for `wildfly5.acc.jlab.org` and `wildflytest5.acc.jlab.org` respectively.   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 weather v1.2.3
+/opt/wildfly/cd/deploy.sh weather 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)
 
 ## See Also
 - [Developer Notes](https://github.com/JeffersonLab/weather/wiki/Developer-Notes)

build.gradle

@@ -16,11 +16,12 @@ repositories {
     mavenCentral()
 }
 dependencies {
-    // Wildfly 26.1.3.Final provides:
-    providedCompile 'javax:javaee-api:8.0.1'
+    // 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'
 
     // Smoothness setup should install these into Wildfly
-    providedCompile 'org.tuckey:urlrewritefilter:4.0.4'
+    providedCompile 'org.tuckey:urlrewritefilter:5.1.3'
 }
 war {
     archiveFileName = 'weather.war'

src/main/java/org/jlab/weather/business/HourlyFetch.java

@@ -2,6 +2,12 @@
 
 import static java.time.temporal.ChronoUnit.SECONDS;
 
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.Resource;
+import jakarta.ejb.*;
+import jakarta.ejb.Timer;
+import jakarta.json.Json;
+import jakarta.json.stream.JsonParser;
 import java.io.*;
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -16,12 +22,6 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.zip.GZIPInputStream;
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-import javax.ejb.*;
-import javax.ejb.Timer;
-import javax.json.Json;
-import javax.json.stream.JsonParser;
 
 @Singleton
 @Startup

src/main/java/org/jlab/weather/business/WeatherData.java

@@ -1,6 +1,6 @@
 package org.jlab.weather.business;
 
-import javax.ejb.Singleton;
+import jakarta.ejb.Singleton;
 
 @Singleton
 public class WeatherData {

src/main/java/org/jlab/weather/presentation/Alerts.java

@@ -1,15 +1,15 @@
 package org.jlab.weather.presentation;
 
+import jakarta.ejb.EJB;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.jlab.weather.business.WeatherData;
 
 /**

src/main/java/org/jlab/weather/presentation/DailyAccuweatherForecast.java

@@ -1,15 +1,15 @@
 package org.jlab.weather.presentation;
 
+import jakarta.ejb.EJB;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.jlab.weather.business.WeatherData;
 
 /**

src/main/java/org/jlab/weather/presentation/DailyNWSForecast.java

@@ -1,15 +1,15 @@
 package org.jlab.weather.presentation;
 
+import jakarta.ejb.EJB;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.jlab.weather.business.WeatherData;
 
 /**

src/main/java/org/jlab/weather/presentation/HourlyAccuweatherForecast.java

@@ -1,15 +1,15 @@
 package org.jlab.weather.presentation;
 
+import jakarta.ejb.EJB;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.jlab.weather.business.WeatherData;
 
 /**

src/main/java/org/jlab/weather/presentation/HourlyNWSForecast.java

@@ -1,15 +1,15 @@
 package org.jlab.weather.presentation;
 
+import jakarta.ejb.EJB;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.jlab.weather.business.WeatherData;
 
 /**

src/main/java/org/jlab/weather/presentation/HourlyNWSForecastXML.java

@@ -1,15 +1,15 @@
 package org.jlab.weather.presentation;
 
+import jakarta.ejb.EJB;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.StandardCharsets;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.jlab.weather.business.WeatherData;
 
 /**

src/main/java/org/jlab/weather/presentation/Overview.java

@@ -1,11 +1,11 @@
 package org.jlab.weather.presentation;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 
 /**
  * @author ryans

src/main/java/org/jlab/weather/presentation/Radar.java

@@ -1,14 +1,14 @@
 package org.jlab.weather.presentation;
 
+import jakarta.ejb.EJB;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.WebServlet;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.logging.Logger;
-import javax.ejb.EJB;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import org.jlab.weather.business.WeatherData;
 
 /**

src/main/webapp/WEB-INF/views/overview.jsp

@@ -1,5 +1,5 @@
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="c" uri="jakarta.tags.core"%>
 <!DOCTYPE html>
 <html>
 <head>

src/main/webapp/WEB-INF/web.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app version="4.0" xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<web-app version="6.0"
+         xmlns="https://jakarta.ee/xml/ns/jakartaee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
-   http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd">
+         xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd">
     <welcome-file-list>
         <welcome-file>overview</welcome-file>
     </welcome-file-list>