You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2015/06/04 12:15:55 UTC
[41/43] incubator-tinkerpop git commit: excluded
servlet-api-2.5-6.1.14.jar from plugin directories
excluded servlet-api-2.5-6.1.14.jar from plugin directories
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/a08b06f7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/a08b06f7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/a08b06f7
Branch: refs/heads/preprocessor
Commit: a08b06f71b057539c160b60f9cd9ff3deb0387be
Parents: a806bee
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Thu Jun 4 00:25:26 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Thu Jun 4 00:25:26 2015 +0200
----------------------------------------------------------------------
.../groovy/util/DependencyGrabber.groovy | 55 +++++++++++---------
1 file changed, 30 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a08b06f7/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy
index 637162d..a90b4d4 100644
--- a/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy
+++ b/gremlin-groovy/src/main/groovy/org/apache/tinkerpop/gremlin/groovy/util/DependencyGrabber.groovy
@@ -18,9 +18,9 @@
*/
package org.apache.tinkerpop.gremlin.groovy.util
-import org.apache.tinkerpop.gremlin.groovy.plugin.Artifact
import groovy.grape.Grape
import org.apache.commons.lang3.SystemUtils
+import org.apache.tinkerpop.gremlin.groovy.plugin.Artifact
import java.nio.file.*
import java.util.jar.JarFile
@@ -79,33 +79,38 @@ class DependencyGrabber {
// if windows then the path contains a starting forward slash that prevents it from being
// recognized by FileSystem - strip it off
dependencyLocations.collect {
- def p = SystemUtils.IS_OS_WINDOWS ? it.path.substring(1) : it.path
- return fs.getPath(p)
- }.findAll { !(it.fileName.toFile().name ==~ /(slf4j|logback\-classic)-.*\.jar/) }
- .findAll { !filesAlreadyInPath.collect { it.getFileName().toString() }.contains(it.fileName.toFile().name)}
- .each {
- def copying = targetPluginPath.resolve(it.fileName)
- Files.copy(it, copying, StandardCopyOption.REPLACE_EXISTING)
- println "Copying - $copying"
- }
+ def p = SystemUtils.IS_OS_WINDOWS ? it.path.substring(1) : it.path
+ return fs.getPath(p)
+ }.findAll {
+ def name = it.fileName.toFile().name
+ !(name ==~ /(slf4j|logback\-classic)-.*\.jar/) && name != 'servlet-api-2.5-6.1.14.jar'
+ }.findAll {
+ !filesAlreadyInPath.collect { it.getFileName().toString() }.contains(it.fileName.toFile().name)
+ }.each {
+ def copying = targetPluginPath.resolve(it.fileName)
+ Files.copy(it, copying, StandardCopyOption.REPLACE_EXISTING)
+ println "Copying - $copying"
+ }
dependencyLocations.collect {
- def p = SystemUtils.IS_OS_WINDOWS ? it.path.substring(1) : it.path
- return fs.getPath(p)
- }.each {
- def copying = targetLibPath.resolve(it.fileName)
- Files.copy(it, copying, StandardCopyOption.REPLACE_EXISTING)
- println "Copying - $copying"
- }
+ def p = SystemUtils.IS_OS_WINDOWS ? it.path.substring(1) : it.path
+ return fs.getPath(p)
+ }.each {
+ def copying = targetLibPath.resolve(it.fileName)
+ Files.copy(it, copying, StandardCopyOption.REPLACE_EXISTING)
+ println "Copying - $copying"
+ }
- getAdditionalDependencies(targetPluginPath, artifact).collect { fs.getPath(it.path) }
- .findAll { !(it.fileName.toFile().name ==~ /(slf4j|logback\-classic)-.*\.jar/) }
- .findAll { !filesAlreadyInPath.collect { it.getFileName().toString() }.contains(it.fileName.toFile().name)}
- .each {
- def copying = targetPluginPath.resolve(it.fileName)
- Files.copy(it, copying, StandardCopyOption.REPLACE_EXISTING)
- println "Copying - $copying"
- }
+ getAdditionalDependencies(targetPluginPath, artifact).collect { fs.getPath(it.path) }.findAll {
+ def name = it.fileName.toFile().name
+ !(name ==~ /(slf4j|logback\-classic)-.*\.jar/) && name != 'servlet-api-2.5-6.1.14.jar'
+ }.findAll {
+ !filesAlreadyInPath.collect { it.getFileName().toString() }.contains(it.fileName.toFile().name)
+ }.each {
+ def copying = targetPluginPath.resolve(it.fileName)
+ Files.copy(it, copying, StandardCopyOption.REPLACE_EXISTING)
+ println "Copying - $copying"
+ }
getAdditionalDependencies(targetLibPath, artifact).collect { fs.getPath(it.path) }.each {
def copying = targetLibPath.resolve(it.fileName)