[java-identity-provider COMMIT] /trunk/idp-distribution/pom.xml

[noreply at shibboleth.net]

Author: rdw
Date: Wed May 11 04:52:26 2016
New Revision: 8240

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8240&view=rev
Log:
IDP-983 Add populate lib in the 8.3 jetty base

https://issues.shibboleth.net/jira/browse/IDP-983

Put the jars we need for jetty into the jetty-base-9.3 folder.  Not beign a MVN expert I just cloned the 9.2 entries.

Modified:
    trunk/idp-distribution/pom.xml

Modified: trunk/idp-distribution/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/pom.xml?rev=8240&r1=8239&r2=8240&view=diff
==============================================================================
--- trunk/idp-distribution/pom.xml	(original)
+++ trunk/idp-distribution/pom.xml	Wed May 11 04:52:26 2016
@@ -163,7 +163,7 @@
                     </execution>
                     <!-- Copy Jetty DTA plugin to embedded/jetty-base/lib/ext directory. -->
                     <execution>
-                        <id>copy-jetty-dta-ssl</id>
+                        <id>copy-jetty-dta-ssl-92</id>
                         <phase>prepare-package</phase>
                         <goals>
                             <goal>copy</goal>
@@ -181,6 +181,25 @@
                             </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>
@@ -216,7 +235,7 @@
                     </execution>
                     <!-- Copy logging dependencies to embedded/jetty-base/lib directory. (for Jetty logging) -->
                     <execution>
-                        <id>copy-jetty-logging-dependencies</id>
+                        <id>copy-jetty-logging-dependencies-92</id>
                         <phase>prepare-package</phase>
                         <goals>
                             <goal>copy</goal>
@@ -241,6 +260,34 @@
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${idp.assemblyDirectory}/embedded/jetty-base/lib/logging/</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>copy-jetty-logging-dependencies-93</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>
+                                    <artifactId>logback-access</artifactId>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>${slf4j.groupId}</groupId>
+                                    <artifactId>jcl-over-slf4j</artifactId>
+                                </artifactItem>
+                            </artifactItems>
+                            <outputDirectory>${idp.assemblyDirectory}/embedded/jetty-base-9.3/lib/logging/</outputDirectory>
                         </configuration>
                     </execution>
                     <!-- Copy logging dependencies to WEB-INF/lib directory. -->