[java-idp-jetty-base] branch 9.4 updated: IDP-1110 - Revert assemblies to match Jetty 9.3

[Tom Zeller]

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

tzeller pushed a commit to branch 9.4
in repository java-idp-jetty-base.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-jetty-base.git;a=commit;h=0dd06e49c5e90f155ae274bcddf5f773590dec04

The following commit(s) were added to refs/heads/9.4 by this push:
       new  0dd06e4   IDP-1110 - Revert assemblies to match Jetty 9.3
0dd06e4 is described below

commit 0dd06e49c5e90f155ae274bcddf5f773590dec04
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Thu Nov 9 20:25:37 2017 -0600

    IDP-1110 - Revert assemblies to match Jetty 9.3
---
 pom.xml                                    | 9 ++++++---
 src/main/assembly/{unix.xml => tgz.xml}    | 2 +-
 src/main/assembly/{windows.xml => zip.xml} | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index cadd1a0..c16496c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,7 @@
                         </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>
@@ -103,6 +104,7 @@
                             </resources>
                         </configuration>
                     </execution>
+                     -->
                 </executions>
             </plugin>
             <plugin>
@@ -181,10 +183,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <configuration>
+                    <appendAssemblyId>false</appendAssemblyId>
                     <descriptors>
-                        <descriptor>src/main/assembly/unix.xml</descriptor>
-                        <descriptor>src/main/assembly/windows.xml</descriptor>
-                        <descriptor>src/main/assembly/testbed.xml</descriptor>
+                        <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>
diff --git a/src/main/assembly/unix.xml b/src/main/assembly/tgz.xml
similarity index 97%
rename from src/main/assembly/unix.xml
rename to src/main/assembly/tgz.xml
index d39889a..8763457 100644
--- a/src/main/assembly/unix.xml
+++ b/src/main/assembly/tgz.xml
@@ -1,7 +1,7 @@
 <?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>unix</id>
+    <id>tgz</id>
     <formats>
         <format>tar.gz</format>
     </formats>
diff --git a/src/main/assembly/windows.xml b/src/main/assembly/zip.xml
similarity index 98%
rename from src/main/assembly/windows.xml
rename to src/main/assembly/zip.xml
index 5d7550f..c6a9413 100644
--- a/src/main/assembly/windows.xml
+++ b/src/main/assembly/zip.xml
@@ -1,7 +1,7 @@
 <?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>windows</id>
+    <id>zip</id>
     <formats>
         <format>zip</format>
     </formats>

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