Merge pull request jasmineRepo#32 from jasmineRepo/dev/4.0.12

Dev/4.1.0
MRC-CSO-SPHSU · Sep 8, 2022 · 6b40246 · 6b40246
2 parents a502f10 + ee79fa6
commit 6b40246
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 18 deletions.
diff --git a/.jitpack.yml b/.jitpack.yml
@@ -1,3 +1,6 @@
 language: java  
 jdk:  
-  - oraclejdk8
+  - openjdk17
+before_install:
+  - sdk install java 17.0.2-open
+  - sdk use java 17.0.2-open
diff --git a/microsim-core/JAS-mine-core.iml b/microsim-core/JAS-mine-core.iml
@@ -5,14 +5,12 @@
       <configuration>
         <setting name="validation-enabled" value="true" />
         <setting name="provider-name" value="Hibernate" />
-        <datasource-mapping>
-          <factory-entry name="JAS-mine-core" />
-        </datasource-mapping>
+        <datasource-mapping />
         <naming-strategy-map />
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

diff --git a/microsim-core/pom.xml b/microsim-core/pom.xml
@@ -12,10 +12,10 @@
 			<plugin>
 		        <groupId>org.apache.maven.plugins</groupId>
 		        <artifactId>maven-compiler-plugin</artifactId>
-		        <version>3.6.1</version>
-		        <configuration> <!-- Compile java 8 compatible bytecode -->
-		          <source>1.8</source>
-		          <target>1.8</target>
+		        <version>3.10.1</version>
+		        <configuration> <!-- Compile java 17 compatible bytecode -->
+		          <source>17</source>
+		          <target>17</target>
 		        </configuration>
 		      </plugin>
 			<plugin>
@@ -132,7 +132,7 @@
 			<version>3.1.0</version>
 		</dependency>
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.orm</groupId>
 			<artifactId>hibernate-core</artifactId>
 			<version>6.1.2.Final</version>
 		</dependency>

diff --git a/microsim-core/src/main/java/microsim/data/db/DatabaseUtils.java b/microsim-core/src/main/java/microsim/data/db/DatabaseUtils.java
@@ -15,11 +15,6 @@
 import microsim.engine.SimulationEngine;
 
 import org.apache.log4j.Logger;
-import org.hibernate.boot.Metadata;
-import org.hibernate.boot.MetadataSources;
-import org.hibernate.boot.registry.StandardServiceRegistry;
-import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
-import org.hibernate.service.ServiceRegistry;
 
 @SuppressWarnings("deprecation")
 public class DatabaseUtils {

diff --git a/microsim-core/src/main/java/microsim/engine/MultiRun.java b/microsim-core/src/main/java/microsim/engine/MultiRun.java
@@ -154,7 +154,7 @@ public void onEngineEvent(SystemEventType event) {
 				for (MultiRunListener listener : multiRunListeners) 
 					listener.afterSimulationCompleted(engine);
 
-			yield();
+			this.yield();
 			toBeContinued = nextModel();
 			engine.disposeModels();
 			executionActive = false;

diff --git a/microsim-core/src/main/java/microsim/engine/SimulationEngine.java b/microsim-core/src/main/java/microsim/engine/SimulationEngine.java
@@ -571,7 +571,7 @@ public synchronized void step() throws SimulationException {
 
 		eventQueue.step();
 		notifySimulationListeners(SystemEventType.Step);
-		yield();		
+		this.yield();
 	}
 
 	protected synchronized void notifySimulationListeners(SystemEventType event) {
@@ -614,7 +614,7 @@ public void run() {
 				}
 			// this is now called in step() method.
 			else
-				yield();
+				this.yield();
 		}
 
 	}