From 0a1d41fbbb222c6f43b589ea6c1b5f6b860ccf1d Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Tue, 25 Mar 2014 11:44:49 +0100
Subject: remove tar.gz from assembly

---
 id/assembly-auth.xml  | 16 +++++++++++++---
 id/assembly-proxy.xml |  2 +-
 pom.xml               |  1 +
 spss/assembly-lib.xml |  2 +-
 spss/assembly.xml     |  2 +-
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/id/assembly-auth.xml b/id/assembly-auth.xml
index 9b5d7275c..4bb12dbab 100644
--- a/id/assembly-auth.xml
+++ b/id/assembly-auth.xml
@@ -3,8 +3,8 @@
 	
 	<formats>
 		<format>dir</format>
-<!-- 		<format>zip</format>
-		<format>tar.gz</format> -->
+		<format>zip</format>
+		<!-- <format>tar.gz</format> -->
 	</formats>
 
 	<baseDirectory>moa-id-auth-${project.version}</baseDirectory>
@@ -123,7 +123,7 @@
 			   <useDefaultExcludes>true</useDefaultExcludes>
 			   <outputDirectory>../</outputDirectory>
 			   <includeModuleDirectory>true</includeModuleDirectory>
-			   <outputDirectoryMapping>/source/${module.artifactId}/src</outputDirectoryMapping>
+			   <outputDirectoryMapping>/source/${artifactId}/src</outputDirectoryMapping>
 			   <excludes>			           
          		<exclude>**/target/**</exclude>
          		<exclude>**/bin/**</exclude>
@@ -139,6 +139,16 @@
 				<outputDirectory>/</outputDirectory>
 				<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
 				<unpack>false</unpack>
+				<dependencySets>
+					<dependencySet>
+						<includes>
+							<include>iaik:commons-iaik</include>
+							<include>MOA:moa-common</include>
+						</includes>
+						<outputDirectory>/source/repositority</outputDirectory>
+						<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+					</dependencySet>
+				</dependencySets>
 			</binaries>
 		</moduleSet>
 
diff --git a/id/assembly-proxy.xml b/id/assembly-proxy.xml
index 396afd84b..12ff534c2 100644
--- a/id/assembly-proxy.xml
+++ b/id/assembly-proxy.xml
@@ -4,7 +4,7 @@
 	<formats>
 		<format>dir</format>
 		<format>zip</format>
-		<format>tar.gz</format>
+		<!-- <format>tar.gz</format> -->
 	</formats>
 
 	<baseDirectory>moa-id-proxy-${project.version}</baseDirectory>
diff --git a/pom.xml b/pom.xml
index 236655298..06908810c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,7 @@
                 <!-- TODO Update Version 2.2-beta-1 for MOA-SPSS -->
                 <configuration>
                     <finalName>moa</finalName>
+                    <encoding>UTF-8</encoding>
                     <descriptors>
                         <descriptor>id/assembly-auth.xml</descriptor>
                         <descriptor>id/assembly-proxy.xml</descriptor>                         
diff --git a/spss/assembly-lib.xml b/spss/assembly-lib.xml
index c034f6082..895cc97c2 100644
--- a/spss/assembly-lib.xml
+++ b/spss/assembly-lib.xml
@@ -4,7 +4,7 @@
 	<formats>
 		<format>dir</format>
 		<format>zip</format>
-		<format>tar.gz</format>
+<!-- 		<format>tar.gz</format> -->
 	</formats>
 
 	<baseDirectory>moa-spss-lib-${project.version}</baseDirectory>
diff --git a/spss/assembly.xml b/spss/assembly.xml
index 1c560fe5d..17133d090 100644
--- a/spss/assembly.xml
+++ b/spss/assembly.xml
@@ -4,7 +4,7 @@
 	<formats>
 		<format>dir</format>
 		<format>zip</format>
-		<format>tar.gz</format>
+<!-- 		<format>tar.gz</format> -->
 	</formats>
 
 	<baseDirectory>moa-spss-${project.version}</baseDirectory>
-- 
cgit v1.2.3