[java-idp-jetty-base] branch dev/IDP-2285 updated: IDP-2285 Start looking at Windows Installer for Jetty12

[Rod Widdowson]

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

rdw pushed a commit to branch dev/IDP-2285
in repository java-idp-jetty-base.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=fd8fec87bd3513cd5886e14e1b08ad5fa0f06b62

The following commit(s) were added to refs/heads/dev/IDP-2285 by this push:
     new fd8fec8  IDP-2285 Start looking at Windows Installer for Jetty12
fd8fec8 is described below

commit fd8fec87bd3513cd5886e14e1b08ad5fa0f06b62
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Jun 28 10:31:18 2024 +0100

    IDP-2285 Start looking at Windows Installer for Jetty12
    
        https://shibboleth.atlassian.net/issues/IDP-2285
    
    Final polish
          * No need to pin the logback version
          * No need to track slf4j versions
          * roll back to jetty-12.0.8 (to match the "12" branch)
---
 pom.xml                                                   | 7 +++----
 src/main/resources/jetty-base/start.d.dist/idp-system.ini | 3 ---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 22b100a..2e0a48a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,19 +18,18 @@
     <groupId>net.shibboleth.idp</groupId>
     <artifactId>idp-jetty-base-windows</artifactId>
     <packaging>pom</packaging>
-    <version>12.0.9.0-SNAPSHOT</version>
+    <version>12.0.8.0-SNAPSHOT</version>
 
     <properties>
         <assemblyDirectory>${project.build.directory}/idp-jetty-base</assemblyDirectory>
-        <!-- dependencies for the shipped jetty-base -->
+        <!-- Dependencies for the shipped jetty-home -->
         <logback.version>1.5.3</logback.version>
-        <slf4j.version>2.0.12</slf4j.version>
         <!-- The things we will combine into the MSI -->
         <procrun.groupId>commons-daemon</procrun.groupId>
         <procrun.artifactId>commons-daemon</procrun.artifactId>
         <procrun.version>1.3.4</procrun.version>
         <procrun.classifier>bin-windows</procrun.classifier>
-        <jetty.version>12.0.9</jetty.version>
+        <jetty.version>12.0.8</jetty.version>
 	<!-- Control for building the MSI -->
         <jetty.revision>5</jetty.revision>
         <supress.validation>false</supress.validation>
diff --git a/src/main/resources/jetty-base/start.d.dist/idp-system.ini b/src/main/resources/jetty-base/start.d.dist/idp-system.ini
index 6b99943..cae682b 100644
--- a/src/main/resources/jetty-base/start.d.dist/idp-system.ini
+++ b/src/main/resources/jetty-base/start.d.dist/idp-system.ini
@@ -11,9 +11,6 @@ jetty.ssl.port=443
 jetty.http.port=80
 jetty.http.host=localhost
 
-# We still need this.  I don't know why
-logback.version=1.5.3
-
 ## Route request logging through standard logging API
 etc/jetty-requestlog.xml
 

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