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

DS-2066 : Maven plugin updates and general POM cleanup

Browse Source
This commit is contained in:
Tim Donohue
2014-07-17 21:10:25 +00:00
parent 2903af5d3c
commit 437d68f6f3
10 changed files with 127 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
dspace-api/pom.xml
View File

@@ -73,7 +73,7 @@
</plugin>
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.3</version>
<version>2.8</version>
<executions>
<execution>
<id>setupTestEnvironment</id>
@@ -97,8 +97,8 @@
</executions>
</plugin>
<plugin>
<groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>**/src/test/resources/**</exclude>
@@ -120,8 +120,8 @@
-->
<plugin>
<groupId>org.codehaus.gmaven</groupId>
<artifactId>gmaven-plugin</artifactId>
<version>1.4</version>
<artifactId>groovy-maven-plugin</artifactId>
<version>2.0</version>
<executions>
<execution>
<id>setproperty</id>
@@ -131,7 +131,7 @@
</goals>
<configuration>
<source>
pom.properties['agnostic.build.dir']=project.build.directory.replace('\\','/');
project.properties['agnostic.build.dir']=project.build.directory.replace(File.separator,'/');
println("Initializing Maven property 'agnostic.build.dir' to: " + project.properties['agnostic.build.dir']);
</source>
</configuration>
@@ -211,7 +211,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.7</version>
<version>1.9</version>
<executions>
<execution>
<phase>validate</phase>
@@ -225,7 +225,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
<version>1.2</version>
<version>1.3</version>
<executions>
<execution>
<phase>validate</phase>
@@ -527,11 +527,11 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
<version>3.1</version>
</dependency>
<dependency>
<groupId>backport-util-concurrent</groupId>
<artifactId>backport-util-concurrent</artifactId>
<version>3.1</version>
</dependency>
</dependencies>
</project>

5
dspace-jspui/pom.xml
View File

@@ -53,8 +53,8 @@
</executions>
</plugin>
<plugin>
<groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<configuration>
<!--Exclude license check for JSPUI files which don't need it-->
<excludes>
@@ -65,6 +65,7 @@
<exclude>**/scriptaculous/**</exclude>
<exclude>**/jquery*</exclude>
<exclude>**/bootstrap/**</exclude>
<exclude>**/fonts/**</exclude>
</excludes>
</configuration>
</plugin>

8
dspace-oai/pom.xml
View File

@@ -3,8 +3,8 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>dspace-oai</artifactId>
<packaging>war</packaging>
<name>DSpace OAI 2.0</name>
<description>Parent project for the OAI API and Webapp</description>
<name>DSpace OAI-PMH</name>
<description>DSpace OAI-PMH Web Application and API</description>
<parent>
<artifactId>dspace-parent</artifactId>
@@ -52,8 +52,8 @@
</executions>
</plugin>
<plugin>
<groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<configuration>
<excludes>
<exclude>src/main/webapp/**</exclude>

103
dspace-rest/pom.xml
View File

@@ -4,7 +4,8 @@
<artifactId>dspace-rest</artifactId>
<packaging>war</packaging>
<version>5.0-SNAPSHOT</version>
<name>DSpace RESTful web services API</name>
<name>DSpace REST :: API and Implementation</name>
<description>DSpace RESTful Web Services API</description>
<url>http://demo.dspace.org</url>
<parent>
@@ -37,59 +38,55 @@
<artifactId>jersey-json</artifactId>
<version>1.17.1</version>
</dependency>
<!-- Spring 3 dependencies -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
<!-- Spring 3 dependencies -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<!-- Jersey + Spring -->
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-spring</artifactId>
<version>1.8</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Jersey + Spring -->
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-spring</artifactId>
<version>1.8</version>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Use DSpace, for now, an older version to minimize spring generated dependency on Discovery -->
<dependency>
@@ -122,8 +119,8 @@
<artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>org.dspace</groupId>
<artifactId>dspace-services</artifactId>
<groupId>org.dspace</groupId>
<artifactId>dspace-services</artifactId>
</dependency>
</dependencies>
</project>

19
dspace-solr/pom.xml
View File

@@ -31,8 +31,8 @@
<packaging>war</packaging>
<properties>
<lucene.version>4.4.0</lucene.version>
<solr.version>4.4.0</solr.version>
<lucene.version>4.4.0</lucene.version>
<solr.version>4.4.0</solr.version>
<!-- 'root.basedir' is the path to the root [dspace-src] dir. It must be redefined by each child POM,
as it is used to reference the LICENSE_HEADER and *.properties file(s) in that directory. -->
<root.basedir>${basedir}/..</root.basedir>
@@ -47,7 +47,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.4</version>
<configuration>
<!-- This 'dspace-solr' WAR overlays the Apache Solr Web Application
available in Maven Central -->
@@ -120,19 +119,19 @@
<groupId>org.apache.solr</groupId>
<artifactId>solr</artifactId>
<version>${solr.version}</version>
<type>war</type>
<type>war</type>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId>
<version>${solr.version}</version>
<type>jar</type>
<exclusions>
<exclusion>
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
</exclusions>
<exclusions>
<exclusion>
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>

6
dspace-xmlui/pom.xml
View File

@@ -51,8 +51,8 @@
</executions>
</plugin>
<plugin>
<groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<configuration>
<!--Exclude license check for XMLUI files which don't need it-->
<excludes>
@@ -235,4 +235,4 @@
</dependencies>
</project>
</project>

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

@@ -3,10 +3,10 @@
<groupId>org.dspace.modules</groupId>
<artifactId>oai</artifactId>
<packaging>war</packaging>
<name>DSpace OAI 2.0 :: Local Customizations</name>
<name>DSpace OAI-PMH :: Local Customizations</name>
<description>
This project allows you to overlay your own local OAI customizations
on top of the default OAI 2.0 web application provided with DSpace.
on top of the default OAI-PMH web application provided with DSpace.
</description>
<parent>
@@ -99,11 +99,11 @@
<artifactId>solr-core</artifactId>
<version>${solr.version}</version>
<exclusions>
<exclusion>
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
</exclusions>
<exclusion>
<groupId>jdk.tools</groupId>
<artifactId>jdk.tools</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>

24
dspace/modules/pom.xml
View File

@@ -1,17 +1,17 @@
<project 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/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.dspace</groupId>
<artifactId>modules</artifactId>
<packaging>pom</packaging>
<name>DSpace Addon Modules</name>
<description>DSpace Addon Modules</description>
<modelVersion>4.0.0</modelVersion>
<groupId>org.dspace</groupId>
<artifactId>modules</artifactId>
<packaging>pom</packaging>
<name>DSpace Addon Modules</name>
<description>DSpace Addon Modules</description>
<parent>
<groupId>org.dspace</groupId>
<artifactId>dspace-parent</artifactId>
<version>5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<parent>
<groupId>org.dspace</groupId>
<artifactId>dspace-parent</artifactId>
<version>5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<properties>
<!-- This is the path to the root [dspace-src] directory. -->

5
dspace/modules/rest/pom.xml
View File

@@ -3,9 +3,10 @@
<groupId>org.dspace.modules</groupId>
<artifactId>rest</artifactId>
<packaging>war</packaging>
<name>DSpace REST (JAX RS 1 - Jersey) :: Local Customizations</name>
<name>DSpace REST :: Local Customizations</name>
<description>
Overlay REST customizations
This project allows you to overlay your own local REST customizations
on top of the default REST API provided with DSpace.
</description>
<parent>

50
pom.xml
View File

@@ -20,7 +20,7 @@
<parent>
<groupId>org.sonatype.oss</groupId>
<artifactId>oss-parent</artifactId>
<version>7</version>
<version>9</version>
<relativePath />
</parent>
@@ -46,7 +46,7 @@
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<version>3.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
@@ -55,7 +55,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.3.2</version>
<version>2.5</version>
<configuration>
<archive>
<manifest>
@@ -68,11 +68,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<!-- We'd rather this be an open-ended range of versions.
But, because of a Maven bug, we must force a specific version:
http://jira.codehaus.org/browse/MNG-2742
Once the bug is fixed, we should put open-ended range in dspace-pom -->
<version>2.1.1</version>
<version>2.4</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
<archive>
@@ -86,7 +82,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.6</version>
<version>2.17</version>
<!-- tests whose name starts by Abstract will be ignored -->
<configuration>
<excludes>
@@ -100,12 +96,12 @@
</plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2.1</version>
<version>2.4</version>
</plugin>
<plugin>
<groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
<version>1.9.0</version>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<version>2.6</version>
</plugin>
</plugins>
</pluginManagement>
@@ -147,7 +143,7 @@
<plugin>
<artifactId>maven-release-plugin</artifactId>
<version>2.3.2</version>
<version>2.5</version>
<configuration>
<!-- During release:perform, enable the "release" profile (see below) -->
<releaseProfiles>release</releaseProfiles>
@@ -159,8 +155,8 @@
</configuration>
</plugin>
<plugin>
<groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
<configuration>
<!-- License header file (can be a URL, but that's less stable if external site is down on occasion) -->
<header>${root.basedir}/LICENSE_HEADER</header>
@@ -1075,10 +1071,10 @@
<mailingList>
<name>DSpace Technical Users List</name>
<subscribe>
http://lists.sourceforge.net/mailman/listinfo/dspace-tech
http://lists.sourceforge.net/lists/listinfo/dspace-tech
</subscribe>
<unsubscribe>
http://lists.sourceforge.net/mailman/listinfo/dspace-tech
http://lists.sourceforge.net/lists/listinfo/dspace-tech
</unsubscribe>
<post>dspace-tech AT lists.sourceforge.net</post>
<archive>
@@ -1088,10 +1084,10 @@
<mailingList>
<name>DSpace Developers List</name>
<subscribe>
http://lists.sourceforge.net/mailman/listinfo/dspace-devel
http://lists.sourceforge.net/lists/listinfo/dspace-devel
</subscribe>
<unsubscribe>
http://lists.sourceforge.net/mailman/listinfo/dspace-devel
http://lists.sourceforge.net/lists/listinfo/dspace-devel
</unsubscribe>
<post>dspace-devel AT lists.sourceforge.net</post>
<archive>
@@ -1101,10 +1097,10 @@
<mailingList>
<name>DSpace General Issues List</name>
<subscribe>
http://lists.sourceforge.net/mailman/listinfo/dspace-general
http://lists.sourceforge.net/lists/listinfo/dspace-general
</subscribe>
<unsubscribe>
http://lists.sourceforge.net/mailman/listinfo/dspace-general
http://lists.sourceforge.net/lists/listinfo/dspace-general
</unsubscribe>
<post>dspace-general AT lists.sourceforge.net</post>
<archive>
@@ -1114,10 +1110,10 @@
<mailingList>
<name>DSpace SCM Commit Change-Log</name>
<subscribe>
http://lists.sourceforge.net/mailman/listinfo/dspace-changelog
http://lists.sourceforge.net/lists/listinfo/dspace-changelog
</subscribe>
<unsubscribe>
http://lists.sourceforge.net/mailman/listinfo/dspace-changelog
http://lists.sourceforge.net/lists/listinfo/dspace-changelog
</unsubscribe>
<post>noreply AT lists.sourceforge.net</post>
<archive>
@@ -1328,7 +1324,7 @@
</contributors>
<!--
The Subversion repository location is used by Continuum to update against
The SCM repository location is used by Continuum to update against
when changes have occurred. This spawns a new build cycle and releases
snapshots into the snapshot repository below.
-->
@@ -1336,8 +1332,8 @@
<connection>scm:git:git@github.com:DSpace/DSpace.git</connection>
<developerConnection>scm:git:git@github.com:DSpace/DSpace.git</developerConnection>
<url>git@github.com:DSpace/DSpace.git</url>
<tag>HEAD</tag>
</scm>
<tag>HEAD</tag>
</scm>
<!--
Distribution Management is currently used by the Continuum