Merge pull request #1399 from MyRobotLab/jmonkey-updates

Jmonkey updates
MyRobotLab · Feb 24, 2024 · c9a7bf2 · c9a7bf2
2 parents a247c31 + 3335702
commit c9a7bf2
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 41 deletions.
diff --git a/pom.xml b/pom.xml
@@ -484,10 +484,6 @@
     <!-- Duplicate entry for org.myrobotlab.audio-voice-effects-1.0 skipping -->
     <!-- IndianTts end -->
 
-    <!-- IntegratedMovement begin -->
-    <!-- Duplicate entry for fr.inmoov-inmoov2-null skipping -->
-    <!-- IntegratedMovement end -->
-
     <!-- JFugue begin -->
     <dependency>
       <groupId>jfugue</groupId>
@@ -501,25 +497,25 @@
     <dependency>
       <groupId>org.jmonkeyengine</groupId>
       <artifactId>jme3-core</artifactId>
-      <version>3.3.2-stable</version>
+      <version>3.6.1-stable</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jmonkeyengine</groupId>
       <artifactId>jme3-desktop</artifactId>
-      <version>3.3.2-stable</version>
+      <version>3.6.1-stable</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jmonkeyengine</groupId>
       <artifactId>jme3-lwjgl3</artifactId>
-      <version>3.3.2-stable</version>
+      <version>3.6.1-stable</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jmonkeyengine</groupId>
       <artifactId>jme3-jogg</artifactId>
-      <version>3.3.2-stable</version>
+      <version>3.6.1-stable</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -537,7 +533,7 @@
     <dependency>
       <groupId>org.jmonkeyengine</groupId>
       <artifactId>jme3-plugins</artifactId>
-      <version>3.3.2-stable</version>
+      <version>3.6.1-stable</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -555,13 +551,13 @@
     <dependency>
       <groupId>org.lwjgl</groupId>
       <artifactId>lwjgl-opengl</artifactId>
-      <version>3.2.3</version>
+      <version>3.3.3</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.lwjgl</groupId>
       <artifactId>lwjgl-glfw</artifactId>
-      <version>3.2.3</version>
+      <version>3.3.3</version>
       <scope>provided</scope>
     </dependency>
     <!-- JMonkeyEngine end -->
@@ -1690,10 +1686,6 @@
     </dependency>
     <!-- WebGui end -->
 
-    <!-- WebSocketConnector begin -->
-    <!-- Duplicate entry for javax.websocket-javax.websocket-api-1.1 skipping -->
-    <!-- WebSocketConnector end -->
-
     <!-- Webcam begin -->
     <dependency>
       <groupId>com.github.sarxos</groupId>
@@ -1751,10 +1743,6 @@
     </dependency>
     <!-- WolframAlpha end -->
 
-    <!-- WorkE begin -->
-    <!-- skipping org.myrobotlab worke org.myrobotlab-worke-null null version/latest -->
-    <!-- WorkE end -->
-
     <!-- Xmpp begin -->
     <dependency>
       <groupId>org.igniterealtime.smack</groupId>
