From 194cdbb7ae559b275e6fa89484a0ed5acd15f7a9 Mon Sep 17 00:00:00 2001
From: Ingmar Steiner <psibre@gmail.com>
Date: Fri, 6 Jul 2012 12:19:05 +0100
Subject: [PATCH 1/2] fixes #58

updating to maven-assembly-plugin:2.3 and removing the overrides in the marytts-assembly modules seems to resolve this issue
---
 marytts-assembly/assembly-builder/pom.xml | 1 -
 marytts-assembly/assembly-runtime/pom.xml | 1 -
 pom.xml                                   | 5 +++++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/marytts-assembly/assembly-builder/pom.xml b/marytts-assembly/assembly-builder/pom.xml
index 4ded8978ac..bd486bb65b 100644
--- a/marytts-assembly/assembly-builder/pom.xml
+++ b/marytts-assembly/assembly-builder/pom.xml
@@ -74,7 +74,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2.1</version>
         <configuration>
           <finalName>${project.parent.artifactId}-builder-${project.parent.version}</finalName>
           <outputDirectory>${project.parent.build.directory}</outputDirectory>
diff --git a/marytts-assembly/assembly-runtime/pom.xml b/marytts-assembly/assembly-runtime/pom.xml
index 4f830c7848..f31ad5883d 100644
--- a/marytts-assembly/assembly-runtime/pom.xml
+++ b/marytts-assembly/assembly-runtime/pom.xml
@@ -83,7 +83,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2.1</version>
         <configuration>
           <finalName>${project.parent.artifactId}-${project.parent.version}</finalName>
           <outputDirectory>${project.parent.build.directory}</outputDirectory>
diff --git a/pom.xml b/pom.xml
index 42f514d5b6..249d41009c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,6 +99,11 @@
            <artifactId>maven-site-plugin</artifactId>
            <version>2.2</version>
         </plugin>
+        <plugin>
+        	<groupId>org.apache.maven.plugins</groupId>
+        	<artifactId>maven-assembly-plugin</artifactId>
+        	<version>2.3</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   <plugins>

From f209a46874f91def70b618b8ed6993519dfe9317 Mon Sep 17 00:00:00 2001
From: Ingmar Steiner <psibre@gmail.com>
Date: Fri, 6 Jul 2012 12:31:17 +0100
Subject: [PATCH 2/2] also removing maven-assembly-plugin version overrides in
 a few other modules for good measure

---
 marytts-builder/pom.xml    | 1 -
 marytts-client/pom.xml     | 1 -
 marytts-server/pom.xml     | 1 -
 voice-cmu-slt-hsmm/pom.xml | 1 -
 4 files changed, 4 deletions(-)

diff --git a/marytts-builder/pom.xml b/marytts-builder/pom.xml
index 0a60485cae..2d2c05d5bd 100644
--- a/marytts-builder/pom.xml
+++ b/marytts-builder/pom.xml
@@ -99,7 +99,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2.1</version>
         <configuration>
           <descriptorRefs>
             <descriptorRef>jar-with-dependencies</descriptorRef>
diff --git a/marytts-client/pom.xml b/marytts-client/pom.xml
index 6ca1dd572d..de825b4de8 100644
--- a/marytts-client/pom.xml
+++ b/marytts-client/pom.xml
@@ -18,7 +18,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2.1</version>
         <configuration>
           <descriptorRefs>
             <descriptorRef>jar-with-dependencies</descriptorRef>
diff --git a/marytts-server/pom.xml b/marytts-server/pom.xml
index 1089f13f2b..ff9b42e866 100644
--- a/marytts-server/pom.xml
+++ b/marytts-server/pom.xml
@@ -57,7 +57,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2.1</version>
         <configuration>
           <descriptorRefs>
             <descriptorRef>jar-with-dependencies</descriptorRef>
diff --git a/voice-cmu-slt-hsmm/pom.xml b/voice-cmu-slt-hsmm/pom.xml
index 36cd1a6f9f..db994791ef 100644
--- a/voice-cmu-slt-hsmm/pom.xml
+++ b/voice-cmu-slt-hsmm/pom.xml
@@ -43,7 +43,6 @@
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2.1</version>
         <configuration>
           <finalName>${project.artifactId}-${project.version}</finalName>
           <outputDirectory>${project.build.directory}</outputDirectory>