From 9016c6225eff905f2794b15ee75b30cd9f7a7f1a Mon Sep 17 00:00:00 2001
From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Tue, 13 Dec 2016 15:59:52 +0200
Subject: [PATCH] Fixed maven package build to build
 org.simantics.sysdyn.internal.p2 site

This is still work is progress but getting there.

refs #6676

Change-Id: I860898c5e5143de29246e34d59a60e3f59e7bdae
---
 bundles/org.simantics.fmu.me.win32/.classpath |  2 --
 .../META-INF/MANIFEST.MF                      |  6 ++--
 .../build.properties                          |  2 --
 bundles/org.simantics.fmu.me.win32/pom.xml    | 35 +++++++++++++++++++
 bundles/org.simantics.fmu.me.win64/.classpath |  2 --
 .../META-INF/MANIFEST.MF                      |  6 ++--
 .../build.properties                          |  2 --
 bundles/org.simantics.fmu.me.win64/pom.xml    | 35 +++++++++++++++++++
 .../buckminster.properties                    |  7 ++--
 .../org.simantics.sysdyn.feature/feature.xml  |  2 +-
 .../build.properties                          |  4 +--
 .../feature.xml                               | 12 +++----
 .../feature.xml                               | 10 +++---
 .../buckminster.properties                    |  7 ++--
 .../feature.xml                               |  2 +-
 features/pom.xml                              | 28 +++++++++++----
 .../category.xml                              |  2 +-
 .../org.simantics.sysdyn.repository/pom.xml   |  2 +-
 .../META-INF/MANIFEST.MF                      |  3 +-
 .../fmi/CallFMUBeforeInitializationTests.java |  7 ++--
 .../sysdyn/tests/fmi/FMUBooleanTest.java      |  7 ++--
 .../sysdyn/tests/fmi/FMUIntegerTest.java      |  7 ++--
 .../sysdyn/tests/fmi/FMURealTest.java         |  7 ++--
 .../sysdyn/tests/fmi/FMUResultFilterTest.java |  7 ++--
 .../tests/fmi/LoadFMUFileFailTests.java       |  7 ++--
 ...ultipleSimultaneousFMUSimulationsTest.java |  7 ++--
 26 files changed, 142 insertions(+), 76 deletions(-)
 create mode 100644 bundles/org.simantics.fmu.me.win32/pom.xml
 create mode 100644 bundles/org.simantics.fmu.me.win64/pom.xml

diff --git a/bundles/org.simantics.fmu.me.win32/.classpath b/bundles/org.simantics.fmu.me.win32/.classpath
index b862a296..bdaeff6b 100644
--- a/bundles/org.simantics.fmu.me.win32/.classpath
+++ b/bundles/org.simantics.fmu.me.win32/.classpath
@@ -2,6 +2,4 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.simantics.fmu.me.win32/META-INF/MANIFEST.MF b/bundles/org.simantics.fmu.me.win32/META-INF/MANIFEST.MF
index f7371dbc..417b6df3 100644
--- a/bundles/org.simantics.fmu.me.win32/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.fmu.me.win32/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Win32 binaries for FMI model exchange
 Bundle-SymbolicName: org.simantics.fmu.me.win32
 Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: Semantum Oy
+Fragment-Host: org.simantics.fmu;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.simantics.utils;bundle-version="1.1.0"
-Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86))
+Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86))
+Bundle-NativeCode: libraries/FMUSimulator.dll; libraries/miniunz.dll; libraries/zlibwapi.dll; processor=x86
diff --git a/bundles/org.simantics.fmu.me.win32/build.properties b/bundles/org.simantics.fmu.me.win32/build.properties
index 150031be..7564729b 100644
--- a/bundles/org.simantics.fmu.me.win32/build.properties
+++ b/bundles/org.simantics.fmu.me.win32/build.properties
@@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
                .,\
                libraries/
diff --git a/bundles/org.simantics.fmu.me.win32/pom.xml b/bundles/org.simantics.fmu.me.win32/pom.xml
new file mode 100644
index 00000000..e1cecb8e
--- /dev/null
+++ b/bundles/org.simantics.fmu.me.win32/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.simantics</groupId>
+	<artifactId>org.simantics.fmu.me.win32</artifactId>
+	<version>1.1.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+
+	<parent>
+		<groupId>org.simantics</groupId>
+		<artifactId>org.simantics.sysdyn.root.bundles</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho.version}</version>
+				<configuration>
+					<environments>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86</arch>
+						</environment>
+					</environments>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
\ No newline at end of file
diff --git a/bundles/org.simantics.fmu.me.win64/.classpath b/bundles/org.simantics.fmu.me.win64/.classpath
index b862a296..bdaeff6b 100644
--- a/bundles/org.simantics.fmu.me.win64/.classpath
+++ b/bundles/org.simantics.fmu.me.win64/.classpath
@@ -2,6 +2,4 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/bundles/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF b/bundles/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF
index 37df58ee..bfa0ab4e 100644
--- a/bundles/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF
+++ b/bundles/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Bundle-Name: Win64 binaries for FMI model exchange
 Bundle-SymbolicName: org.simantics.fmu.me.win64
 Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: Semantum Oy
