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 @@
META-INF/*.DSA
META-INF/*.RSA
+
+ org.graalvm.js:*
+
META-INF/maven/**
@@ -435,6 +438,7 @@
com/google/common/graph/AbstractBaseGraph*.classcom/google/common/graph/AbstractBaseGraph.classcom/google/common/graph/AbstractDirectedNetworkConnections*.classcom/google/common/graph/AbstractDirectedNetworkConnections.classcom/google/common/graph/AbstractGraph.classcom/google/common/graph/AbstractGraphBuilder.classcom/google/common/graph/AbstractNetwork*.classcom/google/common/graph/AbstractNetwork.classcom/google/common/graph/AbstractUndirectedNetworkConnections.classcom/google/common/graph/AbstractValueGraph*.classcom/google/common/graph/AbstractValueGraph.classcom/google/common/graph/BaseGraph.classcom/google/common/graph/DirectedGraphConnections*.classcom/google/common/graph/DirectedGraphConnections.classcom/google/common/graph/DirectedMultiNetworkConnections*.classcom/google/common/graph/DirectedMultiNetworkConnections.classcom/google/common/graph/DirectedNetworkConnections.classcom/google/common/graph/EdgesConnecting.classcom/google/common/graph/ElementOrder*.classcom/google/common/graph/ElementOrder.classcom/google/common/graph/EndpointPair*.classcom/google/common/graph/EndpointPair.classcom/google/common/graph/EndpointPairIterator*.classcom/google/common/graph/EndpointPairIterator.classcom/google/common/graph/ForwardingGraph.classcom/google/common/graph/ForwardingNetwork.classcom/google/common/graph/ForwardingValueGraph.classcom/google/common/graph/Graph.classcom/google/common/graph/GraphBuilder.classcom/google/common/graph/GraphConnections.classcom/google/common/graph/GraphConstants*.classcom/google/common/graph/GraphConstants.classcom/google/common/graph/Graphs*.classcom/google/common/graph/Graphs.classcom/google/common/graph/ImmutableGraph*.classcom/google/common/graph/ImmutableGraph.classcom/google/common/graph/ImmutableNetwork*.classcom/google/common/graph/ImmutableNetwork.classcom/google/common/graph/ImmutableValueGraph*.classcom/google/common/graph/ImmutableValueGraph.classcom/google/common/graph/IncidentEdgeSet.classcom/google/common/graph/MapIteratorCache*.classcom/google/common/graph/MapIteratorCache.classcom/google/common/graph/MapRetrievalCache*.classcom/google/common/graph/MapRetrievalCache.classcom/google/common/graph/MultiEdgesConnecting*.classcom/google/common/graph/MultiEdgesConnecting.classcom/google/common/graph/MutableGraph.classcom/google/common/graph/MutableNetwork.classcom/google/common/graph/MutableValueGraph.classcom/google/common/graph/Network.classcom/google/common/graph/NetworkBuilder.classcom/google/common/graph/NetworkConnections.classcom/google/common/graph/PredecessorsFunction.classcom/google/common/graph/StandardMutableGraph.classcom/google/common/graph/StandardMutableNetwork.classcom/google/common/graph/StandardMutableValueGraph.classcom/google/common/graph/StandardNetwork.classcom/google/common/graph/StandardValueGraph*.classcom/google/common/graph/StandardValueGraph.classcom/google/common/graph/Traverser*.classcom/google/common/graph/Traverser.classcom/google/common/graph/UndirectedGraphConnections*.classcom/google/common/graph/UndirectedGraphConnections.classcom/google/common/graph/UndirectedMultiNetworkConnections*.classcom/google/common/graph/UndirectedMultiNetworkConnections.classcom/google/common/graph/UndirectedNetworkConnections.classcom/google/common/graph/ValueGraph.classcom/google/common/graph/ValueGraphBuilder.classcom/google/common/graph/package-info.class
+ com/ibm/icu/**
com/opencsv/**
com/sun/mail/imap/**
com/twilio/rest/**
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