From 753a44a02b1eff487578644add2d513e0f7cc294 Mon Sep 17 00:00:00 2001
From: unknown <yuanhung@ximple.com.tw>
Date: Tue, 05 Aug 2014 09:46:03 +0800
Subject: [PATCH] Merge branch 'origin/2.1.x'
---
xdgnjobs/ximple-jobcarrier/pom.xml | 2 +-
xdgnjobs/pom.xml | 30 ++++++++++++++----------------
xdgnjobs/ximple-build/maven/pom.xml | 2 +-
xdgnjobs/ximple-build/maven/jar-collector/pom.xml | 4 ++--
xdgnjobs/ximple-elmparser/pom.xml | 2 +-
5 files changed, 19 insertions(+), 21 deletions(-)
diff --git a/xdgnjobs/pom.xml b/xdgnjobs/pom.xml
index aa94b4c..0669658 100644
--- a/xdgnjobs/pom.xml
+++ b/xdgnjobs/pom.xml
@@ -8,8 +8,8 @@
Version: $Id$
======================================================================= -->
<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -19,7 +19,7 @@
<src.output>${basedir}/target</src.output>
<java5>1.6</java5>
<xdgnio.version>2.1.2</xdgnio.version>
- <gt.version>10.6.x</gt.version>
+ <gt.version>10.7.x</gt.version>
<failIfNoTests>false</failIfNoTests>
<stress.skip.pattern></stress.skip.pattern>
<online.skip.pattern></online.skip.pattern>
@@ -189,14 +189,12 @@
<version>2.4</version>
</dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>2.1</version>
- </dependency>
-
-
- <dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.17</version>
@@ -205,7 +203,7 @@
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
- <version>3.9</version>
+ <version>3.10-FINAL</version>
</dependency>
<!-- geotools -->
@@ -359,7 +357,7 @@
<artifactId>xedb-gt-geospatial</artifactId>
<version>0.1.1</version>
</dependency>
-
+
<!-- quartz-scheduler-->
<dependency>
<groupId>org.quartz-scheduler</groupId>
@@ -388,9 +386,9 @@
<version>1.7.5</version>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.5</version>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.awl</groupId>
diff --git a/xdgnjobs/ximple-build/maven/jar-collector/pom.xml b/xdgnjobs/ximple-build/maven/jar-collector/pom.xml
index 3939f8a..366f658 100644
--- a/xdgnjobs/ximple-build/maven/jar-collector/pom.xml
+++ b/xdgnjobs/ximple-build/maven/jar-collector/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>com.ximple.eofms.maven</groupId>
<artifactId>ximple-maven</artifactId>
- <version>2.1.1</version>
+ <version>2.1.2</version>
</parent>
@@ -16,7 +16,7 @@
<!-- =========================================================== -->
<groupId>com.ximple.eofms.maven</groupId>
<artifactId>ximple-jar-collector</artifactId>
- <version>2.1.1</version>
+ <version>2.1.2</version>
<packaging>maven-plugin</packaging>
<name>JAR files collector</name>
diff --git a/xdgnjobs/ximple-build/maven/pom.xml b/xdgnjobs/ximple-build/maven/pom.xml
index 95f08e2..ffe481f 100644
--- a/xdgnjobs/ximple-build/maven/pom.xml
+++ b/xdgnjobs/ximple-build/maven/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>com.ximple.eofms.maven</groupId>
<artifactId>ximple-build</artifactId>
- <version>2.1.1</version>
+ <version>2.1.2</version>
</parent>
diff --git a/xdgnjobs/ximple-elmparser/pom.xml b/xdgnjobs/ximple-elmparser/pom.xml
index e717cc9..ca8ff63 100644
--- a/xdgnjobs/ximple-elmparser/pom.xml
+++ b/xdgnjobs/ximple-elmparser/pom.xml
@@ -16,7 +16,7 @@
<url>http://maven.apache.org</url>
<properties>
- <xdgnio.version>1.2.2</xdgnio.version>
+ <xdgnio.version>2.1.2</xdgnio.version>
</properties>
<scm>
diff --git a/xdgnjobs/ximple-jobcarrier/pom.xml b/xdgnjobs/ximple-jobcarrier/pom.xml
index 072c545..9dfc89a 100644
--- a/xdgnjobs/ximple-jobcarrier/pom.xml
+++ b/xdgnjobs/ximple-jobcarrier/pom.xml
@@ -315,7 +315,7 @@
<groupId>com.ximple.eofms.maven</groupId>
<artifactId>ximple-jar-collector</artifactId>
<!--version>${project.version}</version-->
- <version>2.1.1</version>
+ <version>2.1.2</version>
<executions>
<execution>
<goals>
--
Gitblit v0.0.0-SNAPSHOT