+Fragment-Host: org.simantics.fmu;bundle-version="1.1.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
- org.simantics.utils;bundle-version="1.1.0"
-Eclipse-PlatformFilter: (& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86_64))
+Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86_64))
+Bundle-NativeCode: libraries/FMUSimulator.dll; libraries/libexpat.dll; libraries/miniunz.dll; libraries/zlibwapi.dll; processor=x86_64
diff --git a/bundles/org.simantics.fmu.me.win64/build.properties b/bundles/org.simantics.fmu.me.win64/build.properties
index 150031be..7564729b 100644
--- a/bundles/org.simantics.fmu.me.win64/build.properties
+++ b/bundles/org.simantics.fmu.me.win64/build.properties
@@ -1,5 +1,3 @@
-source.. = src/
-output.. = bin/
 bin.includes = META-INF/,\
                .,\
                libraries/
diff --git a/bundles/org.simantics.fmu.me.win64/pom.xml b/bundles/org.simantics.fmu.me.win64/pom.xml
new file mode 100644
index 00000000..9681597c
--- /dev/null
+++ b/bundles/org.simantics.fmu.me.win64/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.simantics</groupId>
+	<artifactId>org.simantics.fmu.me.win64</artifactId>
+	<version>1.1.0-SNAPSHOT</version>
+	<packaging>eclipse-plugin</packaging>
+
+	<parent>
+		<groupId>org.simantics</groupId>
+		<artifactId>org.simantics.sysdyn.root.bundles</artifactId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.eclipse.tycho</groupId>
+				<artifactId>target-platform-configuration</artifactId>
+				<version>${tycho.version}</version>
+				<configuration>
+					<environments>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86_64</arch>
+						</environment>
+					</environments>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+
+</project>
\ No newline at end of file
diff --git a/features/org.simantics.sysdyn.build.feature/buckminster.properties b/features/org.simantics.sysdyn.build.feature/buckminster.properties
index f310dee4..d8c588f4 100644
--- a/features/org.simantics.sysdyn.build.feature/buckminster.properties
+++ b/features/org.simantics.sysdyn.build.feature/buckminster.properties
@@ -1,9 +1,6 @@
-#buckminster.output.root=c:/simantics-build/site
-#buckminster.temp.root=c:/simantics-build/temp
-
 # How .qualifier in versions should be replaced
-qualifier.replacement.*=generator:lastRevision
-generator.lastRevision.format=r{0,number,000000}
+qualifier.replacement.*=generator:buildTimestamp
+generator.buildTimestamp.format='v'yyyyMMdd-HHmmss
 
 # Pack200 compression
 #site.pack200=true
diff --git a/features/org.simantics.sysdyn.feature/feature.xml b/features/org.simantics.sysdyn.feature/feature.xml
index dbe2c387..40a0f5e6 100644
--- a/features/org.simantics.sysdyn.feature/feature.xml
+++ b/features/org.simantics.sysdyn.feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.simantics.sysdyn"
       label="Simantics System Dynamics Feature"
-      version="1.9.1.qualifier"
+      version="1.10.0.qualifier"
       provider-name="VTT Technical Research Centre of Finland">
 
    <description>
diff --git a/features/org.simantics.sysdyn.internal.feature/build.properties b/features/org.simantics.sysdyn.internal.feature/build.properties
index 6ec1948b..02cbdc37 100644
--- a/features/org.simantics.sysdyn.internal.feature/build.properties
+++ b/features/org.simantics.sysdyn.internal.feature/build.properties
@@ -12,5 +12,5 @@
 bin.includes = feature.xml
 root=rootfiles/
 
