Merge branch 'develop' of https://github.com/MyRobotLab/myrobotlab in…

…to inmoov2-heart-2
MyRobotLab · Apr 25, 2024 · da6107c · da6107c
2 parents f09bf0e + fb534d3
commit da6107c
Show file tree

Hide file tree

Showing 13 changed files with 5,251 additions and 5,330 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -31,6 +31,7 @@ pipeline {
          MOTD = 'you know, for robots !'
          VERSION_PREFIX = "1.1"
          VERSION = "${VERSION_PREFIX}" + ".${BUILD_NUMBER}"
+         // MAVEN_OPTS = '-Xmx4096m -XX:MaxPermSize=256m -XX:+ExitOnOutOfMemoryError'
    // JDK_HOME = "${tool 'openjdk-11-linux'}/jdk-11.0.1"
    // JAVA_HOME = "${JDK_HOME}"
    // PATH="${env.JAVA_HOME}/bin:${env.PATH}"

diff --git a/myrobotlab.bat b/myrobotlab.bat
@@ -28,6 +28,6 @@ IF NOT "%*"=="" (
         "%JAVA%" %JAVA_OPTIONS% -cp %CLASSPATH% org.myrobotlab.service.Runtime --install
     )
 
-    "%JAVA%" %JAVA_OPTIONS% -cp %CLASSPATH% org.myrobotlab.service.Runtime --log-level warn -s log Log webgui WebGui intro Intro python Python
+    "%JAVA%" %JAVA_OPTIONS% -cp %CLASSPATH% org.myrobotlab.service.Runtime --log-level info -s log Log security Security webgui WebGui intro Intro python Python
 
 )
diff --git a/myrobotlab.sh b/myrobotlab.sh
@@ -62,6 +62,6 @@ else
     "${JAVA}" ${JAVA_OPTIONS} -cp ${CLASSPATH} org.myrobotlab.service.Runtime --install
 fi
 
-"${JAVA}" ${JAVA_OPTIONS} -cp ${CLASSPATH} org.myrobotlab.service.Runtime --log-level warn -s log Log webgui WebGui intro Intro python Python
+"${JAVA}" ${JAVA_OPTIONS} -cp ${CLASSPATH} org.myrobotlab.service.Runtime --log-level info -s log Log security Security webgui WebGui intro Intro python Python
 
 echo $# $@
diff --git a/pom.xml b/pom.xml
@@ -1995,6 +1995,8 @@
         <!-- do not upgrade this version jacoco will break -->
         <version>3.2.2</version>
         <configuration>
+          <forkCount>1</forkCount>  <!-- Use one JVM -->
+          <reuseForks>true</reuseForks>  <!-- Reuse this JVM for all tests -->        
           <!-- critical for jacoco to have original argLine prefixed here-->
           <argLine>${argLine} -Djava.library.path=libraries/native
             -Djna.library.path=libraries/native</argLine>

diff --git a/src/main/java/org/myrobotlab/service/AudioFile.java b/src/main/java/org/myrobotlab/service/AudioFile.java
@@ -180,7 +180,7 @@ public AudioData play(String filename, boolean blocking) {
 
   public AudioData play(String filename, boolean blocking, Integer repeat, String track) {
 
-    log.info("Play called for Filename {}", filename);
+    log.info("Play called for Filename {}", filename);
     if (track == null || track.isEmpty()) {
       track = currentTrack;
     }

diff --git a/src/main/java/org/myrobotlab/service/NeoPixel.java b/src/main/java/org/myrobotlab/service/NeoPixel.java
@@ -1051,4 +1051,4 @@ public void setPixel(int address, String color) {
     }
    setPixel(address, rgb[0], rgb[1], rgb[2]);
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -1051,4 +1051,4 @@ public void setPixel(int address, String color) { @@
         }
        setPixel(address, rgb[0], rgb[1], rgb[2]);
       }
-    }
+    }