[java-identity-provider COMMIT] in /trunk: idp-distribution/pom.xml idp-distribution/src/main/resources/embedded/ idp...

[noreply at shibboleth.net]

Author: tzeller
Date: Mon Jul 11 16:12:58 2016
New Revision: 8293

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8293&view=rev
Log:
IDP-993 - Remove embedded/jetty-base from idp-distribution

Modified:
    trunk/idp-distribution/pom.xml
    trunk/idp-distribution/src/main/resources/embedded/
    trunk/idp-parent/pom.xml

Modified: trunk/idp-distribution/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/pom.xml?rev=8293&r1=8292&r2=8293&view=diff
==============================================================================
--- trunk/idp-distribution/pom.xml	(original)
+++ trunk/idp-distribution/pom.xml	Mon Jul 11 16:12:58 2016
@@ -33,13 +33,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>net.shibboleth.utilities.jetty9</groupId>
-            <artifactId>jetty9-dta-ssl</artifactId>
-            <version>${jetty9-dta-ssl.version}</version>
-            <optional>true</optional>
-            <scope>runtime</scope>
-        </dependency>
         <!-- Required if using classes with command line support. -->
         <dependency>
             <groupId>com.beust</groupId>
@@ -161,45 +154,6 @@
                             </artifactItems>
                         </configuration>
                     </execution>
-                    <!-- Copy Jetty DTA plugin to embedded/jetty-base/lib/ext directory. -->
-                    <execution>
-                        <id>copy-jetty-dta-ssl-92</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>net.shibboleth.utilities.jetty9</groupId>
-                                    <artifactId>jetty9-dta-ssl</artifactId>
-                                    <version>${jetty9-dta-ssl.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${idp.assemblyDirectory}/embedded/jetty-base/lib/ext</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>copy-jetty-dta-ssl-93</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>net.shibboleth.utilities.jetty9</groupId>
-                                    <artifactId>jetty9-dta-ssl</artifactId>
-                                    <version>${jetty9-dta-ssl.version}</version>
-                                    <type>jar</type>
-                                    <overWrite>false</overWrite>
-                                    <outputDirectory>${idp.assemblyDirectory}/embedded/jetty-base-9.3/lib/ext</outputDirectory>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
-                    </execution>
                     <!-- Copy runtime dependencies to bin\lib directory. -->
                     <execution>
                         <id>copy-runtime-dependencies</id>
@@ -231,63 +185,6 @@
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${idp.assemblyDirectory}/bin/lib/</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <!-- Copy logging dependencies to embedded/jetty-base/lib directory. (for Jetty logging) -->
-                    <execution>
-                        <id>copy-jetty-logging-dependencies-92</id>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>ch.qos.logback</groupId>
-                                    <artifactId>logback-classic</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>ch.qos.logback</groupId>
-                                    <artifactId>logback-core</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>ch.qos.logback</groupId>

[... 54 lines stripped ...]