Updated and fixed dependencies:

- All java library dependency: fixed to java 1.8
- Added Automatic-Module-Name to be compatible with java 1.9
- Added all sources explicitly to build.properties
- removed .util packages generated by previous versions of Viatra

5 files changed, 26 insertions, 25 deletions

diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/META-INF/MANIFEST.MF b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/META-INF/MANIFEST.MF
index fd78a6ae..87ff7abc 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/META-INF/MANIFEST.MF
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dlsreasoner.alloy.reasoner/META-INF/MANIFEST.MF
@@ -3,24 +3,24 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: hu.bme.mit.inf.dlsreasoner.alloy.reasoner;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Bundle-ClassPath: lib/alloy4.2_2015-02-22.jar,

- .
+Bundle-ClassPath: lib/alloy4.2_2015-02-22.jar,
+  .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: hu.bme.mit.inf.dlsreasoner.alloy.reasoner,

- hu.bme.mit.inf.dlsreasoner.alloy.reasoner.builder,

- hu.bme.mit.inf.dlsreasoner.alloy.reasoner.queries,

- hu.bme.mit.inf.dlsreasoner.alloy.reasoner.queries.util
-Require-Bundle: com.google.guava,

- org.eclipse.xtend.lib,

- org.eclipse.xtext.xbase.lib,

- org.eclipse.core.runtime,

- org.eclipse.emf.ecore;visibility:=reexport,

- hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0";visibility:=reexport,

- hu.bme.mit.inf.dslreasoner.alloy.language;bundle-version="1.0.0",

- org.eclipse.viatra.query.runtime.base.itc;bundle-version="1.3.0",

- hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",

- org.eclipse.viatra.query.runtime;bundle-version="2.0.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Bundle-ActivationPolicy: lazy
+Export-Package: hu.bme.mit.inf.dlsreasoner.alloy.reasoner,
+  hu.bme.mit.inf.dlsreasoner.alloy.reasoner.builder,
+  hu.bme.mit.inf.dlsreasoner.alloy.reasoner.queries
+Require-Bundle: com.google.guava,
+  org.eclipse.xtend.lib,
+  org.eclipse.xtext.xbase.lib,
+  org.eclipse.core.runtime,
+  org.eclipse.emf.ecore;visibility:=reexport,
+  hu.bme.mit.inf.dslreasoner.logic.model;bundle-version="1.0.0";visibility:=reexport,
+  hu.bme.mit.inf.dslreasoner.alloy.language;bundle-version="1.0.0",
+  org.eclipse.viatra.query.runtime.base.itc;bundle-version="1.3.0",
+  hu.bme.mit.inf.dslreasoner.ecore2logic;bundle-version="1.0.0",
+  org.eclipse.viatra.query.runtime;bundle-version="2.0.0"
 Import-Package: org.apache.log4j;version="1.2.15"
+Automatic-Module-Name: hu.bme.mit.inf.dlsreasoner.alloy.reasoner
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language.ui/.classpath b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language.ui/.classpath
index f5ffadb8..5f53de99 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language.ui/.classpath
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language.ui/.classpath
@@ -3,7 +3,7 @@
         <classpathentry kind="src" path="src"/>

         <classpathentry kind="src" path="src-gen"/>

         <classpathentry kind="src" path="xtend-gen"/>

-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>

         <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

         <classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language.ui/.settings/org.eclipse.jdt.core.prefs b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language.ui/.settings/org.eclipse.jdt.core.prefs
index 11f6e462..295926d9 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,7 @@
 eclipse.preferences.version=1

 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7

-org.eclipse.jdt.core.compiler.compliance=1.7

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8

+org.eclipse.jdt.core.compiler.compliance=1.8

 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.7

+org.eclipse.jdt.core.compiler.source=1.8

diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/.classpath b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/.classpath
index 5c568755..3b84b5ce 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/.classpath
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/.classpath
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

+        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

         <classpathentry kind="src" path="src"/>

         <classpathentry kind="src" path="src-gen"/>

         <classpathentry kind="src" path="xtend-gen"/>

-        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

         <classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/META-INF/MANIFEST.MF b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/META-INF/MANIFEST.MF
index 1de8b744..0b5013dd 100644
--- a/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/META-INF/MANIFEST.MF
+++ b/Solvers/Alloy-Solver/hu.bme.mit.inf.dslreasoner.alloy.language/META-INF/MANIFEST.MF
@@ -21,7 +21,7 @@ Require-Bundle: org.eclipse.xtext;visibility:=reexport,
  org.objectweb.asm;bundle-version="[5.0.1,6.0.0)";resolution:=optional,

  org.eclipse.equinox.common;bundle-version="3.7.0"

 Import-Package: org.apache.log4j

-Bundle-RequiredExecutionEnvironment: JavaSE-1.7

+Bundle-RequiredExecutionEnvironment: JavaSE-1.8

 Export-Package: hu.bme.mit.inf.dslreasoner,

  hu.bme.mit.inf.dslreasoner.services,

  hu.bme.mit.inf.dslreasoner.alloyLanguage,

@@ -34,4 +34,5 @@ Export-Package: hu.bme.mit.inf.dslreasoner,
  hu.bme.mit.inf.dslreasoner.scoping,

  hu.bme.mit.inf.dslreasoner.generator,

  hu.bme.mit.inf.dslreasoner.formatting

+Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.alloy.language