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

Merge branch 'DS-3335' into DS-2604-porting-cc

Browse Source
This commit is contained in:
Luigi Andrea Pascarelli
2016-09-26 11:32:33 +02:00
parent 332bca78ad 688c6ab714
commit c8e49b5624
1 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
pom.xml
View File

@@ -24,6 +24,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding> <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
<java.version>1.7</java.version> <java.version>1.7</java.version>
<postgresql.driver.version>9.4.1211</postgresql.driver.version>
<solr.version>4.10.4</solr.version> <solr.version>4.10.4</solr.version>
<jena.version>2.13.0</jena.version> <jena.version>2.13.0</jena.version>
<slf4j.version>1.7.14</slf4j.version> <slf4j.version>1.7.14</slf4j.version>
@@ -512,6 +513,42 @@
</properties> </properties>
</profile> </profile>
<!-- PostgreSQL ships different JDBC drivers based on the version of Java
you are running. See https://jdbc.postgresql.org/download.html
These next two profiles handle pulling in the correct PostgreSQL JDBC driver. -->
<!-- Default PostgreSQL driver is only for Java 8 -->
<profile>
<id>postgresql-jdbc-default</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.driver.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
</profile>
<!-- If running Java 7, use JRE7 PostgreSQL driver -->
<profile>
<id>postgresql-jdbc-jre7</id>
<activation>
<jdk>[1.7,1.8)</jdk>
</activation>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>${postgresql.driver.version}.jre7</version>
</dependency>
</dependencies>
</dependencyManagement>
</profile>
<!-- <!--
These profiles activate the inclusion of various modules into These profiles activate the inclusion of various modules into
the DSpace Build process. They activate automatically if the the DSpace Build process. They activate automatically if the
@@ -1235,11 +1272,6 @@
<artifactId>icu4j</artifactId> <artifactId>icu4j</artifactId>
<version>56.1</version> <version>56.1</version>
</dependency> </dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>9.4-1206-jdbc41</version>
</dependency>
<dependency> <dependency>
<groupId>com.oracle</groupId> <groupId>com.oracle</groupId>
<artifactId>ojdbc6</artifactId> <artifactId>ojdbc6</artifactId>