From c35a6b151259c980bb1ceec57abe65a79c6f6ac8 Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Fri, 23 Nov 2012 00:41:19 +0800
Subject: [PATCH] EOFM-207 and update geotools to 8.3.x
---
xdgnjobs/pom.xml | 109 ++++++++++++++++++++++++++++--------------------------
1 files changed, 57 insertions(+), 52 deletions(-)
diff --git a/xdgnjobs/pom.xml b/xdgnjobs/pom.xml
index fae559c..5242e39 100644
--- a/xdgnjobs/pom.xml
+++ b/xdgnjobs/pom.xml
@@ -17,9 +17,9 @@
<oracle.jdbc>true</oracle.jdbc>
<test.maxHeapSize>512M</test.maxHeapSize>
<src.output>${basedir}/target</src.output>
- <java5>1.5</java5>
- <xdgnio.version>1.2.2</xdgnio.version>
- <gt2.version>2.7.5-1</gt2.version>
+ <java5>1.6</java5>
+ <xdgnio.version>1.3.0</xdgnio.version>
+ <gt.version>8.3.x</gt.version>
<failIfNoTests>false</failIfNoTests>
<stress.skip.pattern></stress.skip.pattern>
<online.skip.pattern></online.skip.pattern>
@@ -57,15 +57,15 @@
<scm>
<connection>
- scm:svn:http://www.ximple.com.tw/svn/xeofms/xspatialjob/truck/
+ scm:svn:http://www.ximple.com.tw:8079/svn/xeofms/xspatialjob/truck/
</connection>
- <url>http://www.ximple.com.tw/svn/xeofms/xspatialjob/truck/</url>
+ <url>http://www.ximple.com.tw:8079/svn/xeofms/xspatialjob/truck/</url>
</scm>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnjobs</artifactId>
<packaging>pom</packaging>
- <version>1.2.2</version>
+ <version>1.3.0</version>
<name>ximple-dgnjobs</name>
<url>http://www.ximple.com.tw</url>
@@ -76,7 +76,7 @@
<url>http://www.ximple.com.tw</url>
</organization>
- <inceptionYear>2010</inceptionYear>
+ <inceptionYear>2012</inceptionYear>
<!-- =========================================================== -->
<!-- Issue managements and mailing lists. -->
@@ -134,9 +134,9 @@
<version>3.2.1</version>
</dependency>
<dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>2.1</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-digester3</artifactId>
+ <version>3.2</version>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
@@ -167,79 +167,84 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
- <version>3.7</version>
+ <version>3.8</version>
</dependency>
<!-- geotools -->
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-api</artifactId>
- <version>${gt2.version}</version>
+ <version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-main</artifactId>
- <version>${gt2.version}</version>
+ <version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-shapefile</artifactId>
- <version>${gt2.version}</version>
+ <version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-sample-data</artifactId>
- <version>${gt2.version}</version>
+ <version>${gt.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-data</artifactId>
- <version>${gt2.version}</version>
+ <version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-jdbc</artifactId>
- <version>${gt2.version}</version>
+ <version>${gt.version}</version>
</dependency>
<dependency>
- <groupId>org.geotools</groupId>
- <artifactId>gt-oracle-spatial</artifactId>
- <version>${gt2.version}</version>
+ <groupId>org.geotools.jdbc</groupId>
+ <artifactId>gt-jdbc-oracle</artifactId>
+ <version>${gt.version}</version>
</dependency>
<dependency>
- <groupId>org.geotools</groupId>
- <artifactId>gt-postgis</artifactId>
- <version>${gt2.version}</version>
- <exclusions>
+ <groupId>org.geotools.jdbc</groupId>
+ <artifactId>gt-jdbc-postgis</artifactId>
+ <version>${gt.version}</version>
+ <!--exclusions>
<exclusion>
<groupId>org.postgis</groupId>
<artifactId>postgis-driver</artifactId>
</exclusion>
- </exclusions>
+ </exclusions-->
</dependency>
<dependency>
- <groupId>org.geotools</groupId>
- <artifactId>gt-mysql</artifactId>
- <version>${gt2.version}</version>
+ <groupId>org.geotools.jdbc</groupId>
+ <artifactId>gt-jdbc-mysql</artifactId>
+ <version>${gt.version}</version>
</dependency>
<!-- because main and sample-data depend on referencing we need a tie breaker -->
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-referencing</artifactId>
- <version>${gt2.version}</version>
+ <version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
- <artifactId>gt-epsg-h2</artifactId>
- <version>${gt2.version}</version>
- <exclusions>
+ <artifactId>gt-epsg-hsql</artifactId>
+ <version>${gt.version}</version>
+ <!--exclusions>
<exclusion>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
</exclusion>
- </exclusions>
+ </exclusions-->
+ </dependency>
+ <dependency>
+ <groupId>org.geotools</groupId>
+ <artifactId>gt-epsg-wkt</artifactId>
+ <version>${gt.version}</version>
</dependency>
<dependency>
@@ -258,7 +263,7 @@
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-epsg-hsql</artifactId>
- <version>${gt2.version}</version>
+ <version>${gt.version}</version>
<scope>test</scope>
</dependency>
@@ -285,28 +290,28 @@
<version>11.1.0</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>8.4-702.jdbc3</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.postgis</groupId>
<artifactId>postgis-driver</artifactId>
<version>1.5.3</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.18</version>
- </dependency>
+ </dependency-->
- <dependency>
+ <!--dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>1.3.163</version>
- </dependency>
+ </dependency-->
<!-- EnterpriseDB -->
<dependency>
@@ -319,7 +324,7 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.1.3</version>
+ <version>2.1.6</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -330,12 +335,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.3</version>
+ <version>1.6.6</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.6.3</version>
+ <version>1.6.6</version>
</dependency>
<dependency>
<groupId>org.awl</groupId>
@@ -352,7 +357,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>6.3</version>
+ <version>6.8</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -373,8 +378,8 @@
<groupId>commons-collections</groupId>
</dependency>
<dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-digester3</artifactId>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
@@ -403,13 +408,13 @@
</dependency>
<dependency>
<groupId>org.geotools</groupId>
- <artifactId>gt-epsg-h2</artifactId>
+ <artifactId>gt-epsg-hsql</artifactId>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- </dependency>
+ </dependency-->
<dependency>
<groupId>xerces</groupId>
@@ -480,7 +485,7 @@
<dependency>
<groupId>org.geotools.maven</groupId>
<artifactId>gt2-build-configs</artifactId>
- <version>${gt2.version}</version>
+ <version>${gt.version}</version>
</dependency>
</dependencies>
-->
@@ -500,7 +505,7 @@
<!-- The -target argument for the Java compiler. -->
<debug>true</debug>
<!-- Whether to include debugging information. -->
- <encoding>ISO-8859-1</encoding>
+ <encoding>UTF-8</encoding>
<!-- The -encoding argument for the Java compiler. -->
</configuration>
</plugin>
@@ -566,7 +571,7 @@
<dependency>
<groupId>org.geotools.maven</groupId>
<artifactId>gt2-build-configs</artifactId>
- <version>${gt2.version}</version>
+ <version>${gt.version}</version>
</dependency>
</dependencies>
</plugin>
--
Gitblit v0.0.0-SNAPSHOT