-root.win32.win32.x86.folder.jre=jre/win32.x86
-root.win32.win32.x86_64.folder.jre=jre/win32.x86_64
\ No newline at end of file
+#root.win32.win32.x86.folder.jre=jre/win32.x86
+#root.win32.win32.x86_64.folder.jre=jre/win32.x86_64
\ No newline at end of file
diff --git a/features/org.simantics.sysdyn.internal.feature/feature.xml b/features/org.simantics.sysdyn.internal.feature/feature.xml
index 60192611..7bc8c1e9 100644
--- a/features/org.simantics.sysdyn.internal.feature/feature.xml
+++ b/features/org.simantics.sysdyn.internal.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.simantics.sysdyn.internal"
       label="Simantics System Dynamics Internal Solver Feature"
-      version="1.9.1.qualifier"
+      version="1.10.0.qualifier"
       provider-name="VTT Technical Research Centre of Finland">
 
    <description>
@@ -10,11 +10,11 @@
    </description>
 
    <copyright>
-      Copyright (c) 2007, 2016 Association for Decentralized Information
-Management in Industry THTH ry.&lt;br/&gt;
-All rights reserved. This program and the accompanying materials
-are made available under the terms of the Eclipse Public License
-v1.0 which accompanies this distribution, and is available at
+      Copyright (c) 2007, 2016 Association for Decentralized Information
+Management in Industry THTH ry.&lt;br/&gt;
+All rights reserved. This program and the accompanying materials
+are made available under the terms of the Eclipse Public License
+v1.0 which accompanies this distribution, and is available at
 &lt;a href=&quot;http://www.eclipse.org/legal/epl-v10.html&quot;&gt;http://www.eclipse.org/legal/epl-v10.html&lt;/a&gt;
    </copyright>
 
diff --git a/features/org.simantics.sysdyn.internal.p2.feature/feature.xml b/features/org.simantics.sysdyn.internal.p2.feature/feature.xml
index fc94bb5e..dccf2b59 100644
--- a/features/org.simantics.sysdyn.internal.p2.feature/feature.xml
+++ b/features/org.simantics.sysdyn.internal.p2.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.simantics.sysdyn.internal.p2"
       label="Simantics System Dynamics with Internal Solver"
-      version="1.9.1.qualifier"
+      version="1.10.0.qualifier"
       provider-name="Semantum Oy">
 
    <description>
@@ -117,20 +117,20 @@ v1.0 which accompanies this distribution, and is available at
    <plugin
          id="org.simantics.fmu.me.win32"
          os="win32"
-         ws="win32"
          arch="x86"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="0.0.0"
+         fragment="true"/>
 
    <plugin
          id="org.simantics.fmu.me.win64"
          os="win32"
-         ws="win32"
          arch="x86_64"
          download-size="0"
          install-size="0"
-         version="0.0.0"/>
+         version="0.0.0"
+         fragment="true"/>
 
    <plugin
          id="org.simantics.fileimport"
diff --git a/features/org.simantics.sysdyn.product.site.feature/buckminster.properties b/features/org.simantics.sysdyn.product.site.feature/buckminster.properties
index f310dee4..d8c588f4 100644
--- a/features/org.simantics.sysdyn.product.site.feature/buckminster.properties
+++ b/features/org.simantics.sysdyn.product.site.feature/buckminster.properties
@@ -1,9 +1,6 @@
-#buckminster.output.root=c:/simantics-build/site
-#buckminster.temp.root=c:/simantics-build/temp
-
 # How .qualifier in versions should be replaced
-qualifier.replacement.*=generator:lastRevision
-generator.lastRevision.format=r{0,number,000000}
+qualifier.replacement.*=generator:buildTimestamp
+generator.buildTimestamp.format='v'yyyyMMdd-HHmmss
 
 # Pack200 compression
 #site.pack200=true
diff --git a/features/org.simantics.sysdyn.product.site.feature/feature.xml b/features/org.simantics.sysdyn.product.site.feature/feature.xml
index fb5d7847..95b25100 100644
--- a/features/org.simantics.sysdyn.product.site.feature/feature.xml
+++ b/features/org.simantics.sysdyn.product.site.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.simantics.sysdyn.product.site"
       label="Sysdyn Product Site"
-      version="1.9.1.qualifier"
+      version="1.10.0.qualifier"
       provider-name="VTT Technical Research Centre of Finland">
 
    <description>
diff --git a/features/pom.xml b/features/pom.xml
index 0663ecf6..e433ffe1 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -29,7 +29,8 @@
               <configuration>
                 <excludes>
                   <!-- ID of the non-source bundle(s) to exclude from the generated source feature -->