@@ -2024,9 +2012,7 @@
           </includes>
           <excludes>
             <exclude>**/integration/*</exclude>
-            <!-- unfortunately not testing OpenCV is required for ci to work -->
           </excludes>
-          <!-- required so surefire doesnt die talking to the agent over stdin -->
           <forkNode
             implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory" />
         </configuration>

diff --git a/src/main/java/org/myrobotlab/framework/repo/MavenWrapper.java b/src/main/java/org/myrobotlab/framework/repo/MavenWrapper.java
@@ -1,5 +1,5 @@
 package org.myrobotlab.framework.repo;
-
+import org.myrobotlab.service.Runtime;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -311,6 +311,7 @@ public static void main(String[] args) {
       // repo.installEach(); <-- TODO - test
 
       log.info("done");
+      Runtime.shutdown();
 
     } catch (Exception e) {
       log.error(e.getMessage(), e);

diff --git a/src/main/java/org/myrobotlab/service/meta/JMonkeyEngineMeta.java b/src/main/java/org/myrobotlab/service/meta/JMonkeyEngineMeta.java
@@ -16,32 +16,30 @@ public JMonkeyEngineMeta() {
 
     addDescription("is a 3d game engine, used for simulators");
 
-    String jmeVersion = "3.3.2-stable";
+    String jmeVersion = "3.6.1-stable";
     addDependency("org.jmonkeyengine", "jme3-core", jmeVersion);
     addDependency("org.jmonkeyengine", "jme3-desktop", jmeVersion);
     // addDependency("org.jmonkeyengine", "jme3-lwjgl", jmeVersion);
     // nev version of lwjgl3 which works with java 11
     addDependency("org.jmonkeyengine", "jme3-lwjgl3", jmeVersion);
     addDependency("org.jmonkeyengine", "jme3-jogg", jmeVersion);
 
-    addDependency("org.jmonkeyengine", "jme3-bullet", jmeVersion);
-    addDependency("org.jmonkeyengine", "jme3-bullet-native", jmeVersion);
-
-
+    addDependency("org.jmonkeyengine", "jme3-bullet", "3.3.2-stable");
+    addDependency("org.jmonkeyengine", "jme3-bullet-native", "3.3.2-stable");
 
     addDependency("org.jmonkeyengine", "jme3-plugins", jmeVersion);
 
     // addDependency("jme3utilities", "Minie", "0.6.2");
     // "new" physics - ik forward kinematics ...
 
     // not really supposed to use blender models - export to j3o
-    addDependency("org.jmonkeyengine", "jme3-blender", jmeVersion);
+    addDependency("org.jmonkeyengine", "jme3-blender", "3.3.2-stable");
 
     // jbullet ==> org="net.sf.sociaal" name="jME3-jbullet" rev="3.0.0.20130526"
     // audio dependencies
     addDependency("de.jarnbjo", "j-ogg-all", "1.0.0");
-    addDependency("org.lwjgl", "lwjgl-opengl", "3.2.3");
-    addDependency("org.lwjgl", "lwjgl-glfw", "3.2.3");
+    addDependency("org.lwjgl", "lwjgl-opengl", "3.3.3");
+    addDependency("org.lwjgl", "lwjgl-glfw", "3.3.3");
 
     addCategory("simulator");
 

diff --git a/src/main/resources/resource/framework/pom.xml.template b/src/main/resources/resource/framework/pom.xml.template
@@ -83,7 +83,7 @@
       <!-- force overriding property at command line, use ${maven.build.timestamp}-->
       <timestamp>${maven.build.timestamp}</timestamp>
       <maven.build.timestamp.format>yyyyMMddHHmm</maven.build.timestamp.format>      
-      <version>${project.version}</version>   
+      <version>${version}</version>   
       <GitBranch>${git.branch}</GitBranch>
       <username>${NODE_NAME}</username>      
       <platform>${NODE_LABELS}</platform>      
@@ -193,7 +193,7 @@
                         </goals>
                         <configuration>
                             <finalName>myrobotlab</finalName>
-                            <!-- finalName>myrobotlab-${git.branch}-${project.version}</finalName -->
+                            <!-- finalName>myrobotlab-${git.branch}-${version}</finalName -->
                             <shadedArtifactAttached>true</shadedArtifactAttached>
                             <shadedClassifierName>myrobotlab-full</shadedClassifierName>
                             <minimizeJar>false</minimizeJar>
@@ -207,10 +207,10 @@
                                         implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                                         <manifestEntries>
                                           <Main-Class>org.myrobotlab.service.Runtime</Main-Class>
-                                          <Major-Version>${project.version}</Major-Version>
-                                          <Implementation-Version>${project.version}</Implementation-Version>                               
+                                          <Major-Version>${version}</Major-Version>
+                                          <Implementation-Version>${version}</Implementation-Version>                               
 
-                        <Build-Version>${project.version}</Build-Version>
+                        <Build-Version>${version}</Build-Version>
                         <Build-Time>${maven.build.timestamp}</Build-Time>
                         <Build-Host>${agent.name}</Build-Host>
                         <Build-User>${user.name}</Build-User>
@@ -331,7 +331,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <groupId>org.apache.maven.plugins</groupId>
         <!-- do not upgrade this version jacoco will break -->
-        <version>2.18</version>
+        <version>3.2.2</version>
         <configuration>
           <!-- critical for jacoco to have original argLine prefixed here-->
           <argLine>${argLine} -Djava.library.path=libraries/native -Djna.library.path=libraries/native</argLine>
@@ -340,11 +340,9 @@
           </includes>
           <excludes>
             <exclude>**/integration/*</exclude>
-            <!-- unfortunately not testing OpenCV is required for ci to work -->
-            <exclude>**/OpenCV*</exclude>
           </excludes>
-             <systemPropertyVariables>
-              </systemPropertyVariables>
+          <forkNode
+            implementation="org.apache.maven.plugin.surefire.extensions.SurefireForkNodeFactory" />
         </configuration>
         <executions>
           <execution>
@@ -425,7 +423,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.18</version>
+        <version>3.2.2</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>