[java-idp-jetty-base] branch 9.4-windows updated: IDP-1891 New jetty-base-windows for V4.1.5

[Rod Widdowson]

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

rdw pushed a commit to branch 9.4-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=6a0a09d948b4b79757f5ca794142fb837360dda3

The following commit(s) were added to refs/heads/9.4-windows by this push:
     new 6a0a09d  IDP-1891 New jetty-base-windows for V4.1.5
6a0a09d is described below

commit 6a0a09d948b4b79757f5ca794142fb837360dda3
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Jan 3 09:46:32 2022 +0000

    IDP-1891 New jetty-base-windows for V4.1.5
    
    https://shibboleth.atlassian.net/browse/IDP-1891
    
    Update to more recent parent pom
    Pin logback version to 1.2.9 In the pom and in idp-system.ini)
    Add enforcer checking
    Change POM version to 9.4.44-WINDOWS-SNAPSHOT
---
 pom.xml                                            | 22 +++++++++++++---------
 .../resources/jetty-base/start.d/idp-system.ini    |  5 ++++-
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6144ef3..c8bd9fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,20 +7,21 @@
     <parent>
         <groupId>net.shibboleth</groupId>
         <artifactId>parent</artifactId>
-        <version>11.2.2-SNAPSHOT</version>
+        <version>11.2.1</version>
     </parent>
 
     <name>idp-jetty-base</name>
     <groupId>net.shibboleth.idp</groupId>
     <artifactId>idp-jetty-base</artifactId>
     <packaging>pom</packaging>
-    <version>for-9.4.4x-WINDOWS-SNAPSHOT</version>
+    <version>for-9.4.44-WINDOWS-SNAPSHOT</version>
 
     <properties>
         <slf4j.version>1.7.32</slf4j.version>
         <logback.version>1.2.6</logback.version>
         <jetty94-dta-ssl.version>1.0.0</jetty94-dta-ssl.version>
         <assemblyDirectory>${project.build.directory}/idp-jetty-base</assemblyDirectory>
+        <logback.version>1.2.9</logback.version>
     </properties>
 
     <repositories>
@@ -192,7 +193,6 @@
                 <configuration>
                     <appendAssemblyId>false</appendAssemblyId>
                     <descriptors>
-                        <descriptor>src/main/assembly/tgz.xml</descriptor>
                         <descriptor>src/main/assembly/zip.xml</descriptor>
                         <!--  <descriptor>src/main/assembly/testbed.xml</descriptor> -->
                     </descriptors>
@@ -215,12 +215,12 @@
                     <dependency>
                         <groupId>net.shibboleth.maven.enforcer.rules</groupId>
                         <artifactId>maven-dist-enforcer</artifactId>
-                        <version>2.1.0</version>
+                        <version>3.1.0-SNAPSHOT</version>
                     </dependency>
                 </dependencies>
                 <executions>
                     <execution>
-                        <id>idp-enforce</id>
+                        <id>idp-jetty-base-enforce</id>
                         <phase>verify</phase>
                         <goals>
                             <goal>enforce</goal>
@@ -228,13 +228,17 @@
                         <configuration>
                             <rules>
                                 <jarEnforcer implementation="net.shibboleth.mvn.enforcer.impl.JarEnforcer">
-                                    <enforcerData>${basedir}/src/main/enforcer</enforcerData>
+                                    <dataGroupId>net.shibboleth.maven.enforcer.rules</dataGroupId>
+                                    <dataArtifactId>maven-dist-enforcer-data</dataArtifactId>
+                                    <dataVersion>1.0.0-SNAPSHOT</dataVersion>
+                                    <dataKeyRing>${basedir}/src/main/enforcer/shibbolethKeys.gpg</dataKeyRing>
                                     <parentPomDir>${basedir}</parentPomDir>
-                                    <jarDirs>${project.build.directory}/idp-jetty-base/jetty-base/lib/ext ${project.build.directory}/idp-jetty-base/jetty-base/lib/logback ${project.build.directory}/idp-jetty-base/jetty-base/lib/slf4j bin/lib </jarDirs>
+                                    <zipFiles>${project.build.directory}/idp-jetty-base-${project.version}.zip</zipFiles>
                                     <checkSignatures>true</checkSignatures>
-                                    <checkDependencies>false</checkDependencies>
+                                    <checkDependencies>true</checkDependencies>
                                     <listJarSources>false</listJarSources>
-                                </jarEnforcer>
+                                    <checkM2>${net.shibboleth.maven.enforcer.rules.checkM2}</checkM2>
+                                 </jarEnforcer>
                             </rules>
                         </configuration>
                     </execution>
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 d65fa6e..5cf837a 100644
--- a/src/main/resources/jetty-base/start.d/idp-system.ini
+++ b/src/main/resources/jetty-base/start.d/idp-system.ini
@@ -1,5 +1,5 @@
 #
-# Do not edit anything in this file
+# Do not edit anything in this file.  If you do, updates WILL fail
 #
 --module=http
 --module=idp
@@ -8,3 +8,6 @@
 
 ## Deny SSL renegotiation
 jetty.sslContext.renegotiationAllowed=false
+
+## Pin logback version
+logback.version=1.2.9

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