From 94ae08701bbd7585a0b7e5a92d1975965a503c03 Mon Sep 17 00:00:00 2001
From: Dennis Kao <ulysseskao@gmail.com>
Date: Wed, 15 Jan 2014 11:28:52 +0800
Subject: [PATCH] Merge branch 'origin/2.1.x'
---
xdgnjobs/ximple-spatialjob/pom.xml | 68 +++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 21 deletions(-)
diff --git a/xdgnjobs/ximple-spatialjob/pom.xml b/xdgnjobs/ximple-spatialjob/pom.xml
index 1a4d8db..835fe67 100644
--- a/xdgnjobs/ximple-spatialjob/pom.xml
+++ b/xdgnjobs/ximple-spatialjob/pom.xml
@@ -7,18 +7,18 @@
<parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnjobs</artifactId>
- <version>0.9.0</version>
+ <version>2.1.1</version>
</parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-spatialjob</artifactId>
- <version>0.9.0</version>
+ <version>2.1.1</version>
<packaging>jar</packaging>
<name>ximple-spatialjob</name>
<url>http://www.ximple.com.tw</url>
<properties>
- <xdgnio.version>0.9.0</xdgnio.version>
+ <xdgnio.version>2.1.1</xdgnio.version>
</properties>
<description>
@@ -30,7 +30,7 @@
<url>http://www.ximple.com.tw</url>
</organization>
- <inceptionYear>2008</inceptionYear>
+ <inceptionYear>2010</inceptionYear>
<developers>
<developer>
@@ -52,56 +52,71 @@
<!-- =========================================================== -->
<dependencies>
<dependency>
+ <groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <groupId>opensymphony</groupId>
+ </dependency>
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz-jobs</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
- <artifactId>gt2-shapefile</artifactId>
+ <artifactId>gt-shapefile</artifactId>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
- <artifactId>gt2-sample-data</artifactId>
+ <artifactId>gt-sample-data</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
- <artifactId>gt2-data</artifactId>
+ <artifactId>gt-data</artifactId>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
- <artifactId>gt2-jdbc</artifactId>
+ <artifactId>gt-jdbc</artifactId>
</dependency>
<dependency>
- <groupId>org.geotools</groupId>
- <artifactId>gt2-postgis</artifactId>
+ <groupId>org.geotools.jdbc</groupId>
+ <artifactId>gt-jdbc-postgis</artifactId>
</dependency>
<dependency>
- <groupId>org.geotools</groupId>
- <artifactId>gt2-oracle-spatial</artifactId>
+ <groupId>org.geotools.jdbc</groupId>
+ <artifactId>gt-jdbc-oracle</artifactId>
</dependency>
<dependency>
- <groupId>org.geotools</groupId>
- <artifactId>gt2-mysql</artifactId>
+ <groupId>org.geotools.jdbc</groupId>
+ <artifactId>gt-jdbc-mysql</artifactId>
</dependency>
<!-- because main and sample-data depend on referencing we need a tie breaker -->
<dependency>
<groupId>org.geotools</groupId>
- <artifactId>gt2-referencing</artifactId>
+ <artifactId>gt-referencing</artifactId>
</dependency>
<!-- We need this to make the referencing module useful -->
<dependency>
- <artifactId>gt2-epsg-hsql</artifactId>
<groupId>org.geotools</groupId>
- <scope>test</scope>
+ <artifactId>gt-epsg-wkt</artifactId>
</dependency>
<dependency>
<artifactId>jdom</artifactId>
- <groupId>jdom</groupId>
+ <groupId>org.jdom</groupId>
</dependency>
<dependency>
@@ -127,18 +142,29 @@
<artifactId>sdoutl</artifactId>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.postgis</groupId>
<artifactId>postgis-driver</artifactId>
</dependency>
<dependency>
+ <groupId>com.ximple.eofms</groupId>
+ <artifactId>xedb-gt-geospatial</artifactId>
+ </dependency>
+
+ <!--dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
+ </dependency-->
+
+ <dependency>
+ <groupId>net.sf.opencsv</groupId>
+ <artifactId>opencsv</artifactId>
+ <version>2.3</version>
</dependency>
<!-- Ximple Library -->
--
Gitblit v0.0.0-SNAPSHOT