[java-idp-jetty-base] branch 10-windows updated: IDP-1916, IDP-=1915 Jetty10 for Windows Installer

[Rod Widdowson]

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=f641712de0948fcce2e100da38e2d3e99fd3f042

The following commit(s) were added to refs/heads/10-windows by this push:
     new f641712  IDP-1916, IDP-=1915 Jetty10 for Windows Installer
f641712 is described below

commit f641712de0948fcce2e100da38e2d3e99fd3f042
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Mar 7 16:16:48 2022 +0000

    IDP-1916, IDP-=1915 Jetty10 for Windows Installer
    
    Include the jetty94-dta-ssl-1.0.0.jar as a resource.
---
 pom.xml                                            |  29 ---------------------
 .../jetty-base/lib/ext/jetty94-dta-ssl-1.0.0.jar   | Bin 0 -> 5503 bytes
 2 files changed, 29 deletions(-)

diff --git a/pom.xml b/pom.xml
index d39b990..3075741 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,6 @@
     <version>10.0.0.8-WINDOWS-SNAPSHOT</version>
 
     <properties>
-        <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>
@@ -41,14 +40,6 @@
 
     <dependencies>
         <!-- Runtime depenendencies only -->
-        <!-- Our Jetty 9 DTA plugin -->
-        <dependency>
-            <groupId>net.shibboleth.utilities.jetty</groupId>
-            <artifactId>jetty10-dta-ssl</artifactId>
-            <version>${jetty-dta-ssl.version}</version>
-            <optional>true</optional>
-            <scope>runtime</scope>
-        </dependency>
         <!-- Logback -->
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -98,26 +89,6 @@
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
-                    <!-- Copy Jetty DTA plugin to jetty-base/lib/ext/ directory. -->
-                    <execution>
-                        <id>copy-jetty-dta-ssl</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <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>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
                     <!-- Copy Logback logging dependencies to jetty-base/lib/logging directory. -->
                     <execution>
                         <id>copy-jetty-logging-logback</id>
diff --git a/src/main/resources/jetty-base/lib/ext/jetty94-dta-ssl-1.0.0.jar b/src/main/resources/jetty-base/lib/ext/jetty94-dta-ssl-1.0.0.jar
new file mode 100644
index 0000000..bd7b281
Binary files /dev/null and b/src/main/resources/jetty-base/lib/ext/jetty94-dta-ssl-1.0.0.jar differ

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