From 3106989d98d9dcc5578955ed1395e29dea5a217f Mon Sep 17 00:00:00 2001
From: Dennis Kao <ulysseskao@gmail.com>
Date: Mon, 25 Nov 2013 09:47:07 +0800
Subject: [PATCH] update JarCollector from geotools 10.2
---
xdgnjobs/ximple-build/maven/jar-collector/src/main/java/com/ximple/eofms/maven/JarCollector.java | 23 +++++------------------
xdgnjobs/ximple-jobcarrier/pom.xml | 4 ++--
xdgnjobs/ximple-build/pom.xml | 4 ++--
xdgnjobs/ximple-build/maven/pom.xml | 2 +-
xdgnjobs/ximple-build/maven/jar-collector/pom.xml | 4 ++--
xdgnjobs/ximple-dgnio/pom.xml | 4 ++--
xdgnjobs/ximple-elmparser/pom.xml | 4 ++--
xdgnjobs/ximple-spatialjob/pom.xml | 4 ++--
8 files changed, 18 insertions(+), 31 deletions(-)
diff --git a/xdgnjobs/ximple-build/maven/jar-collector/pom.xml b/xdgnjobs/ximple-build/maven/jar-collector/pom.xml
index b51b63f..3939f8a 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.0</version>
+ <version>2.1.1</version>
</parent>
@@ -16,7 +16,7 @@
<!-- =========================================================== -->
<groupId>com.ximple.eofms.maven</groupId>
<artifactId>ximple-jar-collector</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1</version>
<packaging>maven-plugin</packaging>
<name>JAR files collector</name>
diff --git a/xdgnjobs/ximple-build/maven/jar-collector/src/main/java/com/ximple/eofms/maven/JarCollector.java b/xdgnjobs/ximple-build/maven/jar-collector/src/main/java/com/ximple/eofms/maven/JarCollector.java
index 2aeb460..e9fbf2b 100644
--- a/xdgnjobs/ximple-build/maven/jar-collector/src/main/java/com/ximple/eofms/maven/JarCollector.java
+++ b/xdgnjobs/ximple-build/maven/jar-collector/src/main/java/com/ximple/eofms/maven/JarCollector.java
@@ -72,13 +72,10 @@
* Gets the parent "target" directory.
*/
MavenProject parent = project;
-
while (parent.hasParent()) {
parent = parent.getParent();
}
-
collectDirectory = parent.getBuild().getDirectory();
-
/*
* Now collects the JARs.
*/
@@ -98,22 +95,18 @@
* such file. Some modules use pom packaging, which do not produce any JAR file.
*/
final File jarFile = new File(outputDirectory, jarName + ".jar");
-
if (!jarFile.isFile()) {
return;
}
-
/*
* Get the "target" directory of the parent pom.xml and make sure it exists.
*/
File collect = new File(collectDirectory);
-
if (!collect.exists()) {
if (!collect.mkdir()) {
throw new MojoExecutionException("Failed to create target directory: " + collect.getAbsolutePath());
}
}
-
if (collect.getCanonicalFile().equals(jarFile.getParentFile().getCanonicalFile())) {
/*
* The parent's directory is the same one than this module's directory.
@@ -123,31 +116,27 @@
*/
return;
}
-
/*
* Creates a "binaries" subdirectory inside the "target" directory.
*/
collect = new File(collect, SUB_DIRECTORY);
-
if (!collect.exists()) {
if (!collect.mkdir()) {
throw new MojoExecutionException("Failed to create binaries directory.");
}
}
-
- int count = 1;
FileUtils.copyFileToDirectory(jarFile, collect);
- Set<Artifact> dependencies = project.getDependencyArtifacts();
+ Set<Artifact> dependencies = project.getDependencyArtifacts();
if (dependencies != null) {
for (final Artifact artifact : dependencies) {
- System.out.println("+++++++++++++++++++++++ DEP: " + artifact.getDependencyTrail());
+ System.out.println("+++++++++++++++++++++++ DEP: " + artifact.getDependencyTrail());
final String scope = artifact.getScope();
if (scope != null && // Maven 2.0.6 bug?
- (scope.equalsIgnoreCase(Artifact.SCOPE_COMPILE) ||
- scope.equalsIgnoreCase(Artifact.SCOPE_RUNTIME)))
+ (scope.equalsIgnoreCase(Artifact.SCOPE_COMPILE) ||
+ scope.equalsIgnoreCase(Artifact.SCOPE_RUNTIME)))
{
final File file = artifact.getFile();
- if (!artifact.getGroupId().startsWith("com.ximple.eofms")) {
+ if (!artifact.getGroupId().startsWith("org.geotools")) {
final File copy = new File(collect, file.getName());
if (copy.exists()) {
/*
@@ -164,7 +153,5 @@
}
}
}
-
- getLog().info("Copied " + count + " JAR to parent directory.");
}
}
diff --git a/xdgnjobs/ximple-build/maven/pom.xml b/xdgnjobs/ximple-build/maven/pom.xml
index 7345eb2..f277974 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.0</version>
+ <version>2.1.1</version>
</parent>
diff --git a/xdgnjobs/ximple-build/pom.xml b/xdgnjobs/ximple-build/pom.xml
index eb334af..d1af094 100644
--- a/xdgnjobs/ximple-build/pom.xml
+++ b/xdgnjobs/ximple-build/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnjobs</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1</version>
</parent>
@@ -16,7 +16,7 @@
<!-- =========================================================== -->
<groupId>com.ximple.eofms.maven</groupId>
<artifactId>ximple-build</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1</version>
<packaging>pom</packaging>
<name>Build tools for Ximple DgnJobs</name>
diff --git a/xdgnjobs/ximple-dgnio/pom.xml b/xdgnjobs/ximple-dgnio/pom.xml
index fefa4b9..16ab7f6 100644
--- a/xdgnjobs/ximple-dgnio/pom.xml
+++ b/xdgnjobs/ximple-dgnio/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnjobs</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1</version>
</parent>
<!-- =========================================================== -->
@@ -15,7 +15,7 @@
<!-- =========================================================== -->
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnio</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1</version>
<packaging>jar</packaging>
<name>ximple-dgnio</name>
<url>http://www.ximple.com.tw</url>
diff --git a/xdgnjobs/ximple-elmparser/pom.xml b/xdgnjobs/ximple-elmparser/pom.xml
index be5e9e2..ef560f6 100644
--- a/xdgnjobs/ximple-elmparser/pom.xml
+++ b/xdgnjobs/ximple-elmparser/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnjobs</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1</version>
</parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-elmparser</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1</version>
<packaging>jar</packaging>
<name>ximple-elmparser</name>
<url>http://maven.apache.org</url>
diff --git a/xdgnjobs/ximple-jobcarrier/pom.xml b/xdgnjobs/ximple-jobcarrier/pom.xml
index ae931d2..44c9680 100644
--- a/xdgnjobs/ximple-jobcarrier/pom.xml
+++ b/xdgnjobs/ximple-jobcarrier/pom.xml
@@ -6,13 +6,13 @@
<parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnjobs</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1</version>
</parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-jobcarrier</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1</version>
<packaging>jar</packaging>
<name>ximple-jobcarrier</name>
<url>http://maven.apache.org</url>
diff --git a/xdgnjobs/ximple-spatialjob/pom.xml b/xdgnjobs/ximple-spatialjob/pom.xml
index 63f4aac..be9caa6 100644
--- a/xdgnjobs/ximple-spatialjob/pom.xml
+++ b/xdgnjobs/ximple-spatialjob/pom.xml
@@ -7,12 +7,12 @@
<parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnjobs</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1</version>
</parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-spatialjob</artifactId>
- <version>2.1.0</version>
+ <version>2.1.1</version>
<packaging>jar</packaging>
<name>ximple-spatialjob</name>
<url>http://www.ximple.com.tw</url>
--
Gitblit v0.0.0-SNAPSHOT