-                  <plugin id="com.famfamfam.silk"/>
+                  <!--
+				  <plugin id="com.famfamfam.silk"/>
                   <plugin id="javax.vecmath"/>
                   <plugin id="org.apache.batik"/>
                   <plugin id="org.apache.poi"/>
@@ -74,8 +75,21 @@
                   <feature id="org.eclipse.emf.ecore"/>
                   <feature id="org.eclipse.epp.mpc"/>
                   <feature id="org.eclipse.equinox.p2.discovery.feature"/>
-                  <feature id="org.eclipse.equinox.executable"/>
-                </excludes>
+                  -->
+                  <plugin id="org.simantics.fileimport"/>
+                  <plugin id="org.simantics.fmu.me.win32"/>
+                  <plugin id="org.simantics.fmu.me.win64"/>
+                  <plugin id="org.simantics.sysdyn.product"/>
+				  
+				  <feature id="org.eclipse.equinox.executable"/>
+				  <feature id="org.simantics.eclipsec.launcher"/>
+				  <feature id="org.simantics.help"/>
+				  <feature id="org.simantics.issues.feature"/>
+				  <feature id="org.simantics.issues.ui.feature"/>
+				  <feature id="org.simantics.modeling"/>
+				  <feature id="org.simantics.workbench"/>
+				  
+				</excludes>
               </configuration>
             </execution>
           </executions>
@@ -98,11 +112,11 @@
     </build>
     
     <modules>
-        <module>org.simantics.sysdyn.build.feature</module>
-        <module>org.simantics.sysdyn.feature</module>
+        <!--<module>org.simantics.sysdyn.build.feature</module>-->
+        <!--<module>org.simantics.sysdyn.feature</module>-->
         <module>org.simantics.sysdyn.internal.feature</module>
         <module>org.simantics.sysdyn.internal.p2.feature</module>
-        <module>org.simantics.sysdyn.product.site.feature</module>
-        <module>org.simantics.sysdyn.updatesite.feature</module>
+        <!--<module>org.simantics.sysdyn.product.site.feature</module>-->
+        <!--<module>org.simantics.sysdyn.updatesite.feature</module>-->
     </modules>
 </project>
diff --git a/releng/org.simantics.sysdyn.repository/category.xml b/releng/org.simantics.sysdyn.repository/category.xml
index cc0eee3c..69e35ac0 100644
--- a/releng/org.simantics.sysdyn.repository/category.xml
+++ b/releng/org.simantics.sysdyn.repository/category.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <site>
-   <feature url="features/org.simantics.sysdyn_1.25.0.jar" id="org.simantics.sysdyn" version="1.25.0">
+   <feature id="org.simantics.sysdyn.internal.p2">
       <category name="org.simantics.sysdyn"/>
    </feature>
    <category-def name="org.simantics.sysdyn" label="Simantics System Dynamics">
diff --git a/releng/org.simantics.sysdyn.repository/pom.xml b/releng/org.simantics.sysdyn.repository/pom.xml
index 297de8ef..9d54b1fa 100644
--- a/releng/org.simantics.sysdyn.repository/pom.xml
+++ b/releng/org.simantics.sysdyn.repository/pom.xml
@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.simantics.sysdyn.repository</artifactId>
-	<version>1.25.0-SNAPSHOT</version>
+	<version>1.10.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 
 	<parent>
diff --git a/tests/org.simantics.sysdyn.tests/META-INF/MANIFEST.MF b/tests/org.simantics.sysdyn.tests/META-INF/MANIFEST.MF
index ff6e3bc5..b9069e23 100644
--- a/tests/org.simantics.sysdyn.tests/META-INF/MANIFEST.MF
+++ b/tests/org.simantics.sysdyn.tests/META-INF/MANIFEST.MF
@@ -6,7 +6,8 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Activator: org.simantics.sysdyn.tests.Activator
 Require-Bundle: org.simantics.modelica;bundle-version="1.0.0",
  org.junit;bundle-version="4.8.2",
- org.simantics.db.testing;bundle-version="1.0.0"
+ org.simantics.db.testing;bundle-version="1.0.0",
+ org.simantics.fmu;bundle-version="1.1.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: org.osgi.framework
diff --git a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/CallFMUBeforeInitializationTests.java b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/CallFMUBeforeInitializationTests.java
index c3974d9e..67b0f523 100644
--- a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/CallFMUBeforeInitializationTests.java
+++ b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/CallFMUBeforeInitializationTests.java
@@ -1,11 +1,12 @@
 package org.simantics.sysdyn.tests.fmi;
 
 import static org.junit.Assert.fail;
-import junit.framework.Assert;
 
 import org.junit.Test;
