hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-17 15:03:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DS-881] DSpace doesn't build properly with Maven 3 : Adjust Assembly Process to be maintained in trunk, move binary release to exclude parent pom.

Browse Source 
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6620 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Mark Diggory
2011-08-30 05:49:33 +00:00
parent cb18e2cec0
commit 2c4d8022f1
3 changed files with 84 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
pom.xml
View File

@@ -254,10 +254,10 @@
<execution> <execution>
<inherited>false</inherited> <inherited>false</inherited>
<configuration> <configuration>
<descriptorRefs> <descriptors>
<descriptorRef>release</descriptorRef> <descriptor>src/assemble/release.xml</descriptor>
<descriptorRef>src-release</descriptorRef> <descriptor>src/assemble/src-release.xml</descriptor>
</descriptorRefs> </descriptors>
<tarLongFileMode>gnu</tarLongFileMode> <tarLongFileMode>gnu</tarLongFileMode>
<finalName>dspace-${project.version}</finalName> <finalName>dspace-${project.version}</finalName>
</configuration> </configuration>
@@ -267,13 +267,6 @@
</goals> </goals>
</execution> </execution>
</executions> </executions>
<dependencies>
<dependency>
<groupId>org.dspace.maven.plugins</groupId>
<artifactId>dspace-assembly-plugin</artifactId>
<version>1.1</version>
</dependency>
</dependencies>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
@@ -298,7 +291,7 @@
versions of dependency jars are used for compilation versions of dependency jars are used for compilation
and packaging into the distribution. Rather than placing and packaging into the distribution. Rather than placing
a version in your dependencies, look here first to see if a version in your dependencies, look here first to see if
its already strongly defined in dspace-pom and dspace-api. its already strongly defined in dspace-parent and dspace-api.
--> -->
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
@@ -306,102 +299,102 @@
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>dspace-api</artifactId> <artifactId>dspace-api</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>dspace-sword-api</artifactId> <artifactId>dspace-sword-api</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>dspace-sword-webapp</artifactId> <artifactId>dspace-sword-webapp</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>${project.version}</version>
<type>war</type> <type>war</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>dspace-swordv2-api</artifactId> <artifactId>dspace-swordv2-api</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>dspace-swordv2-webapp</artifactId> <artifactId>dspace-swordv2-webapp</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>${project.version}</version>
<type>war</type> <type>war</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>dspace-sword-client-api</artifactId> <artifactId>dspace-sword-client-api</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>dspace-sword-client-xmlui-api</artifactId> <artifactId>dspace-sword-client-xmlui-api</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>dspace-sword-client-xmlui-webapp</artifactId> <artifactId>dspace-sword-client-xmlui-webapp</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>${project.version}</version>
<type>war</type> <type>war</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>dspace-jspui-api</artifactId> <artifactId>dspace-jspui-api</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>dspace-jspui-webapp</artifactId> <artifactId>dspace-jspui-webapp</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>${project.version}</version>
<type>war</type> <type>war</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>dspace-oai-api</artifactId> <artifactId>dspace-oai-api</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>dspace-oai-webapp</artifactId> <artifactId>dspace-oai-webapp</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>${project.version}</version>
<type>war</type> <type>war</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>dspace-lni-core</artifactId> <artifactId>dspace-lni-core</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>dspace-lni-client</artifactId> <artifactId>dspace-lni-client</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>dspace-lni-webapp</artifactId> <artifactId>dspace-lni-webapp</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>${project.version}</version>
<type>war</type> <type>war</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>dspace-xmlui-api</artifactId> <artifactId>dspace-xmlui-api</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>dspace-xmlui-webapp</artifactId> <artifactId>dspace-xmlui-webapp</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>${project.version}</version>
<type>war</type> <type>war</type>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>dspace-xmlui-wing</artifactId> <artifactId>dspace-xmlui-wing</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
@@ -421,7 +414,7 @@
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>dspace-stats</artifactId> <artifactId>dspace-stats</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<!-- DSpace Localization Packages --> <!-- DSpace Localization Packages -->
<dependency> <dependency>
@@ -438,12 +431,12 @@
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>dspace-discovery-provider</artifactId> <artifactId>dspace-discovery-provider</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>dspace-discovery-solr</artifactId> <artifactId>dspace-discovery-solr</artifactId>
<version>1.8.0-SNAPSHOT</version> <version>${project.version}</version>
</dependency> </dependency>
<!-- DSpace third Party Dependencies --> <!-- DSpace third Party Dependencies -->
@@ -782,8 +775,8 @@
<licenses> <licenses>
<license> <license>
<name>DSpace Sourcecode License</name> <name>DuraSpace Sourcecode License</name>
<url>LICENSE.txt</url> <url>http://scm.dspace.org/svn/repo/licenses/LICENSE.txt</url>
<distribution>repo</distribution> <distribution>repo</distribution>
<comments> <comments>
A BSD compatable OSS license for the DSpace codebase. A BSD compatable OSS license for the DSpace codebase.
@@ -793,7 +786,7 @@
<issueManagement> <issueManagement>
<system>JIRA</system> <system>JIRA</system>
<url>http://jira.dspace.org/jira/browse/DS</url> <url>https://jira.duraspace.org/browse/DS</url>
</issueManagement> </issueManagement>
<mailingLists> <mailingLists>

28
src/assemble/release.xml Normal file
View File

@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>
<directory>dspace</directory>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
<include>**</include>
</includes>
<excludes>
<exclude>**/target/**</exclude>
<exclude>make-release-package</exclude>
<exclude>.*</exclude>
</excludes>
</fileSet>
</fileSets>
</assembly>

24
src/assemble/src-release.xml Normal file
View File

@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<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>