Merge pull request #112 from Echtzeitsysteme/feature/update-cplex-2211

Updates CPLEX from 22.1.0 to 22.1.1

README.md

@@ -12,7 +12,7 @@
         * Currently, Gurobi is the default ILP solver used in GIPS because of the great performance.
     * Install [GLPK](https://www.gnu.org/software/glpk/) in the newest version (`4.6.5`) and add it to your path.
         * GLPK is an open-source ILP solver that can be used without a charge.
-    * Install [CPLEX](https://www.ibm.com/analytics/cplex-optimizer) in version `22.1.0` and activate a license for your computer (if neccessary).
+    * Install [CPLEX](https://www.ibm.com/analytics/cplex-optimizer) in version `22.1.1` and activate a license for your computer (if neccessary).
         * CPLEX is a commercial alternative to the other ILP solvers implemented in GIPS.
 * Clone this Git repository to your local machine and import it into Eclipse: *File -> Import -> General -> Existing Projects into Workspace*. Import all projects.
     * As an alternative, you can use this [PSF file](https://raw.githubusercontent.com/Echtzeitsysteme/gips/master/devProjectSet.psf) for the import.
@@ -51,7 +51,7 @@ By using this settings, you should be unable to commit unformatted code.
         * Currently, Gurobi is the default ILP solver used in GIPS because of the great performance.
     * Install [GLPK](https://www.gnu.org/software/glpk/) in the newest version (`4.6.5`) and add it to your path.
         * GLPK is an open-source ILP solver that can be used without a charge.
-    * Install [CPLEX](https://www.ibm.com/analytics/cplex-optimizer) in version `22.1.0` and activate a license for your computer (if neccessary).
+    * Install [CPLEX](https://www.ibm.com/analytics/cplex-optimizer) in version `22.1.1` and activate a license for your computer (if neccessary).
         * CPLEX is a commercial alternative to the other ILP solvers implemented in GIPS.
 * Install GIPS from the public Eclipse update site: https://echtzeitsysteme.github.io/gips-updatesite/snapshot/updatesite/
 * Launch a runtime workspace (while using a runtime Eclipse) as stated in the eMoflon::IBeX installation steps to start using GIPS.

org.emoflon.gips.core.dependencies/.classpath

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="cplex-22.1.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="gurobi-10.0.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="gurobi-javadoc-10.0.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="logicng-2.4.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="cplex-22.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="glpk-java-1.12.0.jar"/>
 	<classpathentry exported="true" kind="lib" path="glpk-java-1.12.0-javadoc.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>

org.emoflon.gips.core.dependencies/META-INF/MANIFEST.MF

@@ -8,10 +8,10 @@ Bundle-ClassPath: gurobi-10.0.1.jar,
  glpk-java-1.12.0.jar,
  glpk-java-1.12.0-javadoc.jar,
  logicng-2.4.1.jar,
- cplex-22.1.jar
+ cplex-22.1.1.jar
 Export-Package: gurobi;version="10.0.1",
- ilog.concert;version="22.1.0",
- ilog.cplex;version="22.1.0",
+ ilog.concert;version="22.1.1",
+ ilog.cplex;version="22.1.1",
  org.gnu.glpk;version="1.12.0",
  org.logicng,
  org.logicng.backbones,

org.emoflon.gips.core.dependencies/build.properties

@@ -1,7 +1,7 @@
 bin.includes = META-INF/,\
                glpk-java-1.12.0.jar,\
                glpk-java-1.12.0-javadoc.jar,\
-               cplex-22.1.jar,\
-               logicng-2.4.1.jar,\
                gurobi-10.0.1.jar,\
-               gurobi-javadoc-10.0.1.jar
+               gurobi-javadoc-10.0.1.jar,\
+               logicng-2.4.1.jar,\
+               cplex-22.1.1.jar