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-elmparser/pom.xml |   43 +++++++++++++++++++++----------------------
 1 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/xdgnjobs/ximple-elmparser/pom.xml b/xdgnjobs/ximple-elmparser/pom.xml
index e994b75..ef560f6 100644
--- a/xdgnjobs/ximple-elmparser/pom.xml
+++ b/xdgnjobs/ximple-elmparser/pom.xml
@@ -2,23 +2,21 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-
   <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-elmparser</artifactId>
-  <version>0.9.0</version>
+  <version>2.1.1</version>
   <packaging>jar</packaging>
   <name>ximple-elmparser</name>
   <url>http://maven.apache.org</url>
 
   <properties>
-    <xdgnio.version>0.9.0</xdgnio.version>
+    <xdgnio.version>1.2.2</xdgnio.version>
   </properties>
 
   <scm>
@@ -37,7 +35,7 @@
     <url>http://www.ximple.com.tw</url>
   </organization>
 
-  <inceptionYear>2008</inceptionYear>
+  <inceptionYear>2010</inceptionYear>
 
   <developers>
     <developer>
@@ -59,8 +57,8 @@
   <!-- =========================================================== -->
   <dependencies>
     <dependency>
+      <groupId>org.quartz-scheduler</groupId>
       <artifactId>quartz</artifactId>
-      <groupId>opensymphony</groupId>
     </dependency>
 
     <dependency>
@@ -71,50 +69,50 @@
 
     <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>
+      <artifactId>gt-postgis</artifactId>
     </dependency>
     <dependency>
       <groupId>org.geotools</groupId>
-      <artifactId>gt2-oracle-spatial</artifactId>
+      <artifactId>gt-oracle-spatial</artifactId>
     </dependency>
     <dependency>
       <groupId>org.geotools</groupId>
-      <artifactId>gt2-mysql</artifactId>
+      <artifactId>gt-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>
+      <artifactId>gt-epsg-hsql</artifactId>
       <groupId>org.geotools</groupId>
       <scope>test</scope>
     </dependency>
 
     <dependency>
+      <groupId>org.jdom</groupId>
       <artifactId>jdom</artifactId>
-      <groupId>jdom</groupId>
     </dependency>
 
     <dependency>
@@ -171,14 +169,14 @@
 
     <!-- Ximple Library -->
     <dependency>
-      <artifactId>ximple-dgnio</artifactId>
       <groupId>com.ximple.eofms</groupId>
-      <version>${xdgnio.version}</version>
+      <artifactId>ximple-dgnio</artifactId>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
-      <artifactId>ximple-spatialjob</artifactId>
       <groupId>com.ximple.eofms</groupId>
-      <version>${xdgnio.version}</version>
+      <artifactId>ximple-spatialjob</artifactId>
+      <version>${project.version}</version>
     </dependency>
   </dependencies>
 
@@ -207,8 +205,9 @@
            Use maven from the command line:
              mvn exec:java -Dexec.mainClass="com.ximple.eofms.XElementParser"
         -->
-        <artifactId>exec-maven-plugin</artifactId>
         <groupId>org.codehaus.mojo</groupId>
+        <artifactId>exec-maven-plugin</artifactId>
+        <version>1.2.1</version>
         <!--
         <executions>
           <execution>

--
Gitblit v0.0.0-SNAPSHOT