[java-idp-example-jetty-base] 01/03: Build .zip and .tar.gz artifacts instead of .jar.

Tom Zeller tzeller at dragonacea.biz
Wed May 25 16:42:59 EDT 2016


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

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

commit fe699e654f311c36748aff696e563211294a1f6a
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Wed May 25 12:33:16 2016 -0500

    Build .zip and .tar.gz artifacts instead of .jar.
---
 pom.xml                   | 50 +++++++++++++++++++++++++++++++++++++++++---
 src/main/assembly/bin.xml | 53 -----------------------------------------------
 src/main/assembly/tgz.xml | 14 +++++++++++++
 src/main/assembly/zip.xml | 37 +++++++++++++++++++++++++++++++++
 4 files changed, 98 insertions(+), 56 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9d663d6..f645eb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,11 +13,12 @@
     <name>idp-example-jetty-base</name>
     <groupId>net.shibboleth.idp.example</groupId>
     <artifactId>idp-example-jetty-base</artifactId>
-    <packaging>jar</packaging>
+    <packaging>pom</packaging>
     <version>9.2.0-SNAPSHOT</version>
 
     <properties>
         <jetty9-dta-ssl.version>1.0.0</jetty9-dta-ssl.version>
+        <assemblyDirectory>${project.build.directory}/idp-example-jetty-base</assemblyDirectory>
     </properties>
 
     <repositories>
@@ -75,6 +76,28 @@
 
     <build>
         <plugins>
+            <!-- Copy src/main/resources to assembly directory. -->
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <includeEmptyDirs>true</includeEmptyDirs>
+                            <outputDirectory>${assemblyDirectory}</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>${basedir}/src/main/resources</directory>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
@@ -93,7 +116,7 @@
                                     <version>${jetty9-dta-ssl.version}</version>
                                     <type>jar</type>
                                     <overWrite>false</overWrite>
-                                    <outputDirectory>${project.build.outputDirectory}/jetty-base/lib/ext</outputDirectory>
+                                    <outputDirectory>${assemblyDirectory}/jetty-base/lib/ext</outputDirectory>
                                 </artifactItem>
                             </artifactItems>
                         </configuration>
@@ -124,11 +147,32 @@
                                     <artifactId>jcl-over-slf4j</artifactId>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${project.build.outputDirectory}/jetty-base/lib/logging/</outputDirectory>
+                            <outputDirectory>${assemblyDirectory}/jetty-base/lib/logging/</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <appendAssemblyId>false</appendAssemblyId>
+                    <descriptors>
+                        <descriptor>src/main/assembly/tgz.xml</descriptor>
+                        <descriptor>src/main/assembly/zip.xml</descriptor>
+                    </descriptors>
+                    <tarLongFileMode>gnu</tarLongFileMode>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/src/main/assembly/bin.xml b/src/main/assembly/bin.xml
deleted file mode 100644
index 499de32..0000000
--- a/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd" >
-          
-	<id>bin</id>
-    
-	<formats>
-		<format>zip</format>
-	</formats>
-
-	<dependencySets>
-        <!-- Example dependency set. Directory and file mode and scope are important -->
-        <!--
-		<dependencySet>
-			<outputDirectory>/lib</outputDirectory>
-            <directoryMode>774</directoryMode>
-            <fileMode>444</fileMode>
-            <scope>compile</scope>
-			<includes>
-				<include>*:jar:*</include>
-			</includes>
-		</dependencySet>
-        -->
-	</dependencySets>
-
-	<fileSets>
-		<!-- Documentation -->
-		<fileSet>
-			<directory>doc/</directory>
-			<outputDirectory>/doc</outputDirectory>
-		</fileSet>
-		<fileSet>
-			<directory>target/site/apidocs</directory>
-			<outputDirectory>/doc/api</outputDirectory>
-		</fileSet>
-
-		<!-- Copy execution scripts into the root of the package -->
-        <!--
-		<fileSet>
-			<directory>src/main/bash</directory>
-			<outputDirectory/>
-			<includes>
-				<include>*.sh</include>
-			</includes>
-			<fileMode>0755</fileMode>
-			<directoryMode>0755</directoryMode>
-		</fileSet>
-        -->
-        
-	</fileSets>
-
-</assembly>
\ No newline at end of file
diff --git a/src/main/assembly/tgz.xml b/src/main/assembly/tgz.xml
new file mode 100644
index 0000000..72dcc14
--- /dev/null
+++ b/src/main/assembly/tgz.xml
@@ -0,0 +1,14 @@
+<?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>assembly-tgz</id>
+    <formats>
+        <format>tar.gz</format>
+    </formats>
+    <fileSets>
+        <fileSet>
+            <directory>${assemblyDirectory}</directory>
+            <outputDirectory></outputDirectory>
+        </fileSet>
+    </fileSets>
+</assembly>
diff --git a/src/main/assembly/zip.xml b/src/main/assembly/zip.xml
new file mode 100644
index 0000000..7fcec56
--- /dev/null
+++ b/src/main/assembly/zip.xml
@@ -0,0 +1,37 @@
+<?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>assembly-zip</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <fileSets>
+        <fileSet>
+            <directory>${assemblyDirectory}</directory>
+            <outputDirectory></outputDirectory>
+            <excludes>
+                <exclude>**/*.bat*</exclude>
+                <exclude>**/*.config*</exclude>
+                <exclude>**/*.ini*</exclude>
+                <exclude>**/*.properties*</exclude>
+                <exclude>**/*.txt*</exclude>
+                <exclude>**/*.vm*</exclude>
+                <exclude>**/*.xml*</exclude>
+            </excludes>
+        </fileSet>
+        <fileSet>
+            <directory>${assemblyDirectory}</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>**/*.bat*</include>
+                <include>**/*.config*</include>
+                <include>**/*.ini*</include>
+                <include>**/*.properties*</include>
+                <include>**/*.txt*</include>
+                <include>**/*.vm*</include>
+                <include>**/*.xml*</include>
+            </includes>
+            <lineEnding>windows</lineEnding>
+        </fileSet>
+    </fileSets>
+</assembly>

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


More information about the commits mailing list