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-jobcarrier/pom.xml | 138 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 109 insertions(+), 29 deletions(-)
diff --git a/xdgnjobs/ximple-jobcarrier/pom.xml b/xdgnjobs/ximple-jobcarrier/pom.xml
index 6e45321..820aab7 100644
--- a/xdgnjobs/ximple-jobcarrier/pom.xml
+++ b/xdgnjobs/ximple-jobcarrier/pom.xml
@@ -6,19 +6,19 @@
<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-jobcarrier</artifactId>
- <version>0.9.0</version>
+ <version>2.1.1</version>
<packaging>jar</packaging>
<name>ximple-jobcarrier</name>
<url>http://maven.apache.org</url>
<properties>
- <xdgnio.version>0.9.0</xdgnio.version>
+ <xdgnio.version>2.1.1</xdgnio.version>
</properties>
<scm>
@@ -37,7 +37,7 @@
<url>http://www.ximple.com.tw</url>
</organization>
- <inceptionYear>2008</inceptionYear>
+ <inceptionYear>2012</inceptionYear>
<developers>
<developer>
@@ -54,13 +54,59 @@
<contributors>
</contributors>
+ <profiles>
+ <profile>
+ <id>qa</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>install</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<!-- =========================================================== -->
<!-- Dependencies to be inherited by all modules. -->
<!-- =========================================================== -->
<dependencies>
<dependency>
+ <groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <groupId>opensymphony</groupId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </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>
@@ -71,50 +117,61 @@
<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-opengis</artifactId>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
- <artifactId>gt2-postgis</artifactId>
+ <artifactId>gt-jdbc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.geotools.jdbc</groupId>
+ <artifactId>gt-jdbc-postgis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.geotools.jdbc</groupId>
+ <artifactId>gt-jdbc-oracle</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.geotools.jdbc</groupId>
+ <artifactId>gt-jdbc-mysql</artifactId>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
- <artifactId>gt2-oracle-spatial</artifactId>
+ <artifactId>gt-opengis</artifactId>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
- <artifactId>gt2-mysql</artifactId>
+ <artifactId>gt-metadata</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>
@@ -149,24 +206,30 @@
<artifactId>sdoutl</artifactId>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<dependency>
<groupId>org.postgis</groupId>
<artifactId>postgis-driver</artifactId>
- </dependency>
+ </dependency-->
- <dependency>
+ <!--dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- </dependency>
+ </dependency-->
<!-- AWL -->
<dependency>
<groupId>org.awl</groupId>
<artifactId>awl</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.4.01</version>
</dependency>
<!-- Ximple Library -->
@@ -178,7 +241,7 @@
<dependency>
<artifactId>ximple-spatialjob</artifactId>
<groupId>com.ximple.eofms</groupId>
- <version>${xdgnio.version}</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
@@ -207,23 +270,28 @@
Use maven from the command line:
mvn exec:java -Dexec.mainClass="com.ximple.eofms.XQuartzJobCarrier"
-->
- <artifactId>exec-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
- <!--
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
<executions>
<execution>
- <phase>package</phase>
+ <!--<phase>package</phase> -->
<goals>
- <goal>run</goal>
+ <goal>java</goal>
</goals>
</execution>
</executions>
- -->
<configuration>
<mainClass>com.ximple.eofms.XQuartzJobCarrier</mainClass>
<!--
- <commandlineArgs>-wizard</commandlineArgs>
+ <commandlineArgs>-Dlog4j.configuration=log4j.properties</commandlineArgs>
-->
+ <systemProperties>
+ <systemProperty>
+ <key>log4j.configuration</key>
+ <value>log4j.properties</value>
+ </systemProperty>
+ </systemProperties>
</configuration>
<!--
<dependencies>
@@ -251,7 +319,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<configuration>
<dest>target/classes/com/ximple/eofms</dest>
<src>src/main/resources/com/ximple/eofms</src>
@@ -264,13 +332,16 @@
</goals>
<configuration>
<encoding>UTF8</encoding>
- <includes>XQuartzJobWizard_zh*.properties</includes>
+ <includes>
+ <include>XQuartzJobWizard_zh*.properties</include>
+ </includes>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
<resources>
+ <!--
<resource>
<directory>src/main/resources/com/ximple/eofms</directory>
<excludes>
@@ -278,15 +349,24 @@
</excludes>
<filtering>true</filtering>
</resource>
+ -->
<resource>
<directory>src/main/resources</directory>
<includes>
<include>log4j.properties</include>
<include>quartz.properties</include>
<include>quartz_jobs.xml</include>
+ <include>quartz_jobs_edb.xml</include>
+ <include>quartz_jobs_sharpefiles.xml</include>
</includes>
<!--
<excludes>
+ <exclude>log4j.properties</exclude>
+ <exclude>quartz_jobs.xml</exclude>
+ </excludes>
+ -->
+ <!--
+ <excludes>
<exclude>XQuartzJobWizard*.properties</exclude>
<exclude>quartz_jobs.xml</exclude>
<exclude>quartz_jobs_shapefiles.xml</exclude>
--
Gitblit v0.0.0-SNAPSHOT