[java-idp-testbed] branch main updated: Fix status page with updated JSP/JSTL deps and switch to 12 by default.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch main
in repository java-idp-testbed.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-testbed.git;a=commit;h=80884101f12bce6ca1f60b46e0bc9f120bb70bcb

The following commit(s) were added to refs/heads/main by this push:
     new 8088410  Fix status page with updated JSP/JSTL deps and switch to 12 by default.
8088410 is described below

commit 80884101f12bce6ca1f60b46e0bc9f120bb70bcb
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Mar 26 10:31:15 2024 -0400

    Fix status page with updated JSP/JSTL deps and switch to 12 by default.
---
 pom.xml | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 802fd21..41604de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,19 +29,19 @@
         <cas-client.version>3.6.4</cas-client.version>
         <oidc-commons.version>3.0.1-SNAPSHOT</oidc-commons.version>
         <!-- Jetty 11 -->
+        <!--
         <idp-jetty-base.version>11.0.0-SNAPSHOT</idp-jetty-base.version>
         <jetty.version>11.0.15</jetty.version>
         <jetty-jstl.version>11.0.0</jetty-jstl.version>
         <logback.version>1.4.6</logback.version>
         <slf4j.version>2.0.3</slf4j.version>
+        -->
         <!-- Jetty 12 -->
         <!-- Also requires removing the JSTL deps. -->
-        <!--
         <idp-jetty-base.version>12.0.0-SNAPSHOT</idp-jetty-base.version>
         <jetty.version>12.0.7</jetty.version>
         <logback.version>1.4.14</logback.version>
         <slf4j.version>2.0.9</slf4j.version>
-        -->
      </properties>
 
     <dependencies>
@@ -419,21 +419,38 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Don't know why we have to directly include this. -->
+
+        <!-- Don't know why we have to directly include these. -->
+        
+        <!-- Jetty 11 -->
+        <!--
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>apache-jsp</artifactId>
             <version>${jetty.version}</version>
             <scope>provided</scope>
         </dependency>
-
-        <!-- Don't know why we have to directly include this. -->
         <dependency>
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>apache-jstl</artifactId>
             <version>${jetty-jstl.version}</version>
             <scope>provided</scope>
         </dependency>
+        -->
+        
+        <!-- Jetty 12 -->
+        <dependency>
+            <groupId>org.eclipse.jetty.ee9</groupId>
+            <artifactId>jetty-ee9-apache-jsp</artifactId>
+            <version>${jetty.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty.ee9</groupId>
+            <artifactId>jetty-ee9-glassfish-jstl</artifactId>
+            <version>${jetty.version}</version>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- Runtime scope -->
         <dependency>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.