[java-idp-jetty-base] 01/04: IDP-1914 Work to ship Jetty 10 with the IdP Installer
Rod Widdowson
rdw at steadingsoftware.com
Sun Mar 6 14:50:33 UTC 2022
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to branch dev/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=6ae64fc29c8f717458da520c875b3e745073a95b
commit 6ae64fc29c8f717458da520c875b3e745073a95b
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Mar 4 14:48:37 2022 +0000
IDP-1914 Work to ship Jetty 10 with the IdP Installer
https://shibboleth.atlassian.net/browse/IDP-1914
Pom changes: add the enforcer, remove tgz.
---
pom.xml | 101 +++++++++++++++++++++--------------
src/main/assembly/testbed.xml | 22 --------
src/main/assembly/tgz.xml | 15 ------
src/main/enforcer/shibbolethKeys.gpg | Bin 0 -> 55209 bytes
4 files changed, 61 insertions(+), 77 deletions(-)
diff --git a/pom.xml b/pom.xml
index b854127..d39b990 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,10 +14,10 @@
<groupId>net.shibboleth.idp</groupId>
<artifactId>idp-jetty-base</artifactId>
<packaging>pom</packaging>
- <version>10.0.0-SNAPSHOT</version>
+ <version>10.0.0.8-WINDOWS-SNAPSHOT</version>
<properties>
- <jetty94-dta-ssl.version>1.0.0</jetty94-dta-ssl.version>
+ <jetty-dta-ssl.version>1.0.0-SNAPSHOT</jetty-dta-ssl.version>
<assemblyDirectory>${project.build.directory}/idp-jetty-base</assemblyDirectory>
<logback.version>1.3.0-alpha13</logback.version>
</properties>
@@ -40,23 +40,31 @@
</repositories>
<dependencies>
- <!-- Compile Dependencies -->
-
- <!-- Provided Dependencies -->
-
- <!-- Runtime Dependencies -->
+ <!-- Runtime depenendencies only -->
<!-- Our Jetty 9 DTA plugin -->
<dependency>
- <groupId>net.shibboleth.utilities.jetty9</groupId>
- <artifactId>jetty94-dta-ssl</artifactId>
- <version>${jetty94-dta-ssl.version}</version>
+ <groupId>net.shibboleth.utilities.jetty</groupId>
+ <artifactId>jetty10-dta-ssl</artifactId>
+ <version>${jetty-dta-ssl.version}</version>
<optional>true</optional>
<scope>runtime</scope>
</dependency>
-
- <!-- Test Dependencies -->
-
- <!-- Managed Dependencies -->
+ <!-- Logback -->
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>${logback.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-access</artifactId>
+ <version>${logback.version}</version>
+ </dependency>
</dependencies>
<build>
@@ -85,27 +93,6 @@
</resources>
</configuration>
</execution>
- <!-- Copy src/test/resources to assembly-testbed directory. -->
- <!-- Don't build the testbed this way, yet ...
- <execution>
- <id>copy-testbed-resources</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>copy-resources</goal>
- </goals>
- <configuration>
- <outputDirectory>${assemblyDirectory}-testbed</outputDirectory>
- <resources>
- <resource>
- <directory>${basedir}/src/test/resources</directory>
- <excludes>
- <exclude>**/.gitkeep</exclude>
- </excludes>
- </resource>
- </resources>
- </configuration>
- </execution>
- -->
</executions>
</plugin>
<plugin>
@@ -121,9 +108,9 @@
<configuration>
<artifactItems>
<artifactItem>
- <groupId>net.shibboleth.utilities.jetty9</groupId>
- <artifactId>jetty94-dta-ssl</artifactId>
- <version>${jetty94-dta-ssl.version}</version>
+ <groupId>net.shibboleth.utilities.jetty</groupId>
+ <artifactId>jetty10-dta-ssl</artifactId>
+ <version>${jetty-dta-ssl.version}</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${assemblyDirectory}/jetty-base/lib/ext</outputDirectory>
@@ -168,9 +155,7 @@
<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>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
@@ -184,6 +169,42 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>net.shibboleth.maven.enforcer.rules</groupId>
+ <artifactId>maven-dist-enforcer</artifactId>
+ <version>3.1.1-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ <executions>
+ <execution>
+ <id>idp-jetty-base-enforce</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <jarEnforcer implementation="net.shibboleth.mvn.enforcer.impl.JarEnforcer">
+ <dataGroupId>net.shibboleth.maven.enforcer.rules</dataGroupId>
+ <dataArtifactId>maven-dist-enforcer-data</dataArtifactId>
+ <dataVersion>1.0.1-SNAPSHOT</dataVersion>
+ <dataKeyRing>${basedir}/src/main/enforcer/shibbolethKeys.gpg</dataKeyRing>
+ <parentPomDir>${basedir}</parentPomDir>
+ <zipFiles>${project.build.directory}/idp-jetty-base-${project.version}.zip</zipFiles>
+ <checkSignatures>true</checkSignatures>
+ <checkDependencies>true</checkDependencies>
+ <listJarSources>false</listJarSources>
+ <checkM2>${net.shibboleth.maven.enforcer.rules.checkM2}</checkM2>
+ </jarEnforcer>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/src/main/assembly/testbed.xml b/src/main/assembly/testbed.xml
deleted file mode 100644
index 5b3687e..0000000
--- a/src/main/assembly/testbed.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
- <id>testbed</id>
- <formats>
- <format>zip</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>${assemblyDirectory}</directory>
- <excludes>
- <exclude>**/webapps/idp.xml</exclude>
- </excludes>
- <outputDirectory></outputDirectory>
- </fileSet>
- <fileSet>
- <directory>${assemblyDirectory}-testbed</directory>
- <outputDirectory></outputDirectory>
- </fileSet>
- </fileSets>
- <includeBaseDirectory>false</includeBaseDirectory>
-</assembly>
diff --git a/src/main/assembly/tgz.xml b/src/main/assembly/tgz.xml
deleted file mode 100644
index 8763457..0000000
--- a/src/main/assembly/tgz.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
- <id>tgz</id>
- <formats>
- <format>tar.gz</format>
- </formats>
- <fileSets>
- <fileSet>
- <directory>${assemblyDirectory}</directory>
- <outputDirectory></outputDirectory>
- </fileSet>
- </fileSets>
- <includeBaseDirectory>false</includeBaseDirectory>
-</assembly>
diff --git a/src/main/enforcer/shibbolethKeys.gpg b/src/main/enforcer/shibbolethKeys.gpg
new file mode 100644
index 0000000..6669d1e
Binary files /dev/null and b/src/main/enforcer/shibbolethKeys.gpg differ
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list