updated to build with newest maestro snapshot

INTO-CPS-Association · Jan 11, 2024 · a691e58 · a691e58
1 parent 428bbdd
commit a691e58
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 63 deletions.
diff --git a/faultinject-bundle/src/test/java/org/intocps/maestro/faultinject/maestroTest.java b/faultinject-bundle/src/test/java/org/intocps/maestro/faultinject/maestroTest.java
@@ -2,7 +2,7 @@
 package org.intocps.maestro.faultinject;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.core.config.Configurator;

diff --git a/faultinject/src/main/java/org/intocps/maestro/faultinject/FaultInjectRuntimeModule.java b/faultinject/src/main/java/org/intocps/maestro/faultinject/FaultInjectRuntimeModule.java
@@ -1,54 +1,23 @@
 package org.intocps.maestro.faultinject;
 
 import com.spencerwi.either.Either;
-
+import net.objecthunter.exp4j.Expression;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.tuple.Pair;
+import org.intocps.fmi.*;
 import org.intocps.maestro.interpreter.InterpreterException;
 import org.intocps.maestro.interpreter.api.IValueLifecycleHandler;
-import org.intocps.maestro.interpreter.values.ArrayValue;
-import org.intocps.maestro.interpreter.values.BooleanValue;
-import org.intocps.maestro.interpreter.values.ExternalModuleValue;
-import org.intocps.maestro.interpreter.values.FunctionValue;
-import org.intocps.maestro.interpreter.values.IntegerValue;
-import org.intocps.maestro.interpreter.values.NumericValue;
-import org.intocps.maestro.interpreter.values.RealValue;
-import org.intocps.maestro.interpreter.values.StringValue;
-import org.intocps.maestro.interpreter.values.UnsignedIntegerValue;
-import org.intocps.maestro.interpreter.values.UpdatableValue;
-import org.intocps.maestro.interpreter.values.Value;
+import org.intocps.maestro.interpreter.values.*;
 import org.intocps.maestro.interpreter.values.fmi.FmuComponentStateValue;
 import org.intocps.maestro.interpreter.values.fmi.FmuComponentValue;
 import org.intocps.maestro.interpreter.values.fmi.FmuValue;
-import org.intocps.fmi.Fmi2Status;
-import org.intocps.fmi.Fmi2StatusKind;
-import org.intocps.fmi.FmiInvalidNativeStateException;
-import org.intocps.fmi.FmuInvocationException;
-import org.intocps.fmi.FmuResult;
-import org.intocps.fmi.IFmiComponent;
-import org.intocps.fmi.IFmiComponentState;
-import org.intocps.fmi.InvalidParameterException;
-import org.apache.commons.compress.archivers.EntryStreamOffsets;
-import org.apache.commons.lang.ArrayUtils;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.System.Logger.Level;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.DoubleStream;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.SAXException;
 
-import javax.xml.crypto.Data;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -58,16 +27,13 @@
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-
-import net.objecthunter.exp4j.Expression;
-import net.objecthunter.exp4j.ExpressionBuilder;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.DoubleStream;
+import java.util.stream.IntStream;
 
 
 @IValueLifecycleHandler.ValueLifecycle(name = "FaultInject")

diff --git a/pom.xml b/pom.xml
@@ -16,19 +16,14 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
         <log4j2.version>2.17.1</log4j2.version>
-        <maestro.version>2.1.9</maestro.version>
+        <maestro.version>2.3.1-SNAPSHOT</maestro.version>
     </properties>
 
     <repositories>
         <repository>
-            <id>maestro2-third-party</id>
-            <name>maestro2-third-party</name>
-            <url>http://overture.au.dk/artifactory/maestro2-third-party</url>
-        </repository>
-        <repository>
-            <id>overture.au.dk</id>
-            <name>overture.au.dk-releases</name>
-            <url>http://overture.au.dk/artifactory/into-cps</url>
+            <name>Maven Central Snapshots</name>
+            <id>ossrh</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
         </repository>
 
     </repositories>
@@ -273,7 +268,7 @@
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-text</artifactId>
-                <version>1.10</version>
+                <version>1.11.0</version>
             </dependency>
 
             <dependency>