hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 10:04:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DS-2590] Fix multiple issues with distributed archives.

Browse Source 
Include dspace/modules/*/src/main/webapps so build succeeds.
Avoid damaging a sample ZIP archive by munging "line endings".
Upgrade to maven-assembly-plugin 2.5.4 (which uncovered the line
ending problem).
This commit is contained in:
Mark H. Wood
2015-05-22 14:33:32 -04:00
parent 4a8fdf6843
commit 5cd56fb834
3 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
dspace/src/main/assembly/release.xml
View File

@@ -46,6 +46,19 @@
<!-- Ensure line endings in all files are Unix (LF) line endings-->
<lineEnding>unix</lineEnding>
</fileSet>
<!-- Ensure the presence of "empty" directories for build steps
that need them. -->
<fileSet>
<directory>..</directory>
<useDefaultExcludes>false</useDefaultExcludes>
<includes>
<include>dspace/modules/**/.gitignore</include>
</includes>
<excludes>
<exclude>**/target/**</exclude>
</excludes>
<lineEnding>unix</lineEnding>
</fileSet>
</fileSets>
</assembly>

25
dspace/src/main/assembly/src-release.xml
View File

@@ -33,10 +33,35 @@
<excludes>
<exclude>**/target/**</exclude>
<exclude>.*</exclude>
<exclude>**/*.zip</exclude>
</excludes>
<!-- Ensure line endings in all files are Unix (LF) line endings-->
<lineEnding>unix</lineEnding>
</fileSet>
<!-- Do not destroy ZIP archives by changing "line" endings! -->
<fileSet>
<directory>..</directory>
<useDefaultExcludes>true</useDefaultExcludes>
<includes>
<include>**/*.zip</include>
</includes>
<excludes>
<exclude>**/target/**</exclude>
</excludes>
</fileSet>
<!-- Ensure the presence of "empty" directories for build steps
that need them. -->
<fileSet>
<directory>..</directory>
<useDefaultExcludes>false</useDefaultExcludes>
<includes>
<include>dspace/modules/**/.gitignore</include>
</includes>
<excludes>
<exclude>**/target/**</exclude>
</excludes>
<lineEnding>unix</lineEnding>
</fileSet>
</fileSets>
</assembly>

2
pom.xml
View File

@@ -124,7 +124,7 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.4.1</version>
<version>2.5.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>