Merge pull request #59 from psibre/master

Fix for #58
marytts · Jul 6, 2012 · 654b2f7 · 654b2f7
2 parents 773d4a4 + f209a46
commit 654b2f7
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 6 deletions.
diff --git 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
@@ -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/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
@@ -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
@@ -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/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>

diff --git 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>