-import org.simantics.modelica.fmi.FMUControlJNI;
-import org.simantics.modelica.fmi.FMUJNIException;
+import org.simantics.fmu.FMUControlJNI;
+import org.simantics.fmu.FMUJNIException;
+
+import org.junit.Assert;
 
 /**
  * Tests calls to fmu control before model has been loaded or initialized.
diff --git a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUBooleanTest.java b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUBooleanTest.java
index 1ba94231..4c5d4057 100644
--- a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUBooleanTest.java
+++ b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUBooleanTest.java
@@ -3,11 +3,10 @@ package org.simantics.sysdyn.tests.fmi;
 import java.util.Arrays;
 import java.util.List;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
-import org.simantics.modelica.fmi.FMUControlJNI;
-import org.simantics.modelica.fmi.FMUJNIException;
+import org.simantics.fmu.FMUControlJNI;
+import org.simantics.fmu.FMUJNIException;
 
 /**
  * Tests that a boolean value can be changed, erroneous values and variables are detected
diff --git a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUIntegerTest.java b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUIntegerTest.java
index 70bad9f1..9b581fa1 100644
--- a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUIntegerTest.java
+++ b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUIntegerTest.java
@@ -3,11 +3,10 @@ package org.simantics.sysdyn.tests.fmi;
 import java.util.Arrays;
 import java.util.List;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
-import org.simantics.modelica.fmi.FMUControlJNI;
-import org.simantics.modelica.fmi.FMUJNIException;
+import org.simantics.fmu.FMUControlJNI;
+import org.simantics.fmu.FMUJNIException;
 
 /**
  * Tests that an integer value can be changed and the change is propagated 
diff --git a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMURealTest.java b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMURealTest.java
index f996b7a9..54c67f68 100644
--- a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMURealTest.java
+++ b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMURealTest.java
@@ -3,11 +3,10 @@ package org.simantics.sysdyn.tests.fmi;
 import java.util.Arrays;
 import java.util.List;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
-import org.simantics.modelica.fmi.FMUControlJNI;
-import org.simantics.modelica.fmi.FMUJNIException;
+import org.simantics.fmu.FMUControlJNI;
+import org.simantics.fmu.FMUJNIException;
 
 /**
  * Tests that a real value can be changed and the change is propagated 
diff --git a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUResultFilterTest.java b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUResultFilterTest.java
index 0cbb9f5a..05a521f4 100644
--- a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUResultFilterTest.java
+++ b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/FMUResultFilterTest.java
@@ -3,11 +3,10 @@ package org.simantics.sysdyn.tests.fmi;
 import java.util.Arrays;
 import java.util.List;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
-import org.simantics.modelica.fmi.FMUControlJNI;
-import org.simantics.modelica.fmi.FMUJNIException;
+import org.simantics.fmu.FMUControlJNI;
+import org.simantics.fmu.FMUJNIException;
 
 
 /**
diff --git a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/LoadFMUFileFailTests.java b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/LoadFMUFileFailTests.java
index c6f9b6c0..77155791 100644
--- a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/LoadFMUFileFailTests.java
+++ b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/LoadFMUFileFailTests.java
@@ -1,11 +1,10 @@
 package org.simantics.sysdyn.tests.fmi;
 
-import static org.junit.Assert.*;
-
+import static org.junit.Assert.fail;
 
 import org.junit.Test;
-import org.simantics.modelica.fmi.FMUControlJNI;
-import org.simantics.modelica.fmi.FMUJNIException;
+import org.simantics.fmu.FMUControlJNI;
+import org.simantics.fmu.FMUJNIException;
 
 /**
  * Test possible error situations in loading an fmu file to the control
diff --git a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/MultipleSimultaneousFMUSimulationsTest.java b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/MultipleSimultaneousFMUSimulationsTest.java
index 6a4d7aff..7a883ef4 100644
--- a/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/MultipleSimultaneousFMUSimulationsTest.java
+++ b/tests/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/fmi/MultipleSimultaneousFMUSimulationsTest.java
@@ -3,11 +3,10 @@ package org.simantics.sysdyn.tests.fmi;
 import java.util.Arrays;
 import java.util.List;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
-import org.simantics.modelica.fmi.FMUControlJNI;
-import org.simantics.modelica.fmi.FMUJNIException;
+import org.simantics.fmu.FMUControlJNI;
+import org.simantics.fmu.FMUJNIException;
 
 public class MultipleSimultaneousFMUSimulationsTest {
 
-- 
2.47.1