[java-idp-jetty-base] branch 10-windows updated: IDP-2053 Update Jetty base for windows installer to Jetty 10/11.0.13

Rod Widdowson rdw at steadingsoftware.com
Tue Dec 13 15:00:21 UTC 2022


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

rdw pushed a commit to branch 10-windows
in repository java-idp-jetty-base.

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

The following commit(s) were added to refs/heads/10-windows by this push:
     new 33b527d  IDP-2053 Update Jetty base for windows installer to Jetty 10/11.0.13
33b527d is described below

commit 33b527d05fb78535dbcf241b3493408fdd562102
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Dec 13 14:59:48 2022 +0000

    IDP-2053 Update Jetty base for windows installer to Jetty 10/11.0.13
    
    https://shibboleth.atlassian.net/browse/IDP-2008
    
    Add jcl-over-slf4j to lib/logging
---
 pom.xml                                              | 12 ++++++++++++
 src/main/resources/jetty-base/start.d/idp-system.ini |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pom.xml b/pom.xml
index a64f67e..c8e9d53 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,7 @@
     <properties>
         <assemblyDirectory>${project.build.directory}/idp-jetty-base</assemblyDirectory>
         <logback.version>1.3.5</logback.version>
+        <slf4j.version>2.0.5</slf4j.version>
     </properties>
 
     <repositories>
@@ -51,6 +52,12 @@
             <artifactId>logback-core</artifactId>
             <version>${logback.version}</version>
         </dependency>
+        <!-- sl4j to allow early debug of Spring -->
+        <dependency>
+          <groupId>org.slf4j</groupId>
+          <artifactId>jcl-over-slf4j</artifactId>
+          <version>${slf4j.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -103,6 +110,11 @@
                                     <artifactId>logback-core</artifactId>
                                     <version>${logback.version}</version>
                                 </artifactItem>
+                                <artifactItem>
+				    <groupId>org.slf4j</groupId>
+				    <artifactId>jcl-over-slf4j</artifactId>
+				    <version>${slf4j.version}</version>
+                                </artifactItem>
                             </artifactItems>
                             <outputDirectory>${assemblyDirectory}/jetty-base/lib/logging/</outputDirectory>
                         </configuration>
diff --git a/src/main/resources/jetty-base/start.d/idp-system.ini b/src/main/resources/jetty-base/start.d/idp-system.ini
index 6cacd3a..8087167 100644
--- a/src/main/resources/jetty-base/start.d/idp-system.ini
+++ b/src/main/resources/jetty-base/start.d/idp-system.ini
@@ -14,6 +14,7 @@ jetty.http.port=80
 jetty.http.host=localhost
 
 logback.version=1.3.5
+slf4j.version=2.0.5
 
 ## 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.


More information about the commits mailing list