[geode] branch develop updated: GEODE-5996 Revert classgraph upgrade

[ab...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

abaker pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/develop by this push:
     new b81ea0b  GEODE-5996 Revert classgraph upgrade
b81ea0b is described below

commit b81ea0b154c81be9399a6d0460d5d02dd25733c6
Author: Anthony Baker <ab...@apache.org>
AuthorDate: Mon Nov 26 12:41:11 2018 -0800

    GEODE-5996 Revert classgraph upgrade
    
    The new version of classgraph adds parallelism (2 * core threads) for more
    speed but can quickly consume large amounts of memory. Revert back
    to version 4.0.6 until we decide how much parallelism is useful (in
    particular the .scan(nThreads) API looks relevant),
---
 geode-assembly/src/integrationTest/resources/assembly_content.txt     | 2 +-
 geode-assembly/src/integrationTest/resources/dependency_classpath.txt | 2 +-
 geode-core/src/test/resources/expected-pom.xml                        | 2 +-
 gradle/dependency-versions.properties                                 | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 8b40cec..59f8506 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -862,7 +862,7 @@ javadoc/stylesheet.css
 lib/HikariCP-3.2.0.jar
 lib/activation-1.1.1.jar
 lib/antlr-2.7.7.jar
-lib/classgraph-4.4.12.jar
+lib/classgraph-4.0.6.jar
 lib/commons-beanutils-1.9.3.jar
 lib/commons-codec-1.10.jar
 lib/commons-collections-3.2.2.jar
diff --git a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index f4ff381..b6cf79d 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -20,7 +20,6 @@ shiro-crypto-core-1.4.0.jar
 shiro-lang-1.4.0.jar
 jetty-security-9.4.12.v20180830.jar
 lucene-queryparser-6.6.2.jar
-classgraph-4.4.12.jar
 slf4j-api-1.7.25.jar
 spring-core-4.3.20.RELEASE.jar
 jansi-1.17.1.jar
@@ -47,6 +46,7 @@ lucene-analyzers-phonetic-6.6.2.jar
 shiro-config-ogdl-1.4.0.jar
 jetty-http-9.4.12.v20180830.jar
 geode-protobuf-1.9.0-SNAPSHOT.jar
+classgraph-4.0.6.jar
 snappy-0.4.jar
 javax.resource-api-1.7.jar
 protobuf-java-3.6.1.jar
diff --git a/geode-core/src/test/resources/expected-pom.xml b/geode-core/src/test/resources/expected-pom.xml
index c840f92..9b62224 100644
--- a/geode-core/src/test/resources/expected-pom.xml
+++ b/geode-core/src/test/resources/expected-pom.xml
@@ -278,7 +278,7 @@
     <dependency>
       <groupId>io.github.classgraph</groupId>
       <artifactId>classgraph</artifactId>
-      <version>4.4.12</version>
+      <version>4.0.6</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/gradle/dependency-versions.properties b/gradle/dependency-versions.properties
index f1d4848..d701540 100644
--- a/gradle/dependency-versions.properties
+++ b/gradle/dependency-versions.properties
@@ -21,7 +21,7 @@ bcel.version = 6.2
 bouncycastle.version = 1.60
 carrotsearch.version = 2.5.0
 cglib.version = 3.2.9
-classgraph.version = 4.4.12
+classgraph.version = 4.0.6
 commons-beanutils.version = 1.9.3
 commons-collections.version = 3.2.2
 commons-configuration.version = 1.10