From 48b83f69fba64f2846651ad470269cc01ad7fd65 Mon Sep 17 00:00:00 2001
From: Kristóf Marussy <marussy@mit.bme.hu>
Date: Thu, 26 Nov 2020 13:55:37 +0100
Subject: Fix Z3 dependency

---
 Solvers/SMT-Solver/com.microsoft.z3/.classpath                 | 10 +++++-----
 Solvers/SMT-Solver/com.microsoft.z3/META-INF/MANIFEST.MF       |  2 +-
 .../META-INF/MANIFEST.MF                                       |  7 +++----
 3 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'Solvers')

diff --git a/Solvers/SMT-Solver/com.microsoft.z3/.classpath b/Solvers/SMT-Solver/com.microsoft.z3/.classpath
index ffdc022a..759c2ecb 100644
--- a/Solvers/SMT-Solver/com.microsoft.z3/.classpath
+++ b/Solvers/SMT-Solver/com.microsoft.z3/.classpath
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="com.microsoft.z3.jar">
-		<attributes>
-			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="com.microsoft.z3/lib"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
 		<attributes>
 			<attribute name="module" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" kind="lib" path="com.microsoft.z3.jar">
+		<attributes>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="com.microsoft.z3/lib"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/Solvers/SMT-Solver/com.microsoft.z3/META-INF/MANIFEST.MF b/Solvers/SMT-Solver/com.microsoft.z3/META-INF/MANIFEST.MF
index d91e3272..9685b5ff 100644
--- a/Solvers/SMT-Solver/com.microsoft.z3/META-INF/MANIFEST.MF
+++ b/Solvers/SMT-Solver/com.microsoft.z3/META-INF/MANIFEST.MF
@@ -4,7 +4,6 @@ Bundle-Name: Z3
 Bundle-SymbolicName: com.microsoft.z3
 Bundle-Version: 4.8.8.qualifier
 Bundle-Vendor: Microsoft
-Automatic-Module-Name: com.microsoft.z3
 Bundle-ClassPath: com.microsoft.z3.jar
 Bundle-NativeCode: lib/libz3.so;
  lib/libz3java.so;
@@ -20,3 +19,4 @@ Bundle-NativeCode: lib/libz3.so;
  processor=x86_64
 Export-Package: com.microsoft.z3,
  com.microsoft.z3.enumerations
+Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/META-INF/MANIFEST.MF b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/META-INF/MANIFEST.MF
index ec1557e8..f5eb5514 100644
--- a/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/META-INF/MANIFEST.MF
+++ b/Solvers/VIATRA-Solver/hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatra/META-INF/MANIFEST.MF
@@ -25,9 +25,8 @@ Require-Bundle: hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0",
  org.eclipse.xtext;bundle-version="2.10.0",
  org.eclipse.viatra.transformation.runtime.emf;bundle-version="2.0.0",
  org.eclipse.xtext.xbase;bundle-version="2.10.0",
- com.microsoft.z3;bundle-version="4.8.5",
  hu.bme.mit.inf.dslreasoner.ilp.cbc;bundle-version="1.0.0",
- org.eclipse.viatra.query.runtime.rete;bundle-version="2.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+ org.eclipse.viatra.query.runtime.rete;bundle-version="2.0.0",
+ com.microsoft.z3
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: org.apache.log4j
-Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.viatrasolver.logic2viatraquery
-- 
cgit v1.2.3-70-g09d2