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

Cleanup POM Dependencies. Remove dependeny <version> tags from submodule POMs when the version is already specified by dspace-parent POM. Also ensure all 'servlet-api' dependencies have a <scope>provided</scope> as they should.

Browse Source
This commit is contained in:
Tim Donohue
2012-10-18 14:07:29 -05:00
parent fff69e86b6
commit 143591ed98
9 changed files with 4 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dspace-oai/pom.xml
View File

@@ -89,6 +89,7 @@
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>

6
dspace-services/pom.xml
View File

@@ -29,7 +29,6 @@
<dependency> <dependency>
<groupId>commons-lang</groupId> <groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId> <artifactId>commons-lang</artifactId>
<version>2.4</version>
</dependency> </dependency>
<!-- this needs to eventually go into common/lib for tomcat 5 --> <!-- this needs to eventually go into common/lib for tomcat 5 -->
<dependency> <dependency>
@@ -42,14 +41,12 @@
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>servlet-api</artifactId>
<version>2.4</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- SPECIAL CASE - need JUNIT at build time and testing time --> <!-- SPECIAL CASE - need JUNIT at build time and testing time -->
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.5</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!-- testing only --> <!-- testing only -->
@@ -73,20 +70,17 @@
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
<version>1.2.14</version>
</dependency> </dependency>
<dependency> <dependency>
<!-- needed to ensure that all JCL is 1.1.1 --> <!-- needed to ensure that all JCL is 1.1.1 -->
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId> <artifactId>commons-logging</artifactId>
<version>1.1.1</version>
<type>jar</type> <type>jar</type>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-collections</groupId> <groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId> <artifactId>commons-collections</artifactId>
<version>3.2</version>
</dependency> </dependency>
</dependencies> </dependencies>

7
dspace-sword/pom.xml
View File

@@ -105,28 +105,24 @@
<dependency> <dependency>
<groupId>commons-fileupload</groupId> <groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId> <artifactId>commons-fileupload</artifactId>
<version>1.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-httpclient</groupId> <groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId> <artifactId>commons-httpclient</artifactId>
<version>3.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>servlet-api</artifactId>
<version>2.4</version> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
<version>4.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
<version>1.2.15</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>jmxtools</artifactId> <artifactId>jmxtools</artifactId>
@@ -150,7 +146,6 @@
<dependency> <dependency>
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>1.3.1</version>
</dependency> </dependency>
</dependencies> </dependencies>

1
dspace-swordv2/pom.xml
View File

@@ -113,7 +113,6 @@
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
<artifactId>log4j</artifactId> <artifactId>log4j</artifactId>
<version>1.2.15</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<artifactId>jmxtools</artifactId> <artifactId>jmxtools</artifactId>

2
dspace-xmlui/pom.xml
View File

@@ -96,7 +96,6 @@
<dependency> <dependency>
<groupId>jdom</groupId> <groupId>jdom</groupId>
<artifactId>jdom</artifactId> <artifactId>jdom</artifactId>
<version>1.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.cocoon</groupId> <groupId>org.apache.cocoon</groupId>
@@ -205,7 +204,6 @@
<dependency> <dependency>
<groupId>commons-validator</groupId> <groupId>commons-validator</groupId>
<artifactId>commons-validator</artifactId> <artifactId>commons-validator</artifactId>
<version>1.3.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.opencsv</groupId> <groupId>net.sf.opencsv</groupId>

1
dspace/modules/additions/pom.xml
View File

@@ -78,6 +78,7 @@
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>ant-contrib</groupId> <groupId>ant-contrib</groupId>

1
dspace/modules/oai/pom.xml
View File

@@ -85,7 +85,6 @@
<dependency> <dependency>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>dspace-oai</artifactId> <artifactId>dspace-oai</artifactId>
<version>3.0-rc2-SNAPSHOT</version>
<type>jar</type> <type>jar</type>
<classifier>classes</classifier> <classifier>classes</classifier>
</dependency> </dependency>

1
dspace/modules/solr/pom.xml
View File

@@ -70,7 +70,6 @@
<dependency> <dependency>
<groupId>xalan</groupId> <groupId>xalan</groupId>
<artifactId>xalan</artifactId> <artifactId>xalan</artifactId>
<version>2.7.0</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
dspace/pom.xml
View File

@@ -93,7 +93,7 @@
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId> <artifactId>servlet-api</artifactId>
<version>2.3</version> <scope>provided</scope>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>