From c099f2795669b81e9befbafe85a43a073d5cba3e Mon Sep 17 00:00:00 2001
From: Mark Diggory <mdiggory@atmire.com>
Date: Tue, 20 Sep 2011 20:08:33 +0000
Subject: [PATCH] [DS-1018] 'dspace-1.8.0-rc1-release.zip' is structured
 differently than 'dspace-1.8.0-rc1-src-release.zip'  We will utilize the
 maven assembly plugin to carry the descriptors so that they are not confused
 with application source s the end-user developer needs to work
 with/understand. Will update to final release once propagated to central
 repository.

git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6726 9c30dcfa-912a-0410-8fc2-9e0234be79fd
---
 pom.xml                      | 17 ++++++++++++-----
 src/assemble/release.xml     | 36 ------------------------------------
 src/assemble/src-release.xml | 33 ---------------------------------
 3 files changed, 12 insertions(+), 74 deletions(-)
 delete mode 100644 src/assemble/release.xml
 delete mode 100644 src/assemble/src-release.xml

diff --git a/pom.xml b/pom.xml
index 1745294afb23..de6d3bbe4f7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -272,12 +272,12 @@
                      <execution>
                         <inherited>false</inherited>
                         <configuration>
-                           <descriptors>
-                              <descriptor>src/assemble/release.xml</descriptor>
-                              <descriptor>src/assemble/src-release.xml</descriptor>
-                           </descriptors>
+                           <descriptorRefs>
+                              <descriptorRef>release</descriptorRef>
+                              <descriptorRef>src-release</descriptorRef>
+                           </descriptorRefs>
                            <tarLongFileMode>gnu</tarLongFileMode>
-                           <finalName>dspace-${project.version}</finalName>
+                           <finalName>dspace-${pom.version}</finalName>
                         </configuration>
                         <phase>package</phase>
                         <goals>
@@ -285,6 +285,13 @@
                         </goals>
                      </execution>
                   </executions>
+                  <dependencies>
+                     <dependency>
+                        <groupId>org.dspace.maven.plugins</groupId>
+                        <artifactId>dspace-assembly-plugin</artifactId>
+                        <version>1.2-SNAPSHOT</version>
+                     </dependency>
+                  </dependencies>
                </plugin>
             </plugins>
          </build>
diff --git a/src/assemble/release.xml b/src/assemble/release.xml
deleted file mode 100644
index ff609183c24d..000000000000
--- a/src/assemble/release.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
-
-    http://www.dspace.org/license/
-
--->
-<assembly xmlns="http://maven.apache.org/POM/4.0.0"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
-	<id>release</id>
-	<formats>
-		<format>zip</format>
-		<format>tar.gz</format>
-		<format>tar.bz2</format>
-	</formats>
-	<includeBaseDirectory>true</includeBaseDirectory>
-	<baseDirectory>${finalName}-release</baseDirectory>
-	<fileSets>
-		<fileSet>
-			<useDefaultExcludes>true</useDefaultExcludes>
-			<includes>
-				<include>dspace</include>
-			</includes>
-			<excludes>
-				<exclude>**/target/**</exclude>
-				<exclude>make-release-package</exclude>
-				<exclude>.*</exclude>
-			</excludes>
-		</fileSet>
-	</fileSets>
-
-</assembly>
\ No newline at end of file
diff --git a/src/assemble/src-release.xml b/src/assemble/src-release.xml
deleted file mode 100644
index 1cd60e947b5d..000000000000
--- a/src/assemble/src-release.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    The contents of this file are subject to the license and copyright
-    detailed in the LICENSE and NOTICE files at the root of the source
-    tree and available online at
-
-    http://www.dspace.org/license/
-
--->
-<assembly xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
-	<id>src-release</id>
-	<formats>
-		<format>zip</format>
-		<format>tar.gz</format>
-		<format>tar.bz2</format>
-	</formats>
-	<baseDirectory>${finalName}-src-release</baseDirectory>
-	<includeBaseDirectory>true</includeBaseDirectory>
-	<fileSets>
-		<fileSet>
-			<useDefaultExcludes>true</useDefaultExcludes>
-			<excludes>
-				<exclude>**/target/**</exclude>
-				<exclude>make-release-package</exclude>
-				<exclude>.*</exclude>
-			</excludes>
-		</fileSet>
-	</fileSets>
-
-</assembly>
\ No newline at end of file