mirror of
https://github.com/DSpace/DSpace.git
synced 2025-10-07 01:54:22 +00:00
Reinsert dspace/pom.xml into dependency hierarchy and move database dependencies downstream.
git-svn-id: http://scm.dspace.org/svn/repo/trunk@2191 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Mark Diggory
@@ -5,7 +5,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.dspace</groupId>
|
||||
<artifactId>dspace-api</artifactId>
|
||||
<name>DSpace :: API and Implementation</name>
|
||||
<name>DSpace Kernel :: API and Implementation</name>
|
||||
<description>DSpace core data model and service APIs.</description>
|
||||
<url>http://projects.dspace.org/dspace-api</url>
|
||||
|
||||
@@ -146,10 +146,10 @@
|
||||
<groupId>javax.activation</groupId>
|
||||
<artifactId>activation</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.ibm.icu</groupId>
|
||||
<artifactId>icu4j</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.ibm.icu</groupId>
|
||||
<artifactId>icu4j</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
|
||||
</project>
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.dspace</groupId>
|
||||
<artifactId>dspace-jspui</artifactId>
|
||||
<name>DSpace :: JSP Web Application</name>
|
||||
<name>DSpace JSPUI :: Web Application</name>
|
||||
<packaging>war</packaging>
|
||||
<url>http://projects.dspace.org/dspace-jspui</url>
|
||||
<description>DSpace JSP Based Webapplication</description>
|
||||
@@ -16,9 +16,9 @@
|
||||
-->
|
||||
<parent>
|
||||
<groupId>org.dspace</groupId>
|
||||
<artifactId>dspace-pom</artifactId>
|
||||
<artifactId>dspace</artifactId>
|
||||
<version>1.5-SNAPSHOT</version>
|
||||
<relativePath>../dspace-pom</relativePath>
|
||||
<relativePath>../dspace</relativePath>
|
||||
</parent>
|
||||
|
||||
<build>
|
||||
@@ -49,14 +49,6 @@
|
||||
</build>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.dspace</groupId>
|
||||
<artifactId>dspace-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.dspace</groupId>
|
||||
<artifactId>language-packs</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>jstl</artifactId>
|
||||
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
<parent>
|
||||
<groupId>org.dspace</groupId>
|
||||
<artifactId>dspace-pom</artifactId>
|
||||
<artifactId>dspace</artifactId>
|
||||
<version>1.5-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
<parent>
|
||||
<groupId>org.dspace</groupId>
|
||||
<artifactId>dspace-pom</artifactId>
|
||||
<artifactId>dspace</artifactId>
|
||||
<version>1.5-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
@@ -45,14 +45,6 @@
|
||||
</scm>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.dspace</groupId>
|
||||
<artifactId>dspace-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.dspace</groupId>
|
||||
<artifactId>language-packs</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>wsdl4j</groupId>
|
||||
<artifactId>wsdl4j</artifactId>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
<parent>
|
||||
<groupId>org.dspace</groupId>
|
||||
<artifactId>dspace-pom</artifactId>
|
||||
<artifactId>dspace</artifactId>
|
||||
<version>1.5-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<groupId>org.dspace</groupId>
|
||||
<artifactId>dspace-oai</artifactId>
|
||||
<packaging>war</packaging>
|
||||
<name>DSpace :: OAI Web Application</name>
|
||||
<name>DSpace OAI :: Web Application</name>
|
||||
<description>DSpace OAI Service Provider Webapplication</description>
|
||||
<url>http://projects.dspace.org/dspace-oai</url>
|
||||
|
||||
@@ -17,9 +17,9 @@
|
||||
-->
|
||||
<parent>
|
||||
<groupId>org.dspace</groupId>
|
||||
<artifactId>dspace-pom</artifactId>
|
||||
<artifactId>dspace</artifactId>
|
||||
<version>1.5-SNAPSHOT</version>
|
||||
<relativePath>../dspace-pom</relativePath>
|
||||
<relativePath>../dspace</relativePath>
|
||||
</parent>
|
||||
|
||||
<build>
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
<parent>
|
||||
<groupId>org.dspace</groupId>
|
||||
<artifactId>dspace-pom</artifactId>
|
||||
<artifactId>dspace</artifactId>
|
||||
<version>1.5-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
@@ -45,16 +45,6 @@
|
||||
</scm>
|
||||
|
||||
<dependencies>
|
||||
|
||||
<!-- DSpace API -->
|
||||
<dependency>
|
||||
<groupId>org.dspace</groupId>
|
||||
<artifactId>dspace-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.dspace</groupId>
|
||||
<artifactId>language-packs</artifactId>
|
||||
</dependency>
|
||||
|
||||
<!-- Wing framework -->
|
||||
<dependency>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
<parent>
|
||||
<groupId>org.dspace</groupId>
|
||||
<artifactId>dspace-pom</artifactId>
|
||||
<artifactId>dspace</artifactId>
|
||||
<version>1.5-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
<parent>
|
||||
<groupId>org.dspace</groupId>
|
||||
<artifactId>dspace-pom</artifactId>
|
||||
<artifactId>dspace</artifactId>
|
||||
<version>1.5-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
|
||||
107
dspace/pom.xml
107
dspace/pom.xml
@@ -5,7 +5,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.dspace</groupId>
|
||||
<artifactId>dspace</artifactId>
|
||||
<name>DSpace :: Assembly and Configuration</name>
|
||||
<name>DSpace Assembly and Configuration</name>
|
||||
<packaging>pom</packaging>
|
||||
<description>
|
||||
The DSpace Project provides all the functionality required to
|
||||
@@ -22,9 +22,35 @@
|
||||
<version>1.5-SNAPSHOT</version>
|
||||
<relativePath>../dspace-pom</relativePath>
|
||||
</parent>
|
||||
|
||||
<profiles>
|
||||
|
||||
<profiles>
|
||||
|
||||
<!--
|
||||
This profile is used by all children such that
|
||||
when activated a dspace.config configuration
|
||||
file location passed on the commandline
|
||||
(-Ddspace.config=...) can be passed through
|
||||
to be used as a filter source by projects for
|
||||
tasks such as updating the ${dspace.dir} in
|
||||
web.xml etc.
|
||||
|
||||
When activated, the child project will inherit
|
||||
the configuration.
|
||||
-->
|
||||
<profile>
|
||||
<activation>
|
||||
<property>
|
||||
<name>dspace.config</name>
|
||||
</property>
|
||||
</activation>
|
||||
<build>
|
||||
<filters>
|
||||
<filter>${dspace.config}</filter>
|
||||
</filters>
|
||||
</build>
|
||||
</profile>
|
||||
|
||||
|
||||
<!--
|
||||
These profiles activate the inclusion of various modules into
|
||||
the DSpace Build process. They activate automatically if the
|
||||
@@ -132,11 +158,10 @@
|
||||
</modules>
|
||||
</profile>
|
||||
|
||||
|
||||
<profile>
|
||||
<!--
|
||||
<!--
|
||||
Builds LNI WAR for DSpace
|
||||
-->
|
||||
-->
|
||||
<profile>
|
||||
<id>lni</id>
|
||||
<activation>
|
||||
<file>
|
||||
@@ -187,11 +212,11 @@
|
||||
</modules>
|
||||
</profile>
|
||||
|
||||
|
||||
<profile>
|
||||
<!--
|
||||
|
||||
<!--
|
||||
Builds Language Packs for DSpace
|
||||
-->
|
||||
-->
|
||||
<profile>
|
||||
<id>language-packs</id>
|
||||
<activation>
|
||||
<file>
|
||||
@@ -233,6 +258,22 @@
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>postgres-support</id>
|
||||
<activation>
|
||||
<property>
|
||||
<name>!db.name</name>
|
||||
</property>
|
||||
</activation>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>postgres</groupId>
|
||||
<artifactId>postgres</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</profile>
|
||||
|
||||
|
||||
<!--
|
||||
Default profile for Oracle database configuration
|
||||
Use -Poracle or -Ddb.name=oracle to activate.
|
||||
@@ -254,6 +295,22 @@
|
||||
<db.password>dspace</db.password>
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<id>oracle-support</id>
|
||||
<activation>
|
||||
<property>
|
||||
<name>db.name</name>
|
||||
<value>oracle</value>
|
||||
</property>
|
||||
</activation>
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.oracle</groupId>
|
||||
<artifactId>ojdbc14</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</profile>
|
||||
|
||||
|
||||
<!--
|
||||
@@ -368,24 +425,20 @@
|
||||
<plugins>
|
||||
<!-- overall project assembly -->
|
||||
<plugin>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<configuration>
|
||||
<descriptors>
|
||||
<descriptor>
|
||||
src/assemble/assembly.xml
|
||||
</descriptor>
|
||||
</descriptors>
|
||||
</configuration>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<goal>single</goal>
|
||||
</goals>
|
||||
<phase>package</phase>
|
||||
</execution>
|
||||
</executions>
|
||||
<artifactId>maven-dspace-plugin</artifactId>
|
||||
<version>1.5-SNAPSHOT</version>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.dspace</groupId>
|
||||
<artifactId>dspace-api</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.dspace</groupId>
|
||||
<artifactId>language-packs</artifactId>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
Reference in New Issue
Block a user