secure bot updates (#1346)

* secure bot updates * fixed pom template with lf endings
MyRobotLab · Oct 12, 2023 · 11f47e3 · 11f47e3
1 parent d6b17bd
commit 11f47e3
Show file tree

Hide file tree

Showing 8 changed files with 958 additions and 959 deletions.
diff --git a/pom.xml b/pom.xml
diff --git a/src/main/java/org/myrobotlab/framework/repo/IvyWrapper.java b/src/main/java/org/myrobotlab/framework/repo/IvyWrapper.java
@@ -34,7 +34,7 @@ public class IvyWrapper extends Repo implements Serializable {
 
   private static final long serialVersionUID = 1L;
 
-  public static final String IVY_VERSION = "2.5.1";
+  public static final String IVY_VERSION = "2.5.2";
 
   class IvyWrapperLogger extends AbstractMessageLogger {
 

diff --git a/src/main/java/org/myrobotlab/service/Python.java b/src/main/java/org/myrobotlab/service/Python.java
@@ -827,7 +827,6 @@ public void releaseService() {
 
     inputQueueThread.stop();
     thread.interruptAllThreads();
-    Py.getSystemState()._systemRestart = true;
   }
 
   /**

diff --git a/src/main/java/org/myrobotlab/service/meta/GitMeta.java b/src/main/java/org/myrobotlab/service/meta/GitMeta.java
@@ -17,7 +17,7 @@ public GitMeta() {
     addCategory("programming");
 
     // EDL (new-style BSD) licensed
-    addDependency("org.eclipse.jgit", "org.eclipse.jgit", "5.4.0.201906121030-r");
+    addDependency("org.eclipse.jgit", "org.eclipse.jgit", "6.6.1.202309021850-r");
   }
 
 }
diff --git a/src/main/java/org/myrobotlab/service/meta/OpenWeatherMapMeta.java b/src/main/java/org/myrobotlab/service/meta/OpenWeatherMapMeta.java
@@ -17,7 +17,7 @@ public OpenWeatherMapMeta() {
     addDescription("This service will query OpenWeatherMap for the current weather.  Get an API key at http://openweathermap.org/");
     addCategory("weather");
     setCloudService(true);
-    addDependency("org.json", "json", "20090211");
+    addDependency("org.json", "json", "20230227");
 
   }
 

diff --git a/src/main/java/org/myrobotlab/service/meta/ProgramABMeta.java b/src/main/java/org/myrobotlab/service/meta/ProgramABMeta.java
@@ -26,7 +26,7 @@ public ProgramABMeta() {
 
     addDependency("com.fasterxml.jackson.dataformat", "jackson-dataformat-xml", "2.14.0");
 
-    addDependency("org.json", "json", "20090211");
+    addDependency("org.json", "json", "20230227");
     // used by FileIO
     addDependency("commons-io", "commons-io", "2.7");
     // TODO: This is for CJK support in ProgramAB move this into the published

diff --git a/src/main/java/org/myrobotlab/service/meta/PythonMeta.java b/src/main/java/org/myrobotlab/service/meta/PythonMeta.java
@@ -18,7 +18,7 @@ public PythonMeta() {
     addCategory("programming", "control");
 
     includeServiceInOneJar(true);
-    addDependency("org.python", "jython-standalone", "2.7.1");
+    addDependency("org.python", "jython-standalone", "2.7.2");
 
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -827,7 +827,6 @@ public void releaseService() { @@
         inputQueueThread.stop();
         thread.interruptAllThreads();
-        Py.getSystemState()._systemRestart = true;
       }
       /**
@@ Expand Down @@