[PATCH] Cleanup backend dependencies
Wald Commits
scm-commit at wald.intevation.org
Fri Aug 28 12:55:04 CEST 2015
# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1440759301 -7200
# Node ID 2bba7f551225c3735437e25d8b96b143fe31d2f8
# Parent 363016ee831a6612b6c626ab52850db6dbb6ad0a
Cleanup backend dependencies.
diff -r 363016ee831a -r 2bba7f551225 backend/pom-oracle.xml
--- a/backend/pom-oracle.xml Fri Aug 28 12:44:23 2015 +0200
+++ b/backend/pom-oracle.xml Fri Aug 28 12:55:01 2015 +0200
@@ -75,25 +75,14 @@
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.sf.opencsv</groupId>
- <artifactId>opencsv</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>3.6.10.Final</version>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>3.6.10.Final</version>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <version>1.0.1.Final</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -106,14 +95,21 @@
<version>2.1.1</version>
</dependency>
<dependency>
- <groupId>org.hibernatespatial</groupId>
- <artifactId>hibernate-spatial-oracle</artifactId>
- <version>1.1.1</version>
+ <groupId>com.vividsolutions</groupId>
+ <artifactId>jts</artifactId>
+ <version>1.11</version>
</dependency>
<dependency>
- <groupId>ojdbc</groupId>
- <artifactId>ojdbc</artifactId>
- <version>0</version>
+ <groupId>org.hibernatespatial</groupId>
+ <artifactId>hibernate-spatial-oracle</artifactId>
+ <version>1.1.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>ojdbc</groupId>
+ <artifactId>ojdbc</artifactId>
+ <version>0</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
diff -r 363016ee831a -r 2bba7f551225 backend/pom.xml
--- a/backend/pom.xml Fri Aug 28 12:44:23 2015 +0200
+++ b/backend/pom.xml Fri Aug 28 12:55:01 2015 +0200
@@ -75,25 +75,14 @@
<version>1.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>net.sf.opencsv</groupId>
- <artifactId>opencsv</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>3.6.10.Final</version>
</dependency>
<dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>3.6.10.Final</version>
+ <groupId>org.hibernate.javax.persistence</groupId>
+ <artifactId>hibernate-jpa-2.0-api</artifactId>
+ <version>1.0.1.Final</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
@@ -106,20 +95,28 @@
<version>2.1.1</version>
</dependency>
<dependency>
+ <groupId>com.vividsolutions</groupId>
+ <artifactId>jts</artifactId>
+ <version>1.11</version>
+ </dependency>
+ <dependency>
+ <!-- overwrite dependency of postgis-jdbc -->
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>9.1-901-1.jdbc4</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.hibernatespatial</groupId>
- <artifactId>hibernate-spatial-postgis</artifactId>
- <version>1.1</version>
+ <groupId>org.postgis</groupId>
+ <artifactId>postgis-jdbc</artifactId>
+ <version>1.3.3</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.postgis</groupId>
- <artifactId>postgis-jdbc</artifactId>
- <version>1.3.3</version>
+ <groupId>org.hibernatespatial</groupId>
+ <artifactId>hibernate-spatial-postgis</artifactId>
+ <version>1.1.1</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
More information about the Dive4Elements-commits
mailing list