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

Merge back from 1.5.x branch to trunk for LNI

Browse Source 
r10061@mark-diggorys-computer-2 (orig r2798):  mdiggory | 2008-03-10 16:45:36 -0700
 1.) Moving language-packs to dspace-sandbox. See:  http://dspace-sandbox.googlecode.com/svn/modules/dspace-api-lang/trunk/
 2.) Adjusting dependencies and dspace-api-lang project name
 3.) Cleaning up versioning in poms, removing uneccessary dependencies and version tag
 4.) consolidating wars generated so that dspace-xxx-webapp wars are skinny by default.
 r10064@mark-diggorys-computer-2 (orig r2801):  ScottPhillips | 2008-03-10 18:59:40 -0700
 [maven-release-plugin] prepare release dspace-1.5-beta2
 r10066@mark-diggorys-computer-2 (orig r2803):  ScottPhillips | 2008-03-10 19:00:23 -0700
 [maven-release-plugin] prepare for next development iteration
 r10087@mark-diggorys-computer-2 (orig r2809):  tdonohue | 2008-03-11 14:34:43 -0700
 Force assembly to use 2.2-beta-1, so that everything works on Maven 2.0.8
 r10193@mark-diggorys-computer-2 (orig r2855):  ScottPhillips | 2008-03-18 11:48:27 -0700
 [maven-release-plugin] prepare release dspace-1_5-rc1
 r10195@mark-diggorys-computer-2 (orig r2857):  ScottPhillips | 2008-03-18 11:51:15 -0700
 [maven-release-plugin] prepare for next development iteration
 r10229@mark-diggorys-computer-2 (orig r2867):  ScottPhillips | 2008-03-24 19:25:48 -0700
 [maven-release-plugin] prepare release dspace-1_5
 r10231@mark-diggorys-computer-2 (orig r2869):  ScottPhillips | 2008-03-24 19:26:55 -0700
 [maven-release-plugin] prepare for next development iteration


git-svn-id: http://scm.dspace.org/svn/repo/trunk@2905 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Mark Diggory
2008-04-16 00:00:43 +00:00
parent ada9d1d904
commit e34a1eb008
4 changed files with 6 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-lni/dspace-lni-client/pom.xml
View File

@@ -200,4 +200,4 @@
</dependency>
</dependencies>
</project>
</project>

2
dspace-lni/dspace-lni-core/pom.xml
View File

@@ -81,4 +81,4 @@
</dependency>
</dependencies>
</project>
</project>

37
dspace-lni/dspace-lni-webapp/pom.xml
View File

@@ -6,9 +6,9 @@
<groupId>org.dspace</groupId>
<artifactId>dspace-lni-webapp</artifactId>
<packaging>war</packaging>
<name>DSpace LNI :: Web Application</name>
<name>DSpace LNI :: Web Application Resources</name>
<description>
DSpace Lightweight Network Interface Webapplication
DSpace Lightweight Network Interface Webapplication Resources
</description>
<url>http://projects.dspace.org/dspace-lni/dspace-lni-webapp</url>
@@ -43,12 +43,12 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<configuration>
<archiveClasses>false</archiveClasses>
<warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
<webResources>
<resource>
<filtering>true</filtering>
@@ -65,32 +65,6 @@
</execution>
</executions>
</plugin>
<!-- Secondary Artifact: Skinny war. -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<descriptorRefs>
<descriptorRef>skinny</descriptorRef>
</descriptorRefs>
</configuration>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>attached</goal>
</goals>
</execution>
</executions>
<dependencies>
<dependency>
<groupId>org.dspace.maven.plugins</groupId>
<artifactId>dspace-assembly-plugin</artifactId>
<version>1.1</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
@@ -151,11 +125,6 @@
<groupId>org.dspace</groupId>
<artifactId>dspace-lni-core</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

2
dspace-lni/pom.xml
View File

@@ -49,4 +49,4 @@
<module>dspace-lni-client</module>
</modules>
</project>
</project>