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/pom.xml | 421 +++++++++++++++++++++++++++-------------------------
1 files changed, 216 insertions(+), 205 deletions(-)
diff --git a/xdgnjobs/pom.xml b/xdgnjobs/pom.xml
index dfff2ad..632f5e6 100644
--- a/xdgnjobs/pom.xml
+++ b/xdgnjobs/pom.xml
@@ -17,10 +17,14 @@
<oracle.jdbc>true</oracle.jdbc>
<test.maxHeapSize>512M</test.maxHeapSize>
<src.output>${basedir}/target</src.output>
- <java5>1.5</java5>
- <xdgnio.version>0.9.0</xdgnio.version>
- <gt.version>2.4.4</gt.version>
+ <java5>1.6</java5>
+ <xdgnio.version>2.1.1</xdgnio.version>
+ <gt.version>10.3.x</gt.version>
<failIfNoTests>false</failIfNoTests>
+ <stress.skip.pattern></stress.skip.pattern>
+ <online.skip.pattern></online.skip.pattern>
+ <java.awt.headless>false</java.awt.headless>
+ <allow.test.failure.ignore>false</allow.test.failure.ignore>
</properties>
<profiles>
@@ -31,6 +35,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.6.1</version>
<configuration>
<source>1.5</source>
</configuration>
@@ -48,6 +53,30 @@
</site>
</distributionManagement>
</profile>
+
+ <!-- =========================================================== -->
+ <!-- Build Configuration -->
+ <!-- copies all JARs in a single directory. -->
+ <!-- =========================================================== -->
+ <profile>
+ <id>collect</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>com.ximple.eofms.maven</groupId>
+ <artifactId>ximple-jar-collector</artifactId>
+ <version>${project.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>collect</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<scm>
@@ -60,7 +89,7 @@
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnjobs</artifactId>
<packaging>pom</packaging>
- <version>0.9.0</version>
+ <version>2.1.1</version>
<name>ximple-dgnjobs</name>
<url>http://www.ximple.com.tw</url>
@@ -71,7 +100,7 @@
<url>http://www.ximple.com.tw</url>
</organization>
- <inceptionYear>2008</inceptionYear>
+ <inceptionYear>2012</inceptionYear>
<!-- =========================================================== -->
<!-- Issue managements and mailing lists. -->
@@ -109,22 +138,10 @@
<!-- =========================================================== -->
<dependencyManagement>
<dependencies>
- <!-- GeoAPI and its dependencies -->
- <dependency>
- <groupId>org.opengis</groupId>
- <artifactId>geoapi-nogenerics</artifactId>
- <version>2.1.1</version>
- </dependency>
- <dependency>
- <groupId>javax.units</groupId>
- <artifactId>jsr108</artifactId>
- <version>0.01</version>
- </dependency>
-
<dependency>
<groupId>com.vividsolutions</groupId>
<artifactId>jts</artifactId>
- <version>1.9</version>
+ <version>1.13</version>
</dependency>
<!-- Apache -->
@@ -132,7 +149,7 @@
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>1.7</version>
+ <version>1.8.2</version>
</dependency>
-->
<dependency>
@@ -141,14 +158,15 @@
<version>3.2.1</version>
</dependency>
<dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.8</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-digester3</artifactId>
+ <version>3.2</version>
+ <!--classifier>with-deps</classifier-->
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>1.4</version>
+ <version>1.6</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -163,98 +181,122 @@
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.1</version>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.15</version>
+ <version>1.2.17</version>
<!-- Same as the dependency in commons-logging -->
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
- <version>3.1-FINAL</version>
+ <version>3.9</version>
</dependency>
<!-- geotools -->
<dependency>
<groupId>org.geotools</groupId>
- <artifactId>gt2</artifactId>
+ <artifactId>gt-api</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
- <artifactId>gt2-api</artifactId>
+ <artifactId>gt-main</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
- <artifactId>gt2-main</artifactId>
+ <artifactId>gt-shapefile</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
- <artifactId>gt2-shapefile</artifactId>
- <version>${gt.version}</version>
- </dependency>
- <dependency>
- <groupId>org.geotools</groupId>
- <artifactId>gt2-sample-data</artifactId>
+ <artifactId>gt-sample-data</artifactId>
<version>${gt.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
- <artifactId>gt2-data</artifactId>
+ <artifactId>gt-data</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
- <artifactId>gt2-jdbc</artifactId>
+ <artifactId>gt-opengis</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
- <artifactId>gt2-oracle-spatial</artifactId>
+ <artifactId>gt-metadata</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
- <artifactId>gt2-postgis</artifactId>
+ <artifactId>gt-jdbc</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
- <groupId>org.geotools</groupId>
- <artifactId>gt2-mysql</artifactId>
+ <groupId>org.geotools.jdbc</groupId>
+ <artifactId>gt-jdbc-oracle</artifactId>
+ <version>${gt.version}</version>
+ </dependency>
+ <dependency>
+ <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-->
+ </dependency>
+ <dependency>
+ <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>gt2-referencing</artifactId>
+ <artifactId>gt-referencing</artifactId>
+ <version>${gt.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.geotools</groupId>
+ <artifactId>gt-epsg-hsql</artifactId>
+ <version>${gt.version}</version>
+ <!--exclusions>
+ <exclusion>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </exclusion>
+ </exclusions-->
+ </dependency>
+ <dependency>
+ <groupId>org.geotools</groupId>
+ <artifactId>gt-epsg-wkt</artifactId>
<version>${gt.version}</version>
</dependency>
<dependency>
- <groupId>jdom</groupId>
+ <groupId>org.jdom</groupId>
<artifactId>jdom</artifactId>
- <version>1.0</version>
+ <version>1.1.3</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.5</version>
- </dependency>
-
- <!-- We need this to make the referencing module useful -->
- <dependency>
- <groupId>org.geotools</groupId>
- <artifactId>gt2-epsg-hsql</artifactId>
- <version>${gt.version}</version>
- <scope>test</scope>
+ <version>1.7</version>
</dependency>
<!-- ORACLE -->
@@ -262,7 +304,7 @@
<dependency>
<groupId>com.oracle</groupId>
<artifactId>ojdbc5</artifactId>
- <version>11.1.0</version>
+ <version>11.1.0.7.0</version>
</dependency>
<dependency>
<groupId>com.oracle</groupId>
@@ -280,42 +322,91 @@
<version>11.1.0</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>8.3-603.jdbc3</version>
- </dependency>
+ <version>8.4-702.jdbc3</version>
+ </dependency-->
<dependency>
<groupId>org.postgis</groupId>
<artifactId>postgis-driver</artifactId>
- <version>1.3.3</version>
+ <version>2.0.2</version>
</dependency>
- <dependency>
+ <!--dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.6</version>
- </dependency>
+ <version>5.1.18</version>
+ </dependency-->
- <!-- opensymphony -->
+ <!--dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.3.163</version>
+ </dependency-->
+
+ <!-- EnterpriseDB -->
<dependency>
- <groupId>opensymphony</groupId>
- <artifactId>quartz</artifactId>
- <version>1.6.0</version>
+ <groupId>com.ximple.eofms</groupId>
+ <artifactId>xedb-gt-geospatial</artifactId>
+ <version>0.1.1</version>
</dependency>
-
+
+ <!-- quartz-scheduler-->
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <version>2.2.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz-jobs</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.7.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.7.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.7.5</version>
+ </dependency>
<dependency>
<groupId>org.awl</groupId>
<artifactId>awl</artifactId>
<version>1.1.0-rc</version>
</dependency>
+ <dependency>
+ <groupId>it.geosolutions</groupId>
+ <artifactId>geoserver-manager</artifactId>
+ <!--version>1.5.2</version-->
+ <version>1.6-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.11.0</version>
+ </dependency>
<!-- Tests or legacy -->
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.8</version>
- <classifier>jdk15</classifier>
+ <version>6.8.7</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -325,16 +416,6 @@
<!-- Dependencies to be inherited by all modules. -->
<!-- =========================================================== -->
<dependencies>
- <dependency>
- <artifactId>geoapi-nogenerics</artifactId>
- <groupId>org.opengis</groupId>
- </dependency>
-
- <dependency>
- <artifactId>jsr108</artifactId>
- <groupId>javax.units</groupId>
- </dependency>
-
<dependency>
<groupId>com.vividsolutions</groupId>
<artifactId>jts</artifactId>
@@ -346,8 +427,9 @@
<groupId>commons-collections</groupId>
</dependency>
<dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-digester3</artifactId>
+ <!--classifier>with-deps</classifier-->
</dependency>
<dependency>
<groupId>commons-pool</groupId>
@@ -367,18 +449,42 @@
</dependency>
<dependency>
- <artifactId>gt2-api</artifactId>
<groupId>org.geotools</groupId>
+ <artifactId>gt-api</artifactId>
</dependency>
<dependency>
- <artifactId>gt2-main</artifactId>
<groupId>org.geotools</groupId>
+ <artifactId>gt-main</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.geotools</groupId>
+ <artifactId>gt-epsg-hsql</artifactId>
+ </dependency>
+
+ <!--dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </dependency-->
+
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
</dependency>
<dependency>
- <artifactId>testng</artifactId>
+ <groupId>it.geosolutions</groupId>
+ <artifactId>geoserver-manager</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
<groupId>org.testng</groupId>
- <classifier>jdk15</classifier>
+ <artifactId>testng</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
@@ -402,125 +508,18 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.1</version>
- <configuration>
- <descriptors>
- <descriptor>build/maven/assembly/binaryDist.xml</descriptor>
- <descriptor>build/maven/assembly/sourceDist.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.1.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clover-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-install-plugin</artifactId>
- <version>2.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.1</version>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>2.3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.0.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.2</version>
- </plugin>
-
- <!-- http://www.ibiblio.org/maven2/org/codehaus/mojo/ -->
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>changelog-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>changes-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jxr-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>jalopy-maven-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <configuration>
- <outputDirectory>${src.output}</outputDirectory>
- <attach>false</attach>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.4</version>
+ <version>2.6.1</version>
</plugin>
</plugins>
</pluginManagement>
<!-- http://www.ibiblio.org/maven2/org/apache/maven/wagon/ -->
- <!--
<extensions>
<extension>
<groupId>org.apache.maven.wagon</groupId>
@@ -528,7 +527,6 @@
<version>1.0-beta-2</version>
</extension>
</extensions>
- -->
<plugins>
<!-- ======================================================= -->
@@ -543,6 +541,7 @@
<convention>gt2/jalopygeotools.xml</convention>
<failOnError>false</failOnError>
</configuration>
+ <!--
<dependencies>
<dependency>
<groupId>org.geotools.maven</groupId>
@@ -550,6 +549,7 @@
<version>${gt.version}</version>
</dependency>
</dependencies>
+ -->
</plugin>
@@ -560,13 +560,13 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
+ <source>1.6</source>
<!-- The -source argument for the Java compiler. -->
- <target>1.5</target>
+ <target>1.6</target>
<!-- 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>
@@ -578,6 +578,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.14.1</version>
<configuration>
<includes>
<include>**/*Test.java</include>
@@ -606,13 +607,15 @@
<!-- ======================================================= -->
<!-- Code coverage -->
<!-- ======================================================= -->
+ <!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clover-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<jdk>1.5</jdk>
<licenseLocation>
- http://svn.geotools.org/geotools/branches/2.4.x/build/maven/build-configs/src/main/resources/gt2/clover.license
+ http://svn.geotools.org/geotools/branches/2.6.x/build/maven/build-configs/src/main/resources/gt2/clover.license
</licenseLocation>
<flushPolicy>directed</flushPolicy>
</configuration>
@@ -621,8 +624,8 @@
<phase>pre-site</phase>
<goals>
<goal>instrument</goal>
- <!-- aggregation is disabled due to the bug: -->
- <!-- http://jira.codehaus.org/browse/MCLOVER-34 -->
+ < - aggregation is disabled due to the bug: - !>
+ < - http://jira.codehaus.org/browse/MCLOVER-34 - !>
</goals>
</execution>
</executions>
@@ -634,7 +637,7 @@
</dependency>
</dependencies>
</plugin>
-
+ -->
<!-- ======================================================= -->
<!-- JAR packaging. -->
@@ -649,6 +652,14 @@
</manifest>
</archive>
</configuration>
+ </plugin>
+
+ <!-- ======================================================= -->
+ <!-- JavaDoc packaging. -->
+ <!-- ======================================================= -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<!-- ======================================================= -->
@@ -693,13 +704,13 @@
<uniqueVersion>false</uniqueVersion>
<id>ximple</id>
<name>Ximple - Artifactory lib repo</name>
- <url>dav:http://www.ximple.com.tw/artifactory/libs-releases</url>
+ <url>dav:http://www.ximple.com.tw/artifactory/libs-releases-local</url>
</repository>
<snapshotRepository>
<uniqueVersion>false</uniqueVersion>
<id>ximple-snapshots</id>
<name>Ximple - Artifactory lib-snapshots repo</name>
- <url>dav:http://www.ximple.com.tw/artifactory/libs-snapshots</url>
+ <url>dav:http://www.ximple.com.tw/artifactory/libs-snapshots-local</url>
</snapshotRepository>
</distributionManagement>
@@ -765,6 +776,6 @@
<module>ximple-dgnio</module>
<module>ximple-spatialjob</module>
<module>ximple-jobcarrier</module>
- <module>ximple-elmparser</module>
+ <!-- <module>ximple-elmparser</module> -->
</modules>
</project>
\ No newline at end of file
--
Gitblit v0.0.0-SNAPSHOT