[geode] branch exclude-extensions-in-jar-check updated (5372265 -> a8941fb)

[jc...@apache.org]

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

jchen21 pushed a change to branch exclude-extensions-in-jar-check
in repository https://gitbox.apache.org/repos/asf/geode.git.


 discard 5372265  Omit extensions in check of bundled jars
     add d3e6280  GEODE-4716 Document new stats and missing gateway sender/receiver MXBean (#1813)
     new a8941fb  Omit extensions in check of bundled jars

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (5372265)
            \
             N -- N -- N   refs/heads/exclude-extensions-in-jar-check (a8941fb)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../source/subnavs/geode-subnav.erb                |  2 +-
 .../management/list_of_mbeans_full.html.md.erb     | 35 ++++++++++++++++++++--
 geode-docs/reference/statistics_list.html.md.erb   |  3 +-
 3 files changed, 36 insertions(+), 4 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
jchen21@apache.org.

[geode] 01/01: Omit extensions in check of bundled jars

[jc...@apache.org]

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

jchen21 pushed a commit to branch exclude-extensions-in-jar-check
in repository https://gitbox.apache.org/repos/asf/geode.git

commit a8941fb088b59c4bf51cf8d64e85821e989047b5
Author: Bradford Boyle <bb...@pivotal.io>
AuthorDate: Tue Apr 17 15:20:27 2018 -0700

    Omit extensions in check of bundled jars
    
    [GEODE-5099]
    
    Signed-off-by Jianxia Chen <jc...@pivotal.io>
---
 .../java/org/apache/geode/BundledJarsJUnitTest.java     | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
index 8e99a7a..d17f5c6 100644
--- a/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/BundledJarsJUnitTest.java
@@ -21,6 +21,7 @@ import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Collection;
+import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
@@ -42,6 +43,7 @@ public class BundledJarsJUnitTest {
 
   private static final String VERSION_PATTERN = "[0-9-_.v]{3,}.*\\.jar$";
   private static final String GEODE_HOME = System.getenv("GEODE_HOME");
+  private static final String EXTENSIONS_SUBDIR = "extensions";
   private Set<String> expectedJars;
 
   @Before
@@ -54,7 +56,7 @@ public class BundledJarsJUnitTest {
 
   @Test
   public void verifyBundledJarsHaveNotChanged() throws IOException {
-    TreeMap<String, String> sortedJars = getBundledJars();
+    TreeMap<String, String> sortedJars = removeExtensionJars(getBundledJars());
     Stream<String> lines =
         sortedJars.entrySet().stream().map(entry -> removeVersion(entry.getKey()));
     Set<String> bundledJarNames = new TreeSet<>(lines.collect(Collectors.toSet()));
@@ -101,6 +103,19 @@ public class BundledJarsJUnitTest {
     return sortedJars;
   }
 
+  private TreeMap<String, String> removeExtensionJars(final TreeMap<String, String> bundledJars) {
+    File geodeHomeDirectory = new File(GEODE_HOME);
+    File extensionsDirectory = new File(geodeHomeDirectory, EXTENSIONS_SUBDIR);
+    final String extensionsPath = extensionsDirectory.getPath();
+
+    final Map<String, String> filteredJars = bundledJars.entrySet()
+        .stream()
+        .filter(entry -> !entry.getValue().startsWith(extensionsPath))
+        .collect(Collectors.toMap(e -> e.getKey(), e -> e.getValue()));
+
+    return new TreeMap<>(filteredJars);
+  }
+
   private String removeVersion(String name) {
     return name.replaceAll(VERSION_PATTERN, "");
   }

-- 
To stop receiving notification emails like this one, please contact
jchen21@apache.org.