Harmonize with current dspace-pom so it will build.

This commit is contained in:
Mark H. Wood
2013-06-26 15:45:31 -04:00
parent 213a1dd1ae
commit 79b6b2295a
5 changed files with 93 additions and 21 deletions

40
LICENSE Normal file
View File

@@ -0,0 +1,40 @@
DSpace source code license:
Copyright (c) 2002-2012, DuraSpace. All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
- Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
- Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
- Neither the name DuraSpace nor the name of the DSpace Foundation
nor the names of its contributors may be used to endorse or promote
products derived from this software without specific prior written
permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
DAMAGE.
DSpace uses third-party libraries which may be distributed under
different licenses to the above. Information about these licenses
is detailed in the LICENSES_THIRD_PARTY file at the root of the source
tree. You must agree to the terms of these licenses, in addition to
the above DSpace source code license, in order to use this software.

5
LICENSE_HEADER Normal file
View File

@@ -0,0 +1,5 @@
The contents of this file are subject to the license and copyright
detailed in the LICENSE and NOTICE files at the root of the source
tree and available online at
http://www.dspace.org/license/

15
NOTICE Normal file
View File

@@ -0,0 +1,15 @@
Licensing Notice
Fedora Commons joined with the DSpace Foundation and began operating under
the new name DuraSpace in July 2009. DuraSpace holds the copyrights of
the DSpace Foundation, Inc.
The DSpace Foundation, Inc. is a 501(c)3 corporation established in July 2007
with a mission to promote and advance the dspace platform enabling management,
access and preservation of digital works. The Foundation was able to transfer
the legal copyright from Hewlett-Packard Company (HP) and Massachusetts
Institute of Technology (MIT) to the DSpace Foundation in October 2007. Many
of the files in the source code may contain a copyright statement stating HP
and MIT possess the copyright, in these instances please note that the copy
right has transferred to the DSpace foundation, and subsequently to DuraSpace.

46
pom.xml
View File

@@ -20,7 +20,7 @@
<parent> <parent>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
<artifactId>dspace-pom</artifactId> <artifactId>dspace-pom</artifactId>
<version>10</version> <version>12</version>
</parent> </parent>
<groupId>org.dspace</groupId> <groupId>org.dspace</groupId>
@@ -36,6 +36,11 @@
<url>http://issues.apache.org/jira/browse/SOLR</url> <url>http://issues.apache.org/jira/browse/SOLR</url>
</issueManagement> </issueManagement>
<properties>
<!-- '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>
</properties>
<inceptionYear>2006</inceptionYear> <inceptionYear>2006</inceptionYear>
@@ -87,6 +92,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>2.9</version>
<executions> <executions>
<execution> <execution>
<id>attach-javadocs</id> <id>attach-javadocs</id>
@@ -99,25 +105,25 @@
</plugin> </plugin>
<plugin> <plugin>
<groupId>com.google.code.maven-license-plugin</groupId> <groupId>com.mycila.maven-license-plugin</groupId>
<artifactId>maven-license-plugin</artifactId> <artifactId>maven-license-plugin</artifactId>
<version>1.4.0</version> <version>1.9.0</version>
<configuration> <configuration>
<header>http://scm.dspace.org/svn/repo/licenses/LICENSE_HEADER</header> <header>${root.basedir}/LICENSE_HEADER</header>
<excludes> <excludes>
<exclude>src/**</exclude> <exclude>src/main/*/org/apache/**</exclude>
</excludes> </excludes>
<properties /> <properties />
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<goals> <goals>
<goal>check</goal> <goal>check</goal>
</goals> </goals>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>

View File

@@ -30,12 +30,17 @@
<description>Apache Solr Server</description> <description>Apache Solr Server</description>
<packaging>war</packaging> <packaging>war</packaging>
<properties>
<!-- '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>
</properties>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId> <artifactId>maven-war-plugin</artifactId>
<version>2.1-alpha-2</version>
<configuration> <configuration>
<!-- This 'dspace-solr' WAR overlays the Apache Solr Web Application <!-- This 'dspace-solr' WAR overlays the Apache Solr Web Application
available in Maven Central --> available in Maven Central -->
@@ -88,6 +93,7 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<dependencies> <dependencies>
<!-- Depends on the Apache 'solr' web application (see Overlay settings above)--> <!-- Depends on the Apache 'solr' web application (see Overlay settings above)-->
<dependency> <dependency>