mirror of
https://github.com/DSpace/DSpace.git
synced 2025-10-17 23:13:10 +00:00
Remove unwanted (on Unix) CRs at line end and mark files for native eol
git-svn-id: http://scm.dspace.org/svn/repo/dspace/trunk@6557 9c30dcfa-912a-0410-8fc2-9e0234be79fd
This commit is contained in:
Mark Wood
@@ -1,135 +1,135 @@
|
|||||||
<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">
|
<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">
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>dspace-parent</artifactId>
|
<artifactId>dspace-parent</artifactId>
|
||||||
<groupId>org.dspace</groupId>
|
<groupId>org.dspace</groupId>
|
||||||
<version>1.8.0-SNAPSHOT</version>
|
<version>1.8.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.dspace</groupId>
|
<groupId>org.dspace</groupId>
|
||||||
<artifactId>dspace-stats</artifactId>
|
<artifactId>dspace-stats</artifactId>
|
||||||
<name>DSpace Solr Statistics Logging Client Library</name>
|
<name>DSpace Solr Statistics Logging Client Library</name>
|
||||||
<version>1.8.0-SNAPSHOT</version>
|
<version>1.8.0-SNAPSHOT</version>
|
||||||
<description>Library of Shared UsageEvent and EventConsumer Tools for Logging to Solr.</description>
|
<description>Library of Shared UsageEvent and EventConsumer Tools for Logging to Solr.</description>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
The Subversion repository location is used by Continuum to update
|
The Subversion repository location is used by Continuum to update
|
||||||
against when changes have occured, this spawns a new build cycle and
|
against when changes have occured, this spawns a new build cycle and
|
||||||
releases snapshots into the snapshot repository below.
|
releases snapshots into the snapshot repository below.
|
||||||
-->
|
-->
|
||||||
<scm>
|
<scm>
|
||||||
<connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-stats</connection>
|
<connection>scm:svn:http://scm.dspace.org/svn/repo/dspace/trunk/dspace-stats</connection>
|
||||||
<developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-stats</developerConnection>
|
<developerConnection>scm:svn:https://scm.dspace.org/svn/repo/dspace/trunk/dspace-stats</developerConnection>
|
||||||
<url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-stats</url>
|
<url>http://scm.dspace.org/svn/repo/dspace/trunk/dspace-stats</url>
|
||||||
</scm>
|
</scm>
|
||||||
|
|
||||||
<developers>
|
<developers>
|
||||||
<developer>
|
<developer>
|
||||||
<name>Ben Bosman</name>
|
<name>Ben Bosman</name>
|
||||||
<email>ben at atmire.com</email>
|
<email>ben at atmire.com</email>
|
||||||
<url>http://www.atmire.com</url>
|
<url>http://www.atmire.com</url>
|
||||||
<organization>@MIRE</organization>
|
<organization>@MIRE</organization>
|
||||||
<organizationUrl>http://www.atmire.com</organizationUrl>
|
<organizationUrl>http://www.atmire.com</organizationUrl>
|
||||||
<timezone>+1</timezone>
|
<timezone>+1</timezone>
|
||||||
</developer>
|
</developer>
|
||||||
<developer>
|
<developer>
|
||||||
<name>Mark Diggory</name>
|
<name>Mark Diggory</name>
|
||||||
<email>mdiggory at atmire.com</email>
|
<email>mdiggory at atmire.com</email>
|
||||||
<url>http://www.atmire.com</url>
|
<url>http://www.atmire.com</url>
|
||||||
<organization>@MIRE</organization>
|
<organization>@MIRE</organization>
|
||||||
<organizationUrl>http://www.atmire.com</organizationUrl>
|
<organizationUrl>http://www.atmire.com</organizationUrl>
|
||||||
<timezone>-5</timezone>
|
<timezone>-5</timezone>
|
||||||
</developer>
|
</developer>
|
||||||
<developer>
|
<developer>
|
||||||
<name>Lieven Droogmans</name>
|
<name>Lieven Droogmans</name>
|
||||||
<email>lieven at atmire.com</email>
|
<email>lieven at atmire.com</email>
|
||||||
<url>http://www.atmire.com</url>
|
<url>http://www.atmire.com</url>
|
||||||
<organization>@MIRE</organization>
|
<organization>@MIRE</organization>
|
||||||
<organizationUrl>http://www.atmire.com</organizationUrl>
|
<organizationUrl>http://www.atmire.com</organizationUrl>
|
||||||
<timezone>+1</timezone>
|
<timezone>+1</timezone>
|
||||||
</developer>
|
</developer>
|
||||||
<developer>
|
<developer>
|
||||||
<name>Art Lowel</name>
|
<name>Art Lowel</name>
|
||||||
<email>art at atmire.com</email>
|
<email>art at atmire.com</email>
|
||||||
<url>http://www.atmire.com</url>
|
<url>http://www.atmire.com</url>
|
||||||
<organization>@MIRE</organization>
|
<organization>@MIRE</organization>
|
||||||
<organizationUrl>http://www.atmire.com</organizationUrl>
|
<organizationUrl>http://www.atmire.com</organizationUrl>
|
||||||
<timezone>+1</timezone>
|
<timezone>+1</timezone>
|
||||||
</developer>
|
</developer>
|
||||||
<developer>
|
<developer>
|
||||||
<name>Kevin Van de velde</name>
|
<name>Kevin Van de velde</name>
|
||||||
<email>kevin at atmire.com</email>
|
<email>kevin at atmire.com</email>
|
||||||
<url>http://www.atmire.com</url>
|
<url>http://www.atmire.com</url>
|
||||||
<organization>@MIRE</organization>
|
<organization>@MIRE</organization>
|
||||||
<organizationUrl>http://www.atmire.com</organizationUrl>
|
<organizationUrl>http://www.atmire.com</organizationUrl>
|
||||||
<timezone>+1</timezone>
|
<timezone>+1</timezone>
|
||||||
</developer>
|
</developer>
|
||||||
</developers>
|
</developers>
|
||||||
|
|
||||||
<contributors />
|
<contributors />
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.dspace</groupId>
|
<groupId>org.dspace</groupId>
|
||||||
<artifactId>dspace-services-api</artifactId>
|
<artifactId>dspace-services-api</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.dspace</groupId>
|
<groupId>org.dspace</groupId>
|
||||||
<artifactId>dspace-api</artifactId>
|
<artifactId>dspace-api</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.solr</groupId>
|
<groupId>org.apache.solr</groupId>
|
||||||
<artifactId>solr-solrj</artifactId>
|
<artifactId>solr-solrj</artifactId>
|
||||||
<version>3.3.0</version>
|
<version>3.3.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.dspace.dependencies</groupId>
|
<groupId>org.dspace.dependencies</groupId>
|
||||||
<artifactId>dspace-geoip</artifactId>
|
<artifactId>dspace-geoip</artifactId>
|
||||||
<version>1.2.3</version>
|
<version>1.2.3</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.ant</groupId>
|
<groupId>org.apache.ant</groupId>
|
||||||
<artifactId>ant</artifactId>
|
<artifactId>ant</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.dspace.dnsjava</groupId>
|
<groupId>org.dspace.dnsjava</groupId>
|
||||||
<artifactId>dnsjava</artifactId>
|
<artifactId>dnsjava</artifactId>
|
||||||
<version>2.0.6</version>
|
<version>2.0.6</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>javax.servlet</groupId>
|
<groupId>javax.servlet</groupId>
|
||||||
<artifactId>servlet-api</artifactId>
|
<artifactId>servlet-api</artifactId>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.ostermiller</groupId>
|
<groupId>org.ostermiller</groupId>
|
||||||
<artifactId>utils</artifactId>
|
<artifactId>utils</artifactId>
|
||||||
<version>1.07.00</version>
|
<version>1.07.00</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
<reporting>
|
<reporting>
|
||||||
<excludeDefaults>false</excludeDefaults>
|
<excludeDefaults>false</excludeDefaults>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-javadoc-plugin</artifactId>
|
<artifactId>maven-javadoc-plugin</artifactId>
|
||||||
<configuration>
|
<configuration>
|
||||||
|
|
||||||
<minmemory>128m</minmemory>
|
<minmemory>128m</minmemory>
|
||||||
<maxmemory>1g</maxmemory>
|
<maxmemory>1g</maxmemory>
|
||||||
|
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-jxr-plugin</artifactId>
|
<artifactId>maven-jxr-plugin</artifactId>
|
||||||
<configuration>
|
<configuration>
|
||||||
<aggregate>true</aggregate>
|
<aggregate>true</aggregate>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-site-plugin</artifactId>
|
<artifactId>maven-site-plugin</artifactId>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</reporting>
|
</reporting>
|
||||||
</project>
|
</project>
|
||||||
@@ -1,84 +1,84 @@
|
|||||||
<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">
|
<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>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.dspace.modules</groupId>
|
<groupId>org.dspace.modules</groupId>
|
||||||
<artifactId>solr</artifactId>
|
<artifactId>solr</artifactId>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<name>DSpace SOLR :: Web Application</name>
|
<name>DSpace SOLR :: Web Application</name>
|
||||||
<description>
|
<description>
|
||||||
DSpace SOLR Service Provider Web Application
|
DSpace SOLR Service Provider Web Application
|
||||||
</description>
|
</description>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
A Parent POM that Maven inherits DSpace Default
|
A Parent POM that Maven inherits DSpace Default
|
||||||
POM atrributes from.
|
POM atrributes from.
|
||||||
-->
|
-->
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.dspace</groupId>
|
<groupId>org.dspace</groupId>
|
||||||
<artifactId>modules</artifactId>
|
<artifactId>modules</artifactId>
|
||||||
<version>1.8.0-SNAPSHOT</version>
|
<version>1.8.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
The Subversion repository location is used by Continuum to update
|
The Subversion repository location is used by Continuum to update
|
||||||
against when changes have occured, this spawns a new build cycle
|
against when changes have occured, this spawns a new build cycle
|
||||||
and releases snapshots into the snapshot repository below.
|
and releases snapshots into the snapshot repository below.
|
||||||
-->
|
-->
|
||||||
<scm>
|
<scm>
|
||||||
<connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules/solr</connection>
|
<connection>scm:svn:http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules/solr</connection>
|
||||||
<developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules/solr</developerConnection>
|
<developerConnection>scm:svn:https://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules/solr</developerConnection>
|
||||||
<url>http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules/solr</url>
|
<url>http://dspace.svn.sourceforge.net/svnroot/dspace/trunk/dspace/modules/solr</url>
|
||||||
</scm>
|
</scm>
|
||||||
|
|
||||||
<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>
|
||||||
<executions>
|
<executions>
|
||||||
<execution>
|
<execution>
|
||||||
<phase>prepare-package</phase>
|
<phase>prepare-package</phase>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.dspace</groupId>
|
<groupId>org.dspace</groupId>
|
||||||
<artifactId>dspace-solr</artifactId>
|
<artifactId>dspace-solr</artifactId>
|
||||||
<version>3.3.0.0</version>
|
<version>3.3.0.0</version>
|
||||||
<classifier>skinny</classifier>
|
<classifier>skinny</classifier>
|
||||||
<type>war</type>
|
<type>war</type>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.dspace</groupId>
|
<groupId>org.dspace</groupId>
|
||||||
<artifactId>dspace-solr</artifactId>
|
<artifactId>dspace-solr</artifactId>
|
||||||
<version>3.3.0.0</version>
|
<version>3.3.0.0</version>
|
||||||
<classifier>classes</classifier>
|
<classifier>classes</classifier>
|
||||||
<type>jar</type>
|
<type>jar</type>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
<artifactId>slf4j-api</artifactId>
|
<artifactId>slf4j-api</artifactId>
|
||||||
<version>1.5.6</version>
|
<version>1.5.6</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
<artifactId>slf4j-jdk14</artifactId>
|
<artifactId>slf4j-jdk14</artifactId>
|
||||||
<version>1.5.6</version>
|
<version>1.5.6</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
<!-- support odd cases where JAXP cannot be found in JVM -->
|
<!-- support odd cases where JAXP cannot be found in JVM -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>xalan</groupId>
|
<groupId>xalan</groupId>
|
||||||
<artifactId>xalan</artifactId>
|
<artifactId>xalan</artifactId>
|
||||||
<version>2.7.0</version>
|
<version>2.7.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
Reference in New Issue
Block a user