From 93a009baa50041820d4a73faadab792236fe6c5f Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Sat, 5 Dec 2020 09:49:40 -0500
Subject: [PATCH] remove graal from uberjar

---
 bubble-server/pom.xml                                     | 4 ++++
 .../notify/NotificationHandler_hello_from_sage.java       | 8 ++++++--
 utils/cobbzilla-parent                                    | 2 +-
 utils/cobbzilla-utils                                     | 2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/bubble-server/pom.xml b/bubble-server/pom.xml
index 2f89a57c..3419f350 100644
--- a/bubble-server/pom.xml
+++ b/bubble-server/pom.xml
@@ -398,6 +398,9 @@
                                         <exclude>META-INF/*.DSA</exclude>
                                         <exclude>META-INF/*.RSA</exclude>
 
+                                        <!-- Exclude Graal. Only used by UserBlocker, but we use JsUserBlocker now -->
+                                        <exclude>org.graalvm.js:*</exclude>
+
                                         <!-- Exclude other stuff by path -->
                                         <!-- after META we go alphabetically, noting exceptions along the way -->
                                         <exclude>META-INF/maven/**</exclude>
@@ -435,6 +438,7 @@
                                         <exclude>com/google/common/graph/AbstractBaseGraph*.class</exclude><exclude>com/google/common/graph/AbstractBaseGraph.class</exclude><exclude>com/google/common/graph/AbstractDirectedNetworkConnections*.class</exclude><exclude>com/google/common/graph/AbstractDirectedNetworkConnections.class</exclude><exclude>com/google/common/graph/AbstractGraph.class</exclude><exclude>com/google/common/graph/AbstractGraphBuilder.class</exclude><exclude>com/google/common/graph/AbstractNetwork*.class</exclude><exclude>com/google/common/graph/AbstractNetwork.class</exclude><exclude>com/google/common/graph/AbstractUndirectedNetworkConnections.class</exclude><exclude>com/google/common/graph/AbstractValueGraph*.class</exclude><exclude>com/google/common/graph/AbstractValueGraph.class</exclude><exclude>com/google/common/graph/BaseGraph.class</exclude><exclude>com/google/common/graph/DirectedGraphConnections*.class</exclude><exclude>com/google/common/graph/DirectedGraphConnections.class</exclude><exclude>com/google/common/graph/DirectedMultiNetworkConnections*.class</exclude><exclude>com/google/common/graph/DirectedMultiNetworkConnections.class</exclude><exclude>com/google/common/graph/DirectedNetworkConnections.class</exclude><exclude>com/google/common/graph/EdgesConnecting.class</exclude><exclude>com/google/common/graph/ElementOrder*.class</exclude><exclude>com/google/common/graph/ElementOrder.class</exclude><exclude>com/google/common/graph/EndpointPair*.class</exclude><exclude>com/google/common/graph/EndpointPair.class</exclude><exclude>com/google/common/graph/EndpointPairIterator*.class</exclude><exclude>com/google/common/graph/EndpointPairIterator.class</exclude><exclude>com/google/common/graph/ForwardingGraph.class</exclude><exclude>com/google/common/graph/ForwardingNetwork.class</exclude><exclude>com/google/common/graph/ForwardingValueGraph.class</exclude><exclude>com/google/common/graph/Graph.class</exclude><exclude>com/google/common/graph/GraphBuilder.class</exclude><exclude>com/google/common/graph/GraphConnections.class</exclude><exclude>com/google/common/graph/GraphConstants*.class</exclude><exclude>com/google/common/graph/GraphConstants.class</exclude><exclude>com/google/common/graph/Graphs*.class</exclude><exclude>com/google/common/graph/Graphs.class</exclude><exclude>com/google/common/graph/ImmutableGraph*.class</exclude><exclude>com/google/common/graph/ImmutableGraph.class</exclude><exclude>com/google/common/graph/ImmutableNetwork*.class</exclude><exclude>com/google/common/graph/ImmutableNetwork.class</exclude><exclude>com/google/common/graph/ImmutableValueGraph*.class</exclude><exclude>com/google/common/graph/ImmutableValueGraph.class</exclude><exclude>com/google/common/graph/IncidentEdgeSet.class</exclude><exclude>com/google/common/graph/MapIteratorCache*.class</exclude><exclude>com/google/common/graph/MapIteratorCache.class</exclude><exclude>com/google/common/graph/MapRetrievalCache*.class</exclude><exclude>com/google/common/graph/MapRetrievalCache.class</exclude><exclude>com/google/common/graph/MultiEdgesConnecting*.class</exclude><exclude>com/google/common/graph/MultiEdgesConnecting.class</exclude><exclude>com/google/common/graph/MutableGraph.class</exclude><exclude>com/google/common/graph/MutableNetwork.class</exclude><exclude>com/google/common/graph/MutableValueGraph.class</exclude><exclude>com/google/common/graph/Network.class</exclude><exclude>com/google/common/graph/NetworkBuilder.class</exclude><exclude>com/google/common/graph/NetworkConnections.class</exclude><exclude>com/google/common/graph/PredecessorsFunction.class</exclude><exclude>com/google/common/graph/StandardMutableGraph.class</exclude><exclude>com/google/common/graph/StandardMutableNetwork.class</exclude><exclude>com/google/common/graph/StandardMutableValueGraph.class</exclude><exclude>com/google/common/graph/StandardNetwork.class</exclude><exclude>com/google/common/graph/StandardValueGraph*.class</exclude><exclude>com/google/common/graph/StandardValueGraph.class</exclude><exclude>com/google/common/graph/Traverser*.class</exclude><exclude>com/google/common/graph/Traverser.class</exclude><exclude>com/google/common/graph/UndirectedGraphConnections*.class</exclude><exclude>com/google/common/graph/UndirectedGraphConnections.class</exclude><exclude>com/google/common/graph/UndirectedMultiNetworkConnections*.class</exclude><exclude>com/google/common/graph/UndirectedMultiNetworkConnections.class</exclude><exclude>com/google/common/graph/UndirectedNetworkConnections.class</exclude><exclude>com/google/common/graph/ValueGraph.class</exclude><exclude>com/google/common/graph/ValueGraphBuilder.class</exclude><exclude>com/google/common/graph/package-info.class</exclude>
                                         <!-- <exclude>com/google/graph/**</exclude> something needs SuccessorsFunction -->
 
+                                        <exclude>com/ibm/icu/**</exclude>
                                         <exclude>com/opencsv/**</exclude>
                                         <exclude>com/sun/mail/imap/**</exclude>
                                         <exclude>com/twilio/rest/**</exclude>
diff --git a/bubble-server/src/main/java/bubble/notify/NotificationHandler_hello_from_sage.java b/bubble-server/src/main/java/bubble/notify/NotificationHandler_hello_from_sage.java
index 6432318d..59bf0dea 100644
--- a/bubble-server/src/main/java/bubble/notify/NotificationHandler_hello_from_sage.java
+++ b/bubble-server/src/main/java/bubble/notify/NotificationHandler_hello_from_sage.java
@@ -12,6 +12,7 @@ import bubble.model.bill.AccountPlan;
 import bubble.model.bill.BubblePlan;
 import bubble.model.cloud.BubbleNetwork;
 import bubble.model.cloud.BubbleNode;
+import bubble.model.cloud.BubbleVersionInfo;
 import bubble.model.cloud.NetLocation;
 import bubble.model.cloud.notify.ReceivedNotification;
 import bubble.service.upgrade.AppUpgradeService;
@@ -45,12 +46,15 @@ public class NotificationHandler_hello_from_sage extends ReceivedNotificationHan
 
         // First check to see if the sage reported a new jar version available
         if (payloadNode.hasSageVersion()) {
-            log.info("handleNotification: payload node has sage version: "+payloadNode.getSageVersion());
-            if (configuration.setSageVersion(payloadNode.getSageVersion())) {
+            final BubbleVersionInfo sageVersion = payloadNode.getSageVersion();
+            log.info("handleNotification: sage version: "+sageVersion);
+            if (configuration.setSageVersion(sageVersion)) {
                 // run the jar upgrade service
+                log.info("handleNotification: notifying jarUpgradeService: "+sageVersion);
                 if (!jarUpgradeService.getIsAlive() && jarUpgradeService.shouldRun()) jarUpgradeService.startOrInterrupt();
             } else {
                 // start the app upgrade service, if not running
+                log.info("handleNotification: notifying appUpgradeService: "+sageVersion);
                 if (!appUpgradeService.getIsAlive() && appUpgradeService.shouldRun()) appUpgradeService.startOrInterrupt();
             }
         }
diff --git a/utils/cobbzilla-parent b/utils/cobbzilla-parent
index 7c4b4ed5..52e7a99a 160000
--- a/utils/cobbzilla-parent
+++ b/utils/cobbzilla-parent
@@ -1 +1 @@
-Subproject commit 7c4b4ed531f8d16fb44338171d61a8bbc3f6ddb4
+Subproject commit 52e7a99a6625f7e1db998179fa5a3cff90acb1a1
diff --git a/utils/cobbzilla-utils b/utils/cobbzilla-utils
index 5fd4fa92..a6db63d8 160000
--- a/utils/cobbzilla-utils
+++ b/utils/cobbzilla-utils
@@ -1 +1 @@
-Subproject commit 5fd4fa924160d03a53d8451245456ce998695e62
+Subproject commit a6db63d80b37214272e4a3c0f062f5ff7cff1478