diff --git a/kactors/org.integratedmodelling.kactors.ui.tests/META-INF/MANIFEST.MF b/kactors/org.integratedmodelling.kactors.ui.tests/META-INF/MANIFEST.MF index f61cb1420..ac383237d 100644 --- a/kactors/org.integratedmodelling.kactors.ui.tests/META-INF/MANIFEST.MF +++ b/kactors/org.integratedmodelling.kactors.ui.tests/META-INF/MANIFEST.MF @@ -14,6 +14,7 @@ Require-Bundle: org.integratedmodelling.kactors.ui, org.eclipse.core.runtime, org.eclipse.xtext.ui.testing, org.eclipse.ui.workbench;resolution:=optional, - org.eclipse.xtext.junit4 + org.eclipse.xtext.junit4, + org.eclipse.xtext.xbase.ui.testing Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.integratedmodelling.kactors.ui.tests;x-internal=true diff --git a/kactors/org.integratedmodelling.kactors/model/generated/Kactors.genmodel b/kactors/org.integratedmodelling.kactors/model/generated/Kactors.genmodel index 5d02ec5e1..9b383faf7 100644 --- a/kactors/org.integratedmodelling.kactors/model/generated/Kactors.genmodel +++ b/kactors/org.integratedmodelling.kactors/model/generated/Kactors.genmodel @@ -1,9 +1,9 @@ + complianceLevel="11.0" copyrightFields="false" runtimeVersion="2.29"> diff --git a/kactors/pom.xml b/kactors/pom.xml index f068c1505..850b87f11 100644 --- a/kactors/pom.xml +++ b/kactors/pom.xml @@ -22,7 +22,7 @@ org.integratedmodelling.kactors org.integratedmodelling.kactors.ide org.integratedmodelling.kactors.ui - org.integratedmodelling.kactors.web + org.integratedmodelling.kactors.target org.integratedmodelling.kactors.feature org.integratedmodelling.kactors.repository @@ -262,8 +262,8 @@ false - org.eclipse.tycho @@ -332,4 +332,4 @@ - \ No newline at end of file + diff --git a/kdl/org.integratedmodelling.kdl.ui.tests/META-INF/MANIFEST.MF b/kdl/org.integratedmodelling.kdl.ui.tests/META-INF/MANIFEST.MF index 70c5f9e62..062076298 100644 --- a/kdl/org.integratedmodelling.kdl.ui.tests/META-INF/MANIFEST.MF +++ b/kdl/org.integratedmodelling.kdl.ui.tests/META-INF/MANIFEST.MF @@ -13,7 +13,8 @@ Require-Bundle: org.integratedmodelling.kdl.ui, org.eclipse.xtext.xbase.junit, org.eclipse.core.runtime, org.eclipse.ui.workbench;resolution:=optional, - org.eclipse.xtext.ui.testing + org.eclipse.xtext.ui.testing, + org.eclipse.xtext.xbase.ui.testing Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.integratedmodelling.kdl.ui.tests;x-internal=true Import-Package: org.hamcrest.core, diff --git a/kdl/org.integratedmodelling.kdl/pom.xml b/kdl/org.integratedmodelling.kdl/pom.xml index fe315e41f..042594155 100644 --- a/kdl/org.integratedmodelling.kdl/pom.xml +++ b/kdl/org.integratedmodelling.kdl/pom.xml @@ -100,7 +100,7 @@ org.eclipse.xtend xtend-maven-plugin - + org.apache.maven.plugins maven-clean-plugin @@ -232,7 +232,7 @@ org.eclipse.platform org.eclipse.equinox.common - 3.14.100 + 3.16.200 diff --git a/kdl/pom.xml b/kdl/pom.xml index 08690a27d..bc73f2035 100644 --- a/kdl/pom.xml +++ b/kdl/pom.xml @@ -132,7 +132,7 @@ org.eclipse.platform org.eclipse.equinox.common - 3.13.0 + 3.16.200 @@ -250,7 +250,7 @@ - diff --git a/kim/org.integratedmodelling.kim.ui.tests/META-INF/MANIFEST.MF b/kim/org.integratedmodelling.kim.ui.tests/META-INF/MANIFEST.MF index 2decb8c0a..29bcdb698 100644 --- a/kim/org.integratedmodelling.kim.ui.tests/META-INF/MANIFEST.MF +++ b/kim/org.integratedmodelling.kim.ui.tests/META-INF/MANIFEST.MF @@ -1,26 +1,27 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: org.integratedmodelling.kim.ui.tests -Bundle-Vendor: org.integratedmodelling -Bundle-Version: 0.11.0.qualifier -Bundle-SymbolicName: org.integratedmodelling.kim.ui.tests; singleton:=true -Bundle-ActivationPolicy: lazy -Require-Bundle: org.integratedmodelling.kim.ui, - org.junit;bundle-version="4.7.0", - org.eclipse.xtext.junit4, - org.eclipse.xtext.xbase.junit, - org.eclipse.core.runtime, - org.eclipse.ui.workbench;resolution:=optional, - org.eclipse.xtext.testing, - org.eclipse.xtext.xbase.testing, - org.eclipse.xtext.ui.testing -Bundle-RequiredExecutionEnvironment: JavaSE-11 -Export-Package: org.integratedmodelling.kim.ui.tests;x-internal=true -Import-Package: org.hamcrest.core, - org.junit;version="4.5.0", - org.junit.runners.model;version="4.5.0", - org.junit.runner;version="4.5.0", - org.junit.runners;version="4.5.0", - org.junit.runner.manipulation;version="4.5.0", - org.junit.runner.notification;version="4.5.0" -Automatic-Module-Name: org.integratedmodelling.kim.ui.tests +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: org.integratedmodelling.kim.ui.tests +Bundle-Vendor: org.integratedmodelling +Bundle-Version: 0.11.0.qualifier +Bundle-SymbolicName: org.integratedmodelling.kim.ui.tests; singleton:=true +Bundle-ActivationPolicy: lazy +Require-Bundle: org.integratedmodelling.kim.ui, + org.junit;bundle-version="4.7.0", + org.eclipse.xtext.junit4, + org.eclipse.xtext.xbase.junit, + org.eclipse.core.runtime, + org.eclipse.ui.workbench;resolution:=optional, + org.eclipse.xtext.testing, + org.eclipse.xtext.xbase.testing, + org.eclipse.xtext.ui.testing, + org.eclipse.xtext.xbase.ui.testing +Bundle-RequiredExecutionEnvironment: JavaSE-11 +Export-Package: org.integratedmodelling.kim.ui.tests;x-internal=true +Import-Package: org.hamcrest.core, + org.junit;version="4.5.0", + org.junit.runners.model;version="4.5.0", + org.junit.runner;version="4.5.0", + org.junit.runners;version="4.5.0", + org.junit.runner.manipulation;version="4.5.0", + org.junit.runner.notification;version="4.5.0" +Automatic-Module-Name: org.integratedmodelling.kim.ui.tests diff --git a/kim/org.integratedmodelling.kim.web/WebRoot/xtext-resources/generated/mode-k.js b/kim/org.integratedmodelling.kim.web/WebRoot/xtext-resources/generated/mode-k.js index 5b134d9a5..a916ba20e 100644 --- a/kim/org.integratedmodelling.kim.web/WebRoot/xtext-resources/generated/mode-k.js +++ b/kim/org.integratedmodelling.kim.web/WebRoot/xtext-resources/generated/mode-k.js @@ -1,35 +1,35 @@ -define(["ace/lib/oop", "ace/mode/text", "ace/mode/text_highlight_rules"], function(oop, mText, mTextHighlightRules) { - var HighlightRules = function() { - var keywords = "AD|BC|CE|E|abstract|acceleration|according|adjacent|affects|agent|aggregated|all|amount|and|angle|any|applies|area|as|at|attribute|authority|averaged|away|between|bond|boolean|by|causant|caused|causing|change|changed|charge|children|class|classified|classifies|column|compresent|confers|configuration|contained|container|containing|contains|context|cooccurrent|core|count|covering|creates|decreases|define|defines|definition|deliberative|deniable|describes|discretized|discretizes|disjoint|distance|do|domain|down|duration|during|e|each|emerges|energy|entropy|equals|event|exactly|exclusive|extends|extent|false|finally|follows|for|from|functional|has|identified|identity|if|implies|imports|in|inclusive|increases|inherent|inherits|initialization|instantiation|integrate|interactive|into|is|l|language|learn|least|length|level|linking|links|lookup|magnitude|marks|mass|match|metadata|minus|model|monetary|money|more|most|move|named|namespace|no|not|nothing|number|object|observability|observe|observed|observing|occurrence|of|on|only|optional|or|ordering|otherwise|outside|over|parameters|per|percentage|plus|presence|pressure|priority|private|probability|process|project|proportion|purpose|quality|quantity|rate|ratio|reactive|realm|related|relationship|required|requires|rescaling|resistance|resistivity|resolve|role|root|row|scenario|set|structural|subjective|summed|targeting|temperature|termination|text|then|thing|times|to|total|transition|true|type|uncertainty|unknown|unless|uses|using|value|velocity|version|viscosity|void|volume|weight|where|with|within|without|worldview"; - this.$rules = { - "start": [ - {token: "comment", regex: "\\/\\/.*$"}, - {token: "comment", regex: "\\/\\*", next : "comment"}, - {token: "string", regex: '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'}, - {token: "string", regex: "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"}, - {token: "constant.numeric", regex: "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"}, - {token: "lparen", regex: "[({]"}, - {token: "rparen", regex: "[)}]"}, - {token: "keyword", regex: "\\b(?:" + keywords + ")\\b"} - ], - "comment": [ - {token: "comment", regex: ".*?\\*\\/", next : "start"}, - {token: "comment", regex: ".+"} - ] - }; - }; - oop.inherits(HighlightRules, mTextHighlightRules.TextHighlightRules); - - var Mode = function() { - this.HighlightRules = HighlightRules; - }; - oop.inherits(Mode, mText.Mode); - Mode.prototype.$id = "xtext/k"; - Mode.prototype.getCompletions = function(state, session, pos, prefix) { - return []; - } - - return { - Mode: Mode - }; -}); +define(["ace/lib/oop", "ace/mode/text", "ace/mode/text_highlight_rules"], function(oop, mText, mTextHighlightRules) { + var HighlightRules = function() { + var keywords = "AD|BC|CE|E|abstract|acceleration|according|adjacent|affects|agent|aggregated|all|amount|and|angle|any|applies|area|as|at|attribute|authority|averaged|away|between|bond|boolean|by|causant|caused|causing|change|changed|charge|children|class|classified|classifies|column|compresent|confers|configuration|contained|container|containing|contains|context|cooccurrent|core|count|covering|creates|decreases|define|defines|definition|deliberative|deniable|describes|discretized|discretizes|disjoint|distance|do|domain|down|duration|during|e|each|emerges|energy|entropy|equals|event|exactly|exclusive|extends|extent|false|finally|follows|for|from|functional|has|identified|identity|if|implies|imports|in|inclusive|increases|inherent|inherits|initialization|instantiation|integrate|interactive|into|is|l|language|learn|least|length|level|linking|links|lookup|magnitude|marks|mass|match|metadata|minus|model|monetary|money|more|most|move|named|namespace|no|not|nothing|number|object|observability|observe|observed|observing|occurrence|of|on|only|optional|or|ordering|otherwise|outside|over|parameters|per|percentage|plus|presence|pressure|priority|private|probability|process|project|proportion|purpose|quality|quantity|rate|ratio|reactive|realm|related|relationship|required|requires|rescaling|resistance|resistivity|resolve|role|root|row|scenario|set|structural|subjective|summed|targeting|temperature|termination|text|then|thing|times|to|total|transition|true|type|uncertainty|unknown|unless|uses|using|value|velocity|version|viscosity|void|volume|weight|where|with|within|without|worldview"; + this.$rules = { + "start": [ + {token: "comment", regex: "\\/\\/.*$"}, + {token: "comment", regex: "\\/\\*", next : "comment"}, + {token: "string", regex: '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'}, + {token: "string", regex: "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"}, + {token: "constant.numeric", regex: "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"}, + {token: "lparen", regex: "[({]"}, + {token: "rparen", regex: "[)}]"}, + {token: "keyword", regex: "\\b(?:" + keywords + ")\\b"} + ], + "comment": [ + {token: "comment", regex: ".*?\\*\\/", next : "start"}, + {token: "comment", regex: ".+"} + ] + }; + }; + oop.inherits(HighlightRules, mTextHighlightRules.TextHighlightRules); + + var Mode = function() { + this.HighlightRules = HighlightRules; + }; + oop.inherits(Mode, mText.Mode); + Mode.prototype.$id = "xtext/k"; + Mode.prototype.getCompletions = function(state, session, pos, prefix) { + return []; + } + + return { + Mode: Mode + }; +}); diff --git a/kim/org.integratedmodelling.kim/pom.xml b/kim/org.integratedmodelling.kim/pom.xml index 525ef7d43..289da2d86 100644 --- a/kim/org.integratedmodelling.kim/pom.xml +++ b/kim/org.integratedmodelling.kim/pom.xml @@ -216,7 +216,7 @@ org.eclipse.platform org.eclipse.equinox.common - 3.14.100 + 3.16.200 diff --git a/kim/pom.xml b/kim/pom.xml index b8a1c1486..e34f9ae4c 100644 --- a/kim/pom.xml +++ b/kim/pom.xml @@ -95,7 +95,7 @@ org.eclipse.platform org.eclipse.equinox.common - 3.13.0 + 3.16.200 diff --git a/klab.engine/pom.xml b/klab.engine/pom.xml index 6143ed393..5386cb345 100644 --- a/klab.engine/pom.xml +++ b/klab.engine/pom.xml @@ -92,7 +92,7 @@ - + @@ -305,7 +315,7 @@ - + org.hortonmachine hm-gears @@ -366,6 +376,10 @@ org.eclipse.xtext org.eclipse.xtext.xbase + + com.google.code.gson + gson + @@ -603,7 +617,7 @@ jgrapht-core 1.5.2 - + org.jgrapht @@ -874,14 +888,14 @@ commons-exec 1.2 - + org.jetbrains.kotlin kotlin-stdlib 1.9.0 - + io.minio diff --git a/pom.xml b/pom.xml index 76ca30319..0bd2c224e 100644 --- a/pom.xml +++ b/pom.xml @@ -107,8 +107,8 @@ 11 11 2.7.3 - 2.27.0 - 2.13.0 + 2.33.0 + 2.16.0 3.3.2 -XshowSettings:vm