Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: tdonohue/DSpace
...
head fork: tdonohue/DSpace
  • 3 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
View
5 LICENSE_HEADER
@@ -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/
View
119 pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
<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>
@@ -12,14 +13,42 @@
<url>http://www.dspace.org</url>
</organization>
+ <!-- brings the sonatype snapshot repository and signing requirement on board -->
<parent>
- <artifactId>dspace-pom</artifactId>
- <groupId>org.dspace</groupId>
- <version>12</version>
+ <groupId>org.sonatype.oss</groupId>
+ <artifactId>oss-parent</artifactId>
+ <version>7</version>
</parent>
+ <!--Force UTF-8 encoding during build on all platforms-->
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<build>
<plugins>
+ <plugin>
+ <!-- DSpace requires Java 1.6 or higher -->
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.2</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
<plugin>
<artifactId>maven-release-plugin</artifactId>
<!-- Because of below bug, we are forced to use version 2.0-beta-9
@@ -54,7 +83,16 @@
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>
- </plugin>
+ <configuration>
+ <failOnMissingWebXml>false</failOnMissingWebXml>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2.1</version>
@@ -76,9 +114,55 @@
</executions>
<inherited>false</inherited>
</plugin>
+ <plugin>
+ <groupId>com.mycila.maven-license-plugin</groupId>
+ <artifactId>maven-license-plugin</artifactId>
+ <version>1.9.0</version>
+ <configuration>
+ <!-- external and absolute URL for use in external addon builds -->
+ <header>https://raw.github.com/DSpace/DSpace/master/LICENSE_HEADER</header>
+ <!--Just check headers of everything in the /src directory -->
+ <includes>
+ <include>src/**</include>
+ </includes>
+ <!--Use all default exclusions for IDE files & Maven files, see:
+ http://code.google.com/p/maven-license-plugin/wiki/Configuration#Default_excludes -->
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <!-- Add some default DSpace exclusions not covered by <useDefaultExcludes>
+ Individual Maven projects may choose to override these defaults. -->
+ <excludes>
+ <exclude>**/src/test/resources/**</exclude>
+ <exclude>**/META-INF/**</exclude>
+ <exclude>**/robots.txt</exclude>
+ <exclude>**/*.LICENSE</exclude>
+ <exclude>**/LICENSE*</exclude>
+ <exclude>**/README*</exclude>
+ <exclude>**/readme*</exclude>
+ </excludes>
+ <mapping>
+ <!-- Custom DSpace file extensions which are not recognized by maven-release-plugin:
+ *.xmap, *.xslt, *.LICENSE -->
+ <xmap>XML_STYLE</xmap>
+ <xslt>XML_STYLE</xslt>
+ <LICENSE>TEXT</LICENSE>
+ </mapping>
+ <encoding>UTF-8</encoding>
+ <!-- maven-license-plugin recommends a strict check (e.g. check spaces/tabs too) -->
+ <strictCheck>true</strictCheck>
+ </configuration>
+ <executions>
+ <execution>
+ <id>check-headers</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
-
+
<profiles>
<!--
@@ -275,10 +359,10 @@
<execution>
<inherited>false</inherited>
<configuration>
- <descriptorRefs>
- <descriptorRef>release</descriptorRef>
- <descriptorRef>src-release</descriptorRef>
- </descriptorRefs>
+ <descriptors>
+ <descriptor>src/main/assembly/release.xml</descriptor>
+ <descriptor>src/main/assembly/src-release.xml</descriptor>
+ </descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<finalName>dspace-${pom.version}</finalName>
</configuration>
@@ -288,13 +372,6 @@
</goals>
</execution>
</executions>
- <dependencies>
- <dependency>
- <groupId>org.dspace.maven.plugins</groupId>
- <artifactId>dspace-assembly-plugin</artifactId>
- <version>1.2</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
@@ -1074,4 +1151,14 @@
<url>git@github.com:dspace/DSpace</url>
</scm>
+ <!--
+ Distribution Management is currently used by the Continuum
+ server to update snapshots it generates. This will also be used
+ on release to deploy release versions to the repository by the
+ release manager.
+ -->
+ <distributionManagement>
+ <!-- further distribution management is found upstream in the sonatype parent -->
+ </distributionManagement>
+
</project>
View
41 src/main/assembly/release.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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/
+
+-->
+<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+ <id>release</id>
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ <format>tar.bz2</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>${finalName}-release</baseDirectory>
+ <fileSets>
+ <fileSet>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <includes>
+ <include>dspace/**</include>
+ <include>LICENSE</include>
+ <include>NOTICE</include>
+ <include>README</include>
+ <include>CHANGES</include>
+ <include>KNOWN_BUGS</include>
+ </includes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>make-release-package</exclude>
+ <exclude>.*</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+
+</assembly>
View
33 src/main/assembly/src-release.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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/
+
+-->
+<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+ <id>src-release</id>
+ <formats>
+ <format>zip</format>
+ <format>tar.gz</format>
+ <format>tar.bz2</format>
+ </formats>
+ <baseDirectory>${finalName}-src-release</baseDirectory>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ <excludes>
+ <exclude>**/target/**</exclude>
+ <exclude>make-release-package</exclude>
+ <exclude>.*</exclude>
+ </excludes>
+ </fileSet>
+ </fileSets>
+
+</assembly>

No commit comments for this range

Something went wrong with that request. Please try again.