From fc59e13543b5c3137bfed9430786c3e7eff80431 Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Thu, 9 Nov 2023 16:41:28 +0100 Subject: [PATCH 1/9] replace javax.inject with jakarta.inject for comformance with new Eclipse 2023-09 release. change to new websocket mirror is still todo. update oomph setup keith stream, master stream still todo. --- .../klighd/CircuitDiagramSynthesis.xtend | 2 +- .../syntheses/CircuitDiagramSynthesis.xtend | 2 +- .../KiCoSelectionDiagramChainSynthesis.xtend | 2 +- ...oSelectionDiagramFlatGroupsSynthesis.xtend | 2 +- .../KiCoSelectionDiagramFlatSynthesis.xtend | 2 +- .../KiCoSelectionDiagramSynthesis.xtend | 2 +- .../kieler/kico/ui/klighd/KiCoSynthesis.xtend | 2 +- .../de.cau.cs.kieler.language.server/pom.xml | 4 ++-- oomph/kieler-semantics-developers.setup | 22 +++++++++++-------- ...ffectsEmissionReferenceCallConverter.xtend | 2 +- .../KExtGenericParamterConverter.xtend | 2 +- .../syntheses/CodePlaceHolderSynthesis.xtend | 2 +- .../syntheses/ModelChainSynthesis.xtend | 2 +- .../text/scoping/SctScopeProvider.xtend | 2 +- .../serializer/SctSyntacticSequencer.java | 2 +- .../sccharts/ui/synthesis/AdaptiveZoom.xtend | 2 +- .../hooks/LocalDeclarationsHook.xtend | 2 +- .../scg/SCGCircuitDataflowProcessor.xtend | 2 +- .../scg/klighd/SCGraphDiagramSynthesis.xtend | 2 +- .../cs/kieler/scg/klighd/SCGraphShapes.xtend | 2 +- .../scg/klighd/SCGraphsDiagramSynthesis.xtend | 2 +- .../klighd/SCGraphsDiagramSynthesisOld.xtend | 2 +- .../simulation/trace/TraceDataProvider.xtend | 2 +- 23 files changed, 36 insertions(+), 32 deletions(-) diff --git a/discontinued-plugins/de.cau.cs.kieler.circuit.klighd/src/de/cau/cs/kieler/circuit/klighd/CircuitDiagramSynthesis.xtend b/discontinued-plugins/de.cau.cs.kieler.circuit.klighd/src/de/cau/cs/kieler/circuit/klighd/CircuitDiagramSynthesis.xtend index 26bcc5d727..0cc585f046 100644 --- a/discontinued-plugins/de.cau.cs.kieler.circuit.klighd/src/de/cau/cs/kieler/circuit/klighd/CircuitDiagramSynthesis.xtend +++ b/discontinued-plugins/de.cau.cs.kieler.circuit.klighd/src/de/cau/cs/kieler/circuit/klighd/CircuitDiagramSynthesis.xtend @@ -30,7 +30,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KPortExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis -import javax.inject.Inject +import jakarta.inject.Inject import org.eclipse.elk.alg.layered.options.LayeredOptions import org.eclipse.elk.alg.layered.options.NodePlacementStrategy import org.eclipse.elk.core.options.CoreOptions diff --git a/discontinued-plugins/de.cau.cs.kieler.circuit.klighd/src/de/cau/cs/kieler/circuit/ui/syntheses/CircuitDiagramSynthesis.xtend b/discontinued-plugins/de.cau.cs.kieler.circuit.klighd/src/de/cau/cs/kieler/circuit/ui/syntheses/CircuitDiagramSynthesis.xtend index 6754ef7667..92291090f3 100644 --- a/discontinued-plugins/de.cau.cs.kieler.circuit.klighd/src/de/cau/cs/kieler/circuit/ui/syntheses/CircuitDiagramSynthesis.xtend +++ b/discontinued-plugins/de.cau.cs.kieler.circuit.klighd/src/de/cau/cs/kieler/circuit/ui/syntheses/CircuitDiagramSynthesis.xtend @@ -30,7 +30,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KPortExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis -import javax.inject.Inject +import jakarta.inject.Inject import org.eclipse.elk.alg.layered.options.LayeredOptions import org.eclipse.elk.alg.layered.options.NodePlacementStrategy import org.eclipse.elk.core.options.CoreOptions diff --git a/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramChainSynthesis.xtend b/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramChainSynthesis.xtend index 45206aeab9..142ddad82b 100644 --- a/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramChainSynthesis.xtend +++ b/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramChainSynthesis.xtend @@ -25,7 +25,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.util.KlighdProperties -import javax.inject.Inject +import jakarta.inject.Inject import org.eclipse.elk.alg.layered.p2layers.LayeringStrategy import org.eclipse.elk.alg.layered.properties.LayeredOptions import org.eclipse.elk.core.options.CoreOptions diff --git a/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramFlatGroupsSynthesis.xtend b/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramFlatGroupsSynthesis.xtend index 49b53f59d5..1d8d191c78 100644 --- a/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramFlatGroupsSynthesis.xtend +++ b/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramFlatGroupsSynthesis.xtend @@ -30,7 +30,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.util.KlighdProperties import java.util.ArrayList -import javax.inject.Inject +import jakarta.inject.Inject import org.eclipse.elk.core.options.CoreOptions import org.eclipse.elk.core.options.EdgeRouting diff --git a/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramFlatSynthesis.xtend b/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramFlatSynthesis.xtend index 1e690cb405..d0efb98a92 100644 --- a/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramFlatSynthesis.xtend +++ b/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramFlatSynthesis.xtend @@ -30,7 +30,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.util.KlighdProperties -import javax.inject.Inject +import jakarta.inject.Inject import org.eclipse.elk.core.options.CoreOptions import org.eclipse.elk.core.options.Direction import org.eclipse.elk.core.options.EdgeRouting diff --git a/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramSynthesis.xtend b/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramSynthesis.xtend index 8e83f75e59..0bf1596a38 100644 --- a/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramSynthesis.xtend +++ b/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramSynthesis.xtend @@ -31,7 +31,7 @@ import de.cau.cs.kieler.klighd.util.KlighdProperties import java.util.ArrayList import java.util.HashSet import java.util.Set -import javax.inject.Inject +import jakarta.inject.Inject import org.eclipse.elk.core.options.CoreOptions import org.eclipse.elk.core.options.Direction import org.eclipse.elk.core.options.EdgeRouting diff --git a/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSynthesis.xtend b/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSynthesis.xtend index 10e6fdd44a..dcd243bee8 100644 --- a/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSynthesis.xtend +++ b/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSynthesis.xtend @@ -32,7 +32,7 @@ import java.util.HashMap import java.util.HashSet import java.util.List import java.util.Set -import javax.inject.Inject +import jakarta.inject.Inject import static extension org.eclipse.emf.ecore.util.EcoreUtil.* diff --git a/language-server/de.cau.cs.kieler.language.server/pom.xml b/language-server/de.cau.cs.kieler.language.server/pom.xml index f7b00497f9..7215c49ce4 100644 --- a/language-server/de.cau.cs.kieler.language.server/pom.xml +++ b/language-server/de.cau.cs.kieler.language.server/pom.xml @@ -62,12 +62,12 @@ com.google.code.gson gson - 2.9.0 + 2.10.1 com.google.inject guice - 5.1.0 + 7.0.0 org.apache.logging.log4j diff --git a/oomph/kieler-semantics-developers.setup b/oomph/kieler-semantics-developers.setup index 607c4284a6..7ead093fec 100644 --- a/oomph/kieler-semantics-developers.setup +++ b/oomph/kieler-semantics-developers.setup @@ -2570,7 +2570,7 @@ name="edu.umd.cs.piccolo"/> + versionRange="[2.32.0,2.33.0)"/> + name="org.hamcrest.core" + versionRange="[1.3.0.v20230809-1000,1.3.0.v20230809-1000]"/> + + name="jakarta.servlet-api"/> + url="https://download.eclipse.org/releases/2023-09"/> + url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.29.0"/> + url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.32.0/"/> + url="https://download.eclipse.org/lsp4j/updates/releases/0.21.1"/> + url="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/websocket-mirror/10.0.15/"/> @@ -2641,7 +2645,7 @@ xsi:type="setup.p2:P2Task"> + versionRange="[2.32.0,2.33.0)"/> diff --git a/plugins/de.cau.cs.kieler.kexpressions/src/de/cau/cs/kieler/kexpressions/keffects/converter/KEffectsEmissionReferenceCallConverter.xtend b/plugins/de.cau.cs.kieler.kexpressions/src/de/cau/cs/kieler/kexpressions/keffects/converter/KEffectsEmissionReferenceCallConverter.xtend index 3a0a7ccd41..b75d85bc7e 100644 --- a/plugins/de.cau.cs.kieler.kexpressions/src/de/cau/cs/kieler/kexpressions/keffects/converter/KEffectsEmissionReferenceCallConverter.xtend +++ b/plugins/de.cau.cs.kieler.kexpressions/src/de/cau/cs/kieler/kexpressions/keffects/converter/KEffectsEmissionReferenceCallConverter.xtend @@ -22,7 +22,7 @@ import de.cau.cs.kieler.kexpressions.ValuedObjectReference import de.cau.cs.kieler.kexpressions.extensions.KExpressionsValuedObjectExtensions import de.cau.cs.kieler.kexpressions.keffects.Emission import de.cau.cs.kieler.kexpressions.keffects.KEffectsFactory -import javax.inject.Inject +import jakarta.inject.Inject import org.eclipse.xtext.RuleCall import org.eclipse.xtext.linking.LinkingScopeProviderBinding import org.eclipse.xtext.linking.impl.LinkingHelper diff --git a/plugins/de.cau.cs.kieler.kexpressions/src/de/cau/cs/kieler/kexpressions/kext/converter/KExtGenericParamterConverter.xtend b/plugins/de.cau.cs.kieler.kexpressions/src/de/cau/cs/kieler/kexpressions/kext/converter/KExtGenericParamterConverter.xtend index bdd38d8352..236623154d 100644 --- a/plugins/de.cau.cs.kieler.kexpressions/src/de/cau/cs/kieler/kexpressions/kext/converter/KExtGenericParamterConverter.xtend +++ b/plugins/de.cau.cs.kieler.kexpressions/src/de/cau/cs/kieler/kexpressions/kext/converter/KExtGenericParamterConverter.xtend @@ -17,7 +17,7 @@ import de.cau.cs.kieler.kexpressions.GenericTypeReference import de.cau.cs.kieler.kexpressions.KExpressionsFactory import de.cau.cs.kieler.kexpressions.KExpressionsPackage import de.cau.cs.kieler.kexpressions.ValuedObject -import javax.inject.Inject +import jakarta.inject.Inject import org.eclipse.xtext.CrossReference import org.eclipse.xtext.linking.LinkingScopeProviderBinding import org.eclipse.xtext.linking.impl.LinkingHelper diff --git a/plugins/de.cau.cs.kieler.kicool.ui/src/de/cau/cs/kieler/kicool/ui/klighd/syntheses/CodePlaceHolderSynthesis.xtend b/plugins/de.cau.cs.kieler.kicool.ui/src/de/cau/cs/kieler/kicool/ui/klighd/syntheses/CodePlaceHolderSynthesis.xtend index 1ad7683b0b..b3fef48edb 100644 --- a/plugins/de.cau.cs.kieler.kicool.ui/src/de/cau/cs/kieler/kicool/ui/klighd/syntheses/CodePlaceHolderSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.kicool.ui/src/de/cau/cs/kieler/kicool/ui/klighd/syntheses/CodePlaceHolderSynthesis.xtend @@ -24,7 +24,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KContainerRenderingExtensio import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis -import javax.inject.Inject +import jakarta.inject.Inject import static extension de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses.* diff --git a/plugins/de.cau.cs.kieler.kicool.ui/src/de/cau/cs/kieler/kicool/ui/klighd/syntheses/ModelChainSynthesis.xtend b/plugins/de.cau.cs.kieler.kicool.ui/src/de/cau/cs/kieler/kicool/ui/klighd/syntheses/ModelChainSynthesis.xtend index eb0f41fc71..f098b1991c 100644 --- a/plugins/de.cau.cs.kieler.kicool.ui/src/de/cau/cs/kieler/kicool/ui/klighd/syntheses/ModelChainSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.kicool.ui/src/de/cau/cs/kieler/kicool/ui/klighd/syntheses/ModelChainSynthesis.xtend @@ -35,7 +35,7 @@ import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis import de.cau.cs.kieler.klighd.ui.view.DiagramView import de.cau.cs.kieler.klighd.util.KlighdProperties import de.cau.cs.kieler.klighd.util.KlighdSynthesisProperties -import javax.inject.Inject +import jakarta.inject.Inject import org.eclipse.elk.alg.layered.options.LayeredOptions import org.eclipse.elk.core.math.ElkPadding import org.eclipse.elk.core.options.CoreOptions diff --git a/plugins/de.cau.cs.kieler.sccharts.legacy/src/de/cau/cs/kieler/sccharts/legacy/text/scoping/SctScopeProvider.xtend b/plugins/de.cau.cs.kieler.sccharts.legacy/src/de/cau/cs/kieler/sccharts/legacy/text/scoping/SctScopeProvider.xtend index ab3a1d597a..96f6195483 100644 --- a/plugins/de.cau.cs.kieler.sccharts.legacy/src/de/cau/cs/kieler/sccharts/legacy/text/scoping/SctScopeProvider.xtend +++ b/plugins/de.cau.cs.kieler.sccharts.legacy/src/de/cau/cs/kieler/sccharts/legacy/text/scoping/SctScopeProvider.xtend @@ -26,7 +26,7 @@ import de.cau.cs.kieler.sccharts.legacy.sccharts.State import de.cau.cs.kieler.sccharts.legacy.sccharts.Transition import java.util.Collections import java.util.HashSet -import javax.inject.Inject +import jakarta.inject.Inject import org.eclipse.emf.ecore.EObject import org.eclipse.emf.ecore.EReference import org.eclipse.xtext.naming.QualifiedName diff --git a/plugins/de.cau.cs.kieler.sccharts.legacy/src/de/cau/cs/kieler/sccharts/legacy/text/serializer/SctSyntacticSequencer.java b/plugins/de.cau.cs.kieler.sccharts.legacy/src/de/cau/cs/kieler/sccharts/legacy/text/serializer/SctSyntacticSequencer.java index 13c3d025c3..19c927f090 100644 --- a/plugins/de.cau.cs.kieler.sccharts.legacy/src/de/cau/cs/kieler/sccharts/legacy/text/serializer/SctSyntacticSequencer.java +++ b/plugins/de.cau.cs.kieler.sccharts.legacy/src/de/cau/cs/kieler/sccharts/legacy/text/serializer/SctSyntacticSequencer.java @@ -2,7 +2,7 @@ import java.util.List; -import javax.inject.Inject; +import jakarta.inject.Inject; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.nodemodel.INode; diff --git a/plugins/de.cau.cs.kieler.sccharts.ui/src/de/cau/cs/kieler/sccharts/ui/synthesis/AdaptiveZoom.xtend b/plugins/de.cau.cs.kieler.sccharts.ui/src/de/cau/cs/kieler/sccharts/ui/synthesis/AdaptiveZoom.xtend index 8e1ec4d19a..7841e8b3c5 100644 --- a/plugins/de.cau.cs.kieler.sccharts.ui/src/de/cau/cs/kieler/sccharts/ui/synthesis/AdaptiveZoom.xtend +++ b/plugins/de.cau.cs.kieler.sccharts.ui/src/de/cau/cs/kieler/sccharts/ui/synthesis/AdaptiveZoom.xtend @@ -23,7 +23,7 @@ import de.cau.cs.kieler.sccharts.Action import de.cau.cs.kieler.sccharts.Region import de.cau.cs.kieler.sccharts.State import de.cau.cs.kieler.sccharts.Transition -import javax.inject.Inject +import jakarta.inject.Inject import static extension de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses.* import de.cau.cs.kieler.klighd.kgraph.KLabel diff --git a/plugins/de.cau.cs.kieler.sccharts.ui/src/de/cau/cs/kieler/sccharts/ui/synthesis/hooks/LocalDeclarationsHook.xtend b/plugins/de.cau.cs.kieler.sccharts.ui/src/de/cau/cs/kieler/sccharts/ui/synthesis/hooks/LocalDeclarationsHook.xtend index 3501d4b78f..b87dd32738 100644 --- a/plugins/de.cau.cs.kieler.sccharts.ui/src/de/cau/cs/kieler/sccharts/ui/synthesis/hooks/LocalDeclarationsHook.xtend +++ b/plugins/de.cau.cs.kieler.sccharts.ui/src/de/cau/cs/kieler/sccharts/ui/synthesis/hooks/LocalDeclarationsHook.xtend @@ -20,7 +20,7 @@ import de.cau.cs.kieler.sccharts.State import de.cau.cs.kieler.sccharts.ui.synthesis.GeneralSynthesisOptions import de.cau.cs.kieler.sccharts.ui.synthesis.styles.ControlflowRegionStyles import de.cau.cs.kieler.sccharts.ui.synthesis.styles.StateStyles -import javax.inject.Inject +import jakarta.inject.Inject /** * @author kolja diff --git a/plugins/de.cau.cs.kieler.sccharts/src/de/cau/cs/kieler/sccharts/processors/scg/SCGCircuitDataflowProcessor.xtend b/plugins/de.cau.cs.kieler.sccharts/src/de/cau/cs/kieler/sccharts/processors/scg/SCGCircuitDataflowProcessor.xtend index 6b0c214a99..bce19f0472 100644 --- a/plugins/de.cau.cs.kieler.sccharts/src/de/cau/cs/kieler/sccharts/processors/scg/SCGCircuitDataflowProcessor.xtend +++ b/plugins/de.cau.cs.kieler.sccharts/src/de/cau/cs/kieler/sccharts/processors/scg/SCGCircuitDataflowProcessor.xtend @@ -38,7 +38,7 @@ import de.cau.cs.kieler.sccharts.extensions.SCChartsStateExtensions import de.cau.cs.kieler.scg.SCGraphs import de.cau.cs.kieler.scg.processors.ssa.SSACoreExtensions import java.util.HashMap -import javax.inject.Inject +import jakarta.inject.Inject import static extension org.eclipse.emf.ecore.util.EcoreUtil.* diff --git a/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphDiagramSynthesis.xtend b/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphDiagramSynthesis.xtend index 158be4c6c9..8accc8bbde 100644 --- a/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphDiagramSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphDiagramSynthesis.xtend @@ -68,7 +68,7 @@ import de.cau.cs.kieler.scg.processors.priority.PriorityAuxiliaryData import de.cau.cs.kieler.scg.processors.priority.PriorityProcessor import java.util.LinkedList import java.util.Set -import javax.inject.Inject +import jakarta.inject.Inject import org.eclipse.elk.alg.layered.options.LayeredOptions import org.eclipse.elk.alg.layered.options.LayeringStrategy import org.eclipse.elk.alg.layered.options.NodePlacementStrategy diff --git a/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphShapes.xtend b/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphShapes.xtend index 19f76bb5ae..e08d67ec81 100644 --- a/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphShapes.xtend +++ b/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphShapes.xtend @@ -20,7 +20,7 @@ import de.cau.cs.kieler.klighd.krendering.KRenderingFactory import de.cau.cs.kieler.klighd.krendering.extensions.KColorExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions -import javax.inject.Inject +import jakarta.inject.Inject import de.cau.cs.kieler.klighd.kgraph.util.KGraphUtil import de.cau.cs.kieler.klighd.krendering.extensions.KContainerRenderingExtensions diff --git a/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphsDiagramSynthesis.xtend b/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphsDiagramSynthesis.xtend index f3d5912a09..c03aadc816 100644 --- a/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphsDiagramSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphsDiagramSynthesis.xtend @@ -19,7 +19,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis import de.cau.cs.kieler.scg.SCGraphs -import javax.inject.Inject +import jakarta.inject.Inject /** * SCCGraph KlighD synthesis class. It contains all method mandatory to handle the visualization of diff --git a/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphsDiagramSynthesisOld.xtend b/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphsDiagramSynthesisOld.xtend index c2f80e1719..d52b44730c 100644 --- a/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphsDiagramSynthesisOld.xtend +++ b/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphsDiagramSynthesisOld.xtend @@ -96,7 +96,7 @@ import java.util.LinkedList import java.util.List import java.util.Map import java.util.Set -import javax.inject.Inject +import jakarta.inject.Inject import org.eclipse.elk.alg.layered.options.LayerConstraint import org.eclipse.elk.alg.layered.options.LayeredOptions import org.eclipse.elk.alg.layered.options.LayeringStrategy diff --git a/plugins/de.cau.cs.kieler.simulation/src/de/cau/cs/kieler/simulation/trace/TraceDataProvider.xtend b/plugins/de.cau.cs.kieler.simulation/src/de/cau/cs/kieler/simulation/trace/TraceDataProvider.xtend index a8e9c3e653..ac3efde11c 100644 --- a/plugins/de.cau.cs.kieler.simulation/src/de/cau/cs/kieler/simulation/trace/TraceDataProvider.xtend +++ b/plugins/de.cau.cs.kieler.simulation/src/de/cau/cs/kieler/simulation/trace/TraceDataProvider.xtend @@ -28,7 +28,7 @@ import de.cau.cs.kieler.simulation.DataPoolEntry import de.cau.cs.kieler.simulation.trace.ktrace.Tick import de.cau.cs.kieler.simulation.trace.ktrace.Trace import de.cau.cs.kieler.simulation.trace.ktrace.TraceFile -import javax.inject.Inject +import jakarta.inject.Inject import org.eclipse.xtend.lib.annotations.Accessors import static com.google.common.base.Preconditions.* From fd864d5c1d47893479fd8748fa5ee39a94ea5bed Mon Sep 17 00:00:00 2001 From: Alexander Schulz-Rosengarten Date: Thu, 7 Dec 2023 15:59:51 +0100 Subject: [PATCH 2/9] Switched to google Inject imports. This circumvents the javax to jakarta renaming --- .../converter/KEffectsEmissionReferenceCallConverter.xtend | 2 +- .../kext/converter/KExtGenericParamterConverter.xtend | 2 +- .../kicool/ui/klighd/syntheses/CodePlaceHolderSynthesis.xtend | 2 +- .../kieler/kicool/ui/klighd/syntheses/ModelChainSynthesis.xtend | 2 +- .../kieler/sccharts/legacy/text/scoping/SctScopeProvider.xtend | 2 +- .../sccharts/legacy/text/serializer/SctSyntacticSequencer.java | 2 +- .../de/cau/cs/kieler/sccharts/ui/synthesis/AdaptiveZoom.xtend | 2 +- .../sccharts/ui/synthesis/hooks/LocalDeclarationsHook.xtend | 2 +- .../sccharts/processors/scg/SCGCircuitDataflowProcessor.xtend | 2 +- .../de/cau/cs/kieler/scg/klighd/SCGraphDiagramSynthesis.xtend | 2 +- .../src/de/cau/cs/kieler/scg/klighd/SCGraphShapes.xtend | 2 +- .../de/cau/cs/kieler/scg/klighd/SCGraphsDiagramSynthesis.xtend | 2 +- .../cau/cs/kieler/scg/klighd/SCGraphsDiagramSynthesisOld.xtend | 2 +- .../de/cau/cs/kieler/simulation/trace/TraceDataProvider.xtend | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/plugins/de.cau.cs.kieler.kexpressions/src/de/cau/cs/kieler/kexpressions/keffects/converter/KEffectsEmissionReferenceCallConverter.xtend b/plugins/de.cau.cs.kieler.kexpressions/src/de/cau/cs/kieler/kexpressions/keffects/converter/KEffectsEmissionReferenceCallConverter.xtend index b75d85bc7e..844b58bf60 100644 --- a/plugins/de.cau.cs.kieler.kexpressions/src/de/cau/cs/kieler/kexpressions/keffects/converter/KEffectsEmissionReferenceCallConverter.xtend +++ b/plugins/de.cau.cs.kieler.kexpressions/src/de/cau/cs/kieler/kexpressions/keffects/converter/KEffectsEmissionReferenceCallConverter.xtend @@ -22,7 +22,7 @@ import de.cau.cs.kieler.kexpressions.ValuedObjectReference import de.cau.cs.kieler.kexpressions.extensions.KExpressionsValuedObjectExtensions import de.cau.cs.kieler.kexpressions.keffects.Emission import de.cau.cs.kieler.kexpressions.keffects.KEffectsFactory -import jakarta.inject.Inject +import com.google.inject.Inject import org.eclipse.xtext.RuleCall import org.eclipse.xtext.linking.LinkingScopeProviderBinding import org.eclipse.xtext.linking.impl.LinkingHelper diff --git a/plugins/de.cau.cs.kieler.kexpressions/src/de/cau/cs/kieler/kexpressions/kext/converter/KExtGenericParamterConverter.xtend b/plugins/de.cau.cs.kieler.kexpressions/src/de/cau/cs/kieler/kexpressions/kext/converter/KExtGenericParamterConverter.xtend index 236623154d..842fa0b8eb 100644 --- a/plugins/de.cau.cs.kieler.kexpressions/src/de/cau/cs/kieler/kexpressions/kext/converter/KExtGenericParamterConverter.xtend +++ b/plugins/de.cau.cs.kieler.kexpressions/src/de/cau/cs/kieler/kexpressions/kext/converter/KExtGenericParamterConverter.xtend @@ -17,7 +17,7 @@ import de.cau.cs.kieler.kexpressions.GenericTypeReference import de.cau.cs.kieler.kexpressions.KExpressionsFactory import de.cau.cs.kieler.kexpressions.KExpressionsPackage import de.cau.cs.kieler.kexpressions.ValuedObject -import jakarta.inject.Inject +import com.google.inject.Inject import org.eclipse.xtext.CrossReference import org.eclipse.xtext.linking.LinkingScopeProviderBinding import org.eclipse.xtext.linking.impl.LinkingHelper diff --git a/plugins/de.cau.cs.kieler.kicool.ui/src/de/cau/cs/kieler/kicool/ui/klighd/syntheses/CodePlaceHolderSynthesis.xtend b/plugins/de.cau.cs.kieler.kicool.ui/src/de/cau/cs/kieler/kicool/ui/klighd/syntheses/CodePlaceHolderSynthesis.xtend index b3fef48edb..dbb8bcd1ee 100644 --- a/plugins/de.cau.cs.kieler.kicool.ui/src/de/cau/cs/kieler/kicool/ui/klighd/syntheses/CodePlaceHolderSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.kicool.ui/src/de/cau/cs/kieler/kicool/ui/klighd/syntheses/CodePlaceHolderSynthesis.xtend @@ -24,7 +24,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KContainerRenderingExtensio import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis -import jakarta.inject.Inject +import com.google.inject.Inject import static extension de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses.* diff --git a/plugins/de.cau.cs.kieler.kicool.ui/src/de/cau/cs/kieler/kicool/ui/klighd/syntheses/ModelChainSynthesis.xtend b/plugins/de.cau.cs.kieler.kicool.ui/src/de/cau/cs/kieler/kicool/ui/klighd/syntheses/ModelChainSynthesis.xtend index f098b1991c..85937be584 100644 --- a/plugins/de.cau.cs.kieler.kicool.ui/src/de/cau/cs/kieler/kicool/ui/klighd/syntheses/ModelChainSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.kicool.ui/src/de/cau/cs/kieler/kicool/ui/klighd/syntheses/ModelChainSynthesis.xtend @@ -35,7 +35,7 @@ import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis import de.cau.cs.kieler.klighd.ui.view.DiagramView import de.cau.cs.kieler.klighd.util.KlighdProperties import de.cau.cs.kieler.klighd.util.KlighdSynthesisProperties -import jakarta.inject.Inject +import com.google.inject.Inject import org.eclipse.elk.alg.layered.options.LayeredOptions import org.eclipse.elk.core.math.ElkPadding import org.eclipse.elk.core.options.CoreOptions diff --git a/plugins/de.cau.cs.kieler.sccharts.legacy/src/de/cau/cs/kieler/sccharts/legacy/text/scoping/SctScopeProvider.xtend b/plugins/de.cau.cs.kieler.sccharts.legacy/src/de/cau/cs/kieler/sccharts/legacy/text/scoping/SctScopeProvider.xtend index 96f6195483..3facbe4723 100644 --- a/plugins/de.cau.cs.kieler.sccharts.legacy/src/de/cau/cs/kieler/sccharts/legacy/text/scoping/SctScopeProvider.xtend +++ b/plugins/de.cau.cs.kieler.sccharts.legacy/src/de/cau/cs/kieler/sccharts/legacy/text/scoping/SctScopeProvider.xtend @@ -26,7 +26,7 @@ import de.cau.cs.kieler.sccharts.legacy.sccharts.State import de.cau.cs.kieler.sccharts.legacy.sccharts.Transition import java.util.Collections import java.util.HashSet -import jakarta.inject.Inject +import com.google.inject.Inject import org.eclipse.emf.ecore.EObject import org.eclipse.emf.ecore.EReference import org.eclipse.xtext.naming.QualifiedName diff --git a/plugins/de.cau.cs.kieler.sccharts.legacy/src/de/cau/cs/kieler/sccharts/legacy/text/serializer/SctSyntacticSequencer.java b/plugins/de.cau.cs.kieler.sccharts.legacy/src/de/cau/cs/kieler/sccharts/legacy/text/serializer/SctSyntacticSequencer.java index 19c927f090..6c0cd72d66 100644 --- a/plugins/de.cau.cs.kieler.sccharts.legacy/src/de/cau/cs/kieler/sccharts/legacy/text/serializer/SctSyntacticSequencer.java +++ b/plugins/de.cau.cs.kieler.sccharts.legacy/src/de/cau/cs/kieler/sccharts/legacy/text/serializer/SctSyntacticSequencer.java @@ -2,7 +2,7 @@ import java.util.List; -import jakarta.inject.Inject; +import com.google.inject.Inject; import org.eclipse.emf.ecore.EObject; import org.eclipse.xtext.nodemodel.INode; diff --git a/plugins/de.cau.cs.kieler.sccharts.ui/src/de/cau/cs/kieler/sccharts/ui/synthesis/AdaptiveZoom.xtend b/plugins/de.cau.cs.kieler.sccharts.ui/src/de/cau/cs/kieler/sccharts/ui/synthesis/AdaptiveZoom.xtend index 7841e8b3c5..fb694c058c 100644 --- a/plugins/de.cau.cs.kieler.sccharts.ui/src/de/cau/cs/kieler/sccharts/ui/synthesis/AdaptiveZoom.xtend +++ b/plugins/de.cau.cs.kieler.sccharts.ui/src/de/cau/cs/kieler/sccharts/ui/synthesis/AdaptiveZoom.xtend @@ -23,7 +23,7 @@ import de.cau.cs.kieler.sccharts.Action import de.cau.cs.kieler.sccharts.Region import de.cau.cs.kieler.sccharts.State import de.cau.cs.kieler.sccharts.Transition -import jakarta.inject.Inject +import com.google.inject.Inject import static extension de.cau.cs.kieler.klighd.syntheses.DiagramSyntheses.* import de.cau.cs.kieler.klighd.kgraph.KLabel diff --git a/plugins/de.cau.cs.kieler.sccharts.ui/src/de/cau/cs/kieler/sccharts/ui/synthesis/hooks/LocalDeclarationsHook.xtend b/plugins/de.cau.cs.kieler.sccharts.ui/src/de/cau/cs/kieler/sccharts/ui/synthesis/hooks/LocalDeclarationsHook.xtend index b87dd32738..f095ac9955 100644 --- a/plugins/de.cau.cs.kieler.sccharts.ui/src/de/cau/cs/kieler/sccharts/ui/synthesis/hooks/LocalDeclarationsHook.xtend +++ b/plugins/de.cau.cs.kieler.sccharts.ui/src/de/cau/cs/kieler/sccharts/ui/synthesis/hooks/LocalDeclarationsHook.xtend @@ -20,7 +20,7 @@ import de.cau.cs.kieler.sccharts.State import de.cau.cs.kieler.sccharts.ui.synthesis.GeneralSynthesisOptions import de.cau.cs.kieler.sccharts.ui.synthesis.styles.ControlflowRegionStyles import de.cau.cs.kieler.sccharts.ui.synthesis.styles.StateStyles -import jakarta.inject.Inject +import com.google.inject.Inject /** * @author kolja diff --git a/plugins/de.cau.cs.kieler.sccharts/src/de/cau/cs/kieler/sccharts/processors/scg/SCGCircuitDataflowProcessor.xtend b/plugins/de.cau.cs.kieler.sccharts/src/de/cau/cs/kieler/sccharts/processors/scg/SCGCircuitDataflowProcessor.xtend index bce19f0472..062e3583d6 100644 --- a/plugins/de.cau.cs.kieler.sccharts/src/de/cau/cs/kieler/sccharts/processors/scg/SCGCircuitDataflowProcessor.xtend +++ b/plugins/de.cau.cs.kieler.sccharts/src/de/cau/cs/kieler/sccharts/processors/scg/SCGCircuitDataflowProcessor.xtend @@ -38,7 +38,7 @@ import de.cau.cs.kieler.sccharts.extensions.SCChartsStateExtensions import de.cau.cs.kieler.scg.SCGraphs import de.cau.cs.kieler.scg.processors.ssa.SSACoreExtensions import java.util.HashMap -import jakarta.inject.Inject +import com.google.inject.Inject import static extension org.eclipse.emf.ecore.util.EcoreUtil.* diff --git a/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphDiagramSynthesis.xtend b/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphDiagramSynthesis.xtend index 8accc8bbde..470f7bff97 100644 --- a/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphDiagramSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphDiagramSynthesis.xtend @@ -68,7 +68,7 @@ import de.cau.cs.kieler.scg.processors.priority.PriorityAuxiliaryData import de.cau.cs.kieler.scg.processors.priority.PriorityProcessor import java.util.LinkedList import java.util.Set -import jakarta.inject.Inject +import com.google.inject.Inject import org.eclipse.elk.alg.layered.options.LayeredOptions import org.eclipse.elk.alg.layered.options.LayeringStrategy import org.eclipse.elk.alg.layered.options.NodePlacementStrategy diff --git a/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphShapes.xtend b/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphShapes.xtend index e08d67ec81..6b208f5ed2 100644 --- a/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphShapes.xtend +++ b/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphShapes.xtend @@ -20,7 +20,7 @@ import de.cau.cs.kieler.klighd.krendering.KRenderingFactory import de.cau.cs.kieler.klighd.krendering.extensions.KColorExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions -import jakarta.inject.Inject +import com.google.inject.Inject import de.cau.cs.kieler.klighd.kgraph.util.KGraphUtil import de.cau.cs.kieler.klighd.krendering.extensions.KContainerRenderingExtensions diff --git a/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphsDiagramSynthesis.xtend b/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphsDiagramSynthesis.xtend index c03aadc816..49c1e40dd9 100644 --- a/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphsDiagramSynthesis.xtend +++ b/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphsDiagramSynthesis.xtend @@ -19,7 +19,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis import de.cau.cs.kieler.scg.SCGraphs -import jakarta.inject.Inject +import com.google.inject.Inject /** * SCCGraph KlighD synthesis class. It contains all method mandatory to handle the visualization of diff --git a/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphsDiagramSynthesisOld.xtend b/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphsDiagramSynthesisOld.xtend index d52b44730c..f4f22e470f 100644 --- a/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphsDiagramSynthesisOld.xtend +++ b/plugins/de.cau.cs.kieler.scg.klighd/src/de/cau/cs/kieler/scg/klighd/SCGraphsDiagramSynthesisOld.xtend @@ -96,7 +96,7 @@ import java.util.LinkedList import java.util.List import java.util.Map import java.util.Set -import jakarta.inject.Inject +import com.google.inject.Inject import org.eclipse.elk.alg.layered.options.LayerConstraint import org.eclipse.elk.alg.layered.options.LayeredOptions import org.eclipse.elk.alg.layered.options.LayeringStrategy diff --git a/plugins/de.cau.cs.kieler.simulation/src/de/cau/cs/kieler/simulation/trace/TraceDataProvider.xtend b/plugins/de.cau.cs.kieler.simulation/src/de/cau/cs/kieler/simulation/trace/TraceDataProvider.xtend index ac3efde11c..f2e80bcf90 100644 --- a/plugins/de.cau.cs.kieler.simulation/src/de/cau/cs/kieler/simulation/trace/TraceDataProvider.xtend +++ b/plugins/de.cau.cs.kieler.simulation/src/de/cau/cs/kieler/simulation/trace/TraceDataProvider.xtend @@ -28,7 +28,7 @@ import de.cau.cs.kieler.simulation.DataPoolEntry import de.cau.cs.kieler.simulation.trace.ktrace.Tick import de.cau.cs.kieler.simulation.trace.ktrace.Trace import de.cau.cs.kieler.simulation.trace.ktrace.TraceFile -import jakarta.inject.Inject +import com.google.inject.Inject import org.eclipse.xtend.lib.annotations.Accessors import static com.google.common.base.Preconditions.* From ec9ce55c5d512b42dbc1efc544d189349ed47c09 Mon Sep 17 00:00:00 2001 From: Alexander Schulz-Rosengarten Date: Thu, 7 Dec 2023 17:14:52 +0100 Subject: [PATCH 3/9] build: Adjusted target platform to latest release 2023-12 --- ....cs.kieler.semantics.targetplatform.target | 13 +++++--- oomph/kieler-semantics-developers.setup | 33 +++++++++++-------- .../META-INF/MANIFEST.MF | 4 +-- .../META-INF/MANIFEST.MF | 3 +- 4 files changed, 31 insertions(+), 22 deletions(-) diff --git a/build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target b/build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target index 0078130fd8..c53cc8cad4 100644 --- a/build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target +++ b/build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target @@ -12,22 +12,27 @@ + + + + + - - + + - + - + diff --git a/oomph/kieler-semantics-developers.setup b/oomph/kieler-semantics-developers.setup index 7ead093fec..2d3dfb1c9e 100644 --- a/oomph/kieler-semantics-developers.setup +++ b/oomph/kieler-semantics-developers.setup @@ -463,7 +463,7 @@ versionRange="2.7.0"/> + versionRange="[2.33.0,2.34.0)"/> + name="org.freemarker.freemarker"/> + name="org.freemarker.freemarker.source"/> @@ -530,13 +530,18 @@ + url="https://download.eclipse.org/releases/2023-12"/> + url="https://download.eclipse.org/releases/2023-06"> + + + url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0"/> + url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/"/> + + versionRange="[2.33.0,2.34.0)"/> @@ -2570,7 +2575,7 @@ name="edu.umd.cs.piccolo"/> + versionRange="[2.33.0,2.34.0)"/> + url="https://download.eclipse.org/releases/2023-12"/> + url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.30.0"/> + url="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.33.0/"/> + url="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/websocket-mirror/10.0.15/"/> @@ -2645,7 +2650,7 @@ xsi:type="setup.p2:P2Task"> + versionRange="[2.33.0,2.34.0)"/> diff --git a/plugins/de.cau.cs.kieler.kicool/META-INF/MANIFEST.MF b/plugins/de.cau.cs.kieler.kicool/META-INF/MANIFEST.MF index 0c0fa35b13..ed9174b4f6 100644 --- a/plugins/de.cau.cs.kieler.kicool/META-INF/MANIFEST.MF +++ b/plugins/de.cau.cs.kieler.kicool/META-INF/MANIFEST.MF @@ -15,11 +15,11 @@ Require-Bundle: org.eclipse.emf.ecore;visibility:=reexport, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.eclipse.xtend.lib;bundle-version="2.14.0", de.cau.cs.kieler.kexpressions;visibility:=reexport, - org.freemarker;bundle-version="2.3.22", de.cau.cs.kieler.core;visibility:=reexport, org.eclipse.core.runtime, org.eclipse.core.resources, - com.google.gson;bundle-version="2.8.2" + com.google.gson;bundle-version="2.8.2", + org.freemarker.freemarker;bundle-version="2.3.32" Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: de.cau.cs.kieler.kicool, de.cau.cs.kieler.kicool.classes, diff --git a/test/de.cau.cs.kieler.test.common/META-INF/MANIFEST.MF b/test/de.cau.cs.kieler.test.common/META-INF/MANIFEST.MF index c2edb5662d..c245a59496 100644 --- a/test/de.cau.cs.kieler.test.common/META-INF/MANIFEST.MF +++ b/test/de.cau.cs.kieler.test.common/META-INF/MANIFEST.MF @@ -15,8 +15,7 @@ Require-Bundle: org.junit, org.eclipse.xtext;visibility:=reexport, org.eclipse.jgit;bundle-version="4.6.1", de.cau.cs.kieler.simulation, - de.cau.cs.kieler.kicool, - javax.annotation;bundle-version="1.2.0";visibility:=reexport + de.cau.cs.kieler.kicool Export-Package: de.cau.cs.kieler.test.common.repository, de.cau.cs.kieler.test.common.runners, de.cau.cs.kieler.test.common.simulation From fa3cd64c26776342b0038189d0c46caa81845556 Mon Sep 17 00:00:00 2001 From: Alexander Schulz-Rosengarten Date: Tue, 6 Feb 2024 14:23:37 +0100 Subject: [PATCH 4/9] sccharts.ui: Suppress exception in SCCharts debugging code --- .../ui/debug/breakpoints/BreakpointUtility.xtend | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/de.cau.cs.kieler.sccharts.ui/src/de/cau/cs/kieler/sccharts/ui/debug/breakpoints/BreakpointUtility.xtend b/plugins/de.cau.cs.kieler.sccharts.ui/src/de/cau/cs/kieler/sccharts/ui/debug/breakpoints/BreakpointUtility.xtend index d9afe96ef6..6ab34cfcde 100644 --- a/plugins/de.cau.cs.kieler.sccharts.ui/src/de/cau/cs/kieler/sccharts/ui/debug/breakpoints/BreakpointUtility.xtend +++ b/plugins/de.cau.cs.kieler.sccharts.ui/src/de/cau/cs/kieler/sccharts/ui/debug/breakpoints/BreakpointUtility.xtend @@ -27,6 +27,7 @@ import org.eclipse.emf.ecore.EObject import org.eclipse.xtext.nodemodel.util.NodeModelUtils import org.eclipse.emf.ecore.resource.Resource import org.eclipse.core.resources.IResource +import org.eclipse.debug.core.DebugException /** * Wrapper for legacy functionality from SCCharts Debug Plugin by lgr. @@ -92,8 +93,13 @@ class BreakpointUtility { if (dirtyBreakpointList) { breakpointLines.clear() - val bps = DebugPlugin.getDefault().getBreakpointManager() - .getBreakpoints(SCChartsDebugModelPresentation.ID) + val bps = newArrayList + try { + val bpm = DebugPlugin.getDefault().getBreakpointManager() + bps.addAll(bpm.getBreakpoints(SCChartsDebugModelPresentation.ID)) + } catch (DebugException de) { + // FIXME fails silently + } // Add each breakpoint and its line number to the list of all breakpoints. for (IBreakpoint b : bps) { try { From 73adea728b8c5f78145c3c466a66b88b3cf3cf84 Mon Sep 17 00:00:00 2001 From: Alexander Schulz-Rosengarten Date: Tue, 6 Feb 2024 14:25:13 +0100 Subject: [PATCH 5/9] kivis.ui: Added delay when opening external browser to give server time for starting --- .../cau/cs/kieler/kivis/ui/views/KiVisView.xtend | 14 +++++++++++--- .../simulation/ide/server/SimulationServer.xtend | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/plugins/de.cau.cs.kieler.kivis.ui/src/de/cau/cs/kieler/kivis/ui/views/KiVisView.xtend b/plugins/de.cau.cs.kieler.kivis.ui/src/de/cau/cs/kieler/kivis/ui/views/KiVisView.xtend index 32d18ab168..c7575226fc 100644 --- a/plugins/de.cau.cs.kieler.kivis.ui/src/de/cau/cs/kieler/kivis/ui/views/KiVisView.xtend +++ b/plugins/de.cau.cs.kieler.kivis.ui/src/de/cau/cs/kieler/kivis/ui/views/KiVisView.xtend @@ -55,6 +55,7 @@ import org.eclipse.ui.internal.browser.WebBrowserUtil import org.eclipse.ui.part.ViewPart import org.eclipse.ui.progress.UIJob import org.eclipse.xtend.lib.annotations.Accessors +import org.eclipse.core.runtime.jobs.Job /** * The KiVis View. @@ -173,9 +174,16 @@ class KiVisView extends ViewPart implements ISimulationListener { getViewSite().getActionBars().getToolBarManager() => [ add(new Action("Open in external Browser", IAction.AS_PUSH_BUTTON) { override run() { - SimulationServer.start - val browserSupport = WebBrowserUIPlugin.getInstance().getWorkbench().getBrowserSupport() - browserSupport.externalBrowser?.openURL(new URL("http://localhost:" + SimulationServer.PORT + "/visualization")) + SimulationServer.start() + new Job("Open browser") { + override protected run(IProgressMonitor monitor) { + val browserSupport = WebBrowserUIPlugin.getInstance().getWorkbench().getBrowserSupport() + browserSupport.externalBrowser?.openURL( + new URL("http://localhost:" + SimulationServer.PORT + "/visualization") + ) + return Status.OK_STATUS + } + }.schedule(500) // Start with delay to give server time to start } }) add(new Separator) diff --git a/plugins/de.cau.cs.kieler.simulation.ide/src/de/cau/cs/kieler/simulation/ide/server/SimulationServer.xtend b/plugins/de.cau.cs.kieler.simulation.ide/src/de/cau/cs/kieler/simulation/ide/server/SimulationServer.xtend index 2745a9fd04..ca9fd358a1 100644 --- a/plugins/de.cau.cs.kieler.simulation.ide/src/de/cau/cs/kieler/simulation/ide/server/SimulationServer.xtend +++ b/plugins/de.cau.cs.kieler.simulation.ide/src/de/cau/cs/kieler/simulation/ide/server/SimulationServer.xtend @@ -77,7 +77,7 @@ class SimulationServer { } } - def static isRunning() { + static def isRunning() { return JOB.state !== Job.NONE } From 5a8c086e765a9835b386cadc8ee4308cfb860e09 Mon Sep 17 00:00:00 2001 From: Alexander Schulz-Rosengarten Date: Tue, 6 Feb 2024 15:20:27 +0100 Subject: [PATCH 6/9] build: Fixed target platform and reconfigured jetty dependencies --- ....cs.kieler.semantics.targetplatform.target | 5 +- build/scripts/uberjar.py | 2 + oomph/kieler-semantics-developers.setup | 154 +----------------- .../META-INF/MANIFEST.MF | 4 +- .../META-INF/MANIFEST.MF | 34 +--- 5 files changed, 9 insertions(+), 190 deletions(-) diff --git a/build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target b/build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target index c53cc8cad4..3b18f2caed 100644 --- a/build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target +++ b/build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target @@ -10,8 +10,6 @@ - - @@ -20,7 +18,6 @@ - @@ -56,7 +53,7 @@ - + diff --git a/build/scripts/uberjar.py b/build/scripts/uberjar.py index d284669914..832b1358fa 100644 --- a/build/scripts/uberjar.py +++ b/build/scripts/uberjar.py @@ -69,6 +69,7 @@ 'META-INF/MANIFEST.MF', # not sure if we have to merge the content somehow? 'META-INF/maven/*', 'META-INF/NOTICE.txt', + 'META-INF/NOTICE.md', 'META-INF/NOTICE', 'META-INF/p2.inf', 'META-INF/versions/*/module-info.class', @@ -87,6 +88,7 @@ 'plugin.properties', 'META-INF/services/*', 'META-INF/LICENSE.txt', + 'META-INF/LICENSE.md', 'META-INF/LICENSE', ] IGNORE_MERGE = [ diff --git a/oomph/kieler-semantics-developers.setup b/oomph/kieler-semantics-developers.setup index 2d3dfb1c9e..160b7bf722 100644 --- a/oomph/kieler-semantics-developers.setup +++ b/oomph/kieler-semantics-developers.setup @@ -517,16 +517,8 @@ name="org.freemarker.freemarker"/> - - - + url="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/websocket-mirror/10.0.20/"/> @@ -562,150 +554,6 @@ url="http://download.eclipse.org/modeling/tmf/xtext/updates/composite/releases/"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Date: Tue, 6 Feb 2024 15:31:01 +0100 Subject: [PATCH 7/9] build: Upgrade to ELK 0.9.0 --- .../de.cau.cs.kieler.semantics.targetplatform.target | 2 +- oomph/kieler-semantics-developers.setup | 2 +- .../cau/cs/kieler/sccharts/ui/synthesis/StateSynthesis.xtend | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target b/build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target index 3b18f2caed..7f58ea9697 100644 --- a/build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target +++ b/build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target @@ -49,7 +49,7 @@ - + diff --git a/oomph/kieler-semantics-developers.setup b/oomph/kieler-semantics-developers.setup index 160b7bf722..b6f7e66478 100644 --- a/oomph/kieler-semantics-developers.setup +++ b/oomph/kieler-semantics-developers.setup @@ -535,7 +535,7 @@ + url="https://download.eclipse.org/elk/updates/releases/0.9.0/"/> { def static void configureLayout(KNode node) { node.setLayoutOption(CoreOptions::ALGORITHM, RectPackingOptions.ALGORITHM_ID) node.setLayoutOption(CoreOptions::EXPAND_NODES, true) + node.setLayoutOption(RectPackingOptions.WHITE_SPACE_ELIMINATION_STRATEGY, WhiteSpaceEliminationStrategy.EQUAL_BETWEEN_STRUCTURES) node.setLayoutOption(RectPackingOptions.OMIT_NODE_MICRO_LAYOUT, true) node.setLayoutOption(CoreOptions::PADDING, new ElkPadding(0)) node.setLayoutOption(CoreOptions::SPACING_NODE_NODE, 1.0) - node.setLayoutOption(RectPackingOptions.OMIT_NODE_MICRO_LAYOUT, true) } def static void configureLayoutRegionDependencies(KNode node) { From 7f788b90d98aaa52e3035c6594da6a6bf382e0a8 Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Thu, 22 Feb 2024 12:51:02 +0100 Subject: [PATCH 8/9] change remaining jakarta.inject imports for com.google.inject. Update missing parts to Eclipse 2023-12. --- .../category.xml | 12 +++++----- build/pom.xml | 22 ++++++++++++++----- .../klighd/CircuitDiagramSynthesis.xtend | 2 +- .../syntheses/CircuitDiagramSynthesis.xtend | 2 +- .../KiCoSelectionDiagramChainSynthesis.xtend | 2 +- ...oSelectionDiagramFlatGroupsSynthesis.xtend | 2 +- .../KiCoSelectionDiagramFlatSynthesis.xtend | 2 +- .../KiCoSelectionDiagramSynthesis.xtend | 2 +- .../kieler/kico/ui/klighd/KiCoSynthesis.xtend | 2 +- oomph/kieler-semantics-developers.setup | 14 ++++-------- 10 files changed, 34 insertions(+), 28 deletions(-) diff --git a/build/de.cau.cs.kieler.semantics.repository/category.xml b/build/de.cau.cs.kieler.semantics.repository/category.xml index b893d065ea..9eb263f6fd 100644 --- a/build/de.cau.cs.kieler.semantics.repository/category.xml +++ b/build/de.cau.cs.kieler.semantics.repository/category.xml @@ -32,12 +32,12 @@ - - - - + + + + - - + + diff --git a/build/pom.xml b/build/pom.xml index 61859beb7c..c20b1d9f03 100644 --- a/build/pom.xml +++ b/build/pom.xml @@ -10,14 +10,14 @@ - 0.8.1 + 0.9.0 2.3.0.v20230606 - 0.21.0 + 0.21.1 0.50.0.v20230607 - 2.31.0 - 2.31.0 + 2.33.0 + 2.33.0 2.7.5 @@ -210,6 +210,18 @@ + + + + + + xml-apis + xml-apis-ext + 1.3.04 + + + + @@ -354,7 +366,7 @@ org.codehaus.mojo build-helper-maven-plugin - 1.3 + 3.5.0 add-source diff --git a/discontinued-plugins/de.cau.cs.kieler.circuit.klighd/src/de/cau/cs/kieler/circuit/klighd/CircuitDiagramSynthesis.xtend b/discontinued-plugins/de.cau.cs.kieler.circuit.klighd/src/de/cau/cs/kieler/circuit/klighd/CircuitDiagramSynthesis.xtend index 0cc585f046..f0dea5bcee 100644 --- a/discontinued-plugins/de.cau.cs.kieler.circuit.klighd/src/de/cau/cs/kieler/circuit/klighd/CircuitDiagramSynthesis.xtend +++ b/discontinued-plugins/de.cau.cs.kieler.circuit.klighd/src/de/cau/cs/kieler/circuit/klighd/CircuitDiagramSynthesis.xtend @@ -30,7 +30,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KPortExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis -import jakarta.inject.Inject +import com.google.inject.Inject import org.eclipse.elk.alg.layered.options.LayeredOptions import org.eclipse.elk.alg.layered.options.NodePlacementStrategy import org.eclipse.elk.core.options.CoreOptions diff --git a/discontinued-plugins/de.cau.cs.kieler.circuit.klighd/src/de/cau/cs/kieler/circuit/ui/syntheses/CircuitDiagramSynthesis.xtend b/discontinued-plugins/de.cau.cs.kieler.circuit.klighd/src/de/cau/cs/kieler/circuit/ui/syntheses/CircuitDiagramSynthesis.xtend index 92291090f3..39e5a1c882 100644 --- a/discontinued-plugins/de.cau.cs.kieler.circuit.klighd/src/de/cau/cs/kieler/circuit/ui/syntheses/CircuitDiagramSynthesis.xtend +++ b/discontinued-plugins/de.cau.cs.kieler.circuit.klighd/src/de/cau/cs/kieler/circuit/ui/syntheses/CircuitDiagramSynthesis.xtend @@ -30,7 +30,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KPortExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.syntheses.AbstractDiagramSynthesis -import jakarta.inject.Inject +import com.google.inject.Inject import org.eclipse.elk.alg.layered.options.LayeredOptions import org.eclipse.elk.alg.layered.options.NodePlacementStrategy import org.eclipse.elk.core.options.CoreOptions diff --git a/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramChainSynthesis.xtend b/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramChainSynthesis.xtend index 142ddad82b..b05e2e954c 100644 --- a/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramChainSynthesis.xtend +++ b/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramChainSynthesis.xtend @@ -25,7 +25,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.util.KlighdProperties -import jakarta.inject.Inject +import com.google.inject.Inject import org.eclipse.elk.alg.layered.p2layers.LayeringStrategy import org.eclipse.elk.alg.layered.properties.LayeredOptions import org.eclipse.elk.core.options.CoreOptions diff --git a/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramFlatGroupsSynthesis.xtend b/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramFlatGroupsSynthesis.xtend index 1d8d191c78..218edd9d23 100644 --- a/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramFlatGroupsSynthesis.xtend +++ b/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramFlatGroupsSynthesis.xtend @@ -30,7 +30,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.util.KlighdProperties import java.util.ArrayList -import jakarta.inject.Inject +import com.google.inject.Inject import org.eclipse.elk.core.options.CoreOptions import org.eclipse.elk.core.options.EdgeRouting diff --git a/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramFlatSynthesis.xtend b/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramFlatSynthesis.xtend index d0efb98a92..f963216def 100644 --- a/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramFlatSynthesis.xtend +++ b/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramFlatSynthesis.xtend @@ -30,7 +30,7 @@ import de.cau.cs.kieler.klighd.krendering.extensions.KNodeExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KPolylineExtensions import de.cau.cs.kieler.klighd.krendering.extensions.KRenderingExtensions import de.cau.cs.kieler.klighd.util.KlighdProperties -import jakarta.inject.Inject +import com.google.inject.Inject import org.eclipse.elk.core.options.CoreOptions import org.eclipse.elk.core.options.Direction import org.eclipse.elk.core.options.EdgeRouting diff --git a/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramSynthesis.xtend b/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramSynthesis.xtend index 0bf1596a38..e947fecf45 100644 --- a/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramSynthesis.xtend +++ b/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSelectionDiagramSynthesis.xtend @@ -31,7 +31,7 @@ import de.cau.cs.kieler.klighd.util.KlighdProperties import java.util.ArrayList import java.util.HashSet import java.util.Set -import jakarta.inject.Inject +import com.google.inject.Inject import org.eclipse.elk.core.options.CoreOptions import org.eclipse.elk.core.options.Direction import org.eclipse.elk.core.options.EdgeRouting diff --git a/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSynthesis.xtend b/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSynthesis.xtend index dcd243bee8..fc946f6404 100644 --- a/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSynthesis.xtend +++ b/discontinued-plugins/de.cau.cs.kieler.kico.ui/src/de/cau/cs/kieler/kico/ui/klighd/KiCoSynthesis.xtend @@ -32,7 +32,7 @@ import java.util.HashMap import java.util.HashSet import java.util.List import java.util.Set -import jakarta.inject.Inject +import com.google.inject.Inject import static extension org.eclipse.emf.ecore.util.EcoreUtil.* diff --git a/oomph/kieler-semantics-developers.setup b/oomph/kieler-semantics-developers.setup index b6f7e66478..1dd645bca4 100644 --- a/oomph/kieler-semantics-developers.setup +++ b/oomph/kieler-semantics-developers.setup @@ -2458,15 +2458,9 @@ name="org.hamcrest.library" versionRange="[1.3.0.v20230809-1000,1.3.0.v20230809-1000]"/> - - + name="org.freemarker.freemarker"/> + name="org.freemarker.freemarker.source"/> + url="https://download.eclipse.org/elk/updates/releases/0.9.0/"/> + url="https://rtsys.informatik.uni-kiel.de/~kieler/updatesite/websocket-mirror/10.0.20/"/> From ad5b1d02eb0a5a58fc172e4cd8612823a8f9f6c7 Mon Sep 17 00:00:00 2001 From: Niklas Rentz Date: Fri, 23 Feb 2024 16:09:43 +0100 Subject: [PATCH 9/9] provide javax.annotation to the tests --- ...au.cs.kieler.semantics.targetplatform.target | 3 +++ test/de.cau.cs.kieler.cli.test/pom.xml | 17 +++++++++++++++++ test/de.cau.cs.kieler.esterel.test/pom.xml | 17 +++++++++++++++++ .../pom.xml | 17 +++++++++++++++++ test/de.cau.cs.kieler.lustre.test/pom.xml | 17 +++++++++++++++++ .../pom.xml | 17 +++++++++++++++++ test/de.cau.cs.kieler.sccharts.test/pom.xml | 17 +++++++++++++++++ test/de.cau.cs.kieler.test.common/pom.xml | 17 +++++++++++++++++ test/de.cau.cs.kieler.verification.test/pom.xml | 17 +++++++++++++++++ 9 files changed, 139 insertions(+) diff --git a/build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target b/build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target index 7f58ea9697..7ef5ab6411 100644 --- a/build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target +++ b/build/de.cau.cs.kieler.semantics.targetplatform/de.cau.cs.kieler.semantics.targetplatform.target @@ -15,6 +15,9 @@ + + + diff --git a/test/de.cau.cs.kieler.cli.test/pom.xml b/test/de.cau.cs.kieler.cli.test/pom.xml index 53181d6cc5..cdc59e3213 100644 --- a/test/de.cau.cs.kieler.cli.test/pom.xml +++ b/test/de.cau.cs.kieler.cli.test/pom.xml @@ -25,6 +25,23 @@ + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + + + + + eclipse-plugin + javax.annotation + 0.0.0 + + + + + diff --git a/test/de.cau.cs.kieler.esterel.test/pom.xml b/test/de.cau.cs.kieler.esterel.test/pom.xml index a3b174566c..b1dc5d5437 100644 --- a/test/de.cau.cs.kieler.esterel.test/pom.xml +++ b/test/de.cau.cs.kieler.esterel.test/pom.xml @@ -25,6 +25,23 @@ + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + + + + + eclipse-plugin + javax.annotation + 0.0.0 + + + + + diff --git a/test/de.cau.cs.kieler.kexpressions.text.test/pom.xml b/test/de.cau.cs.kieler.kexpressions.text.test/pom.xml index 5675a80016..4ac8cbc9a2 100644 --- a/test/de.cau.cs.kieler.kexpressions.text.test/pom.xml +++ b/test/de.cau.cs.kieler.kexpressions.text.test/pom.xml @@ -25,6 +25,23 @@ + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + + + + + eclipse-plugin + javax.annotation + 0.0.0 + + + + + diff --git a/test/de.cau.cs.kieler.lustre.test/pom.xml b/test/de.cau.cs.kieler.lustre.test/pom.xml index c30a6e849c..91eb875fb3 100644 --- a/test/de.cau.cs.kieler.lustre.test/pom.xml +++ b/test/de.cau.cs.kieler.lustre.test/pom.xml @@ -25,6 +25,23 @@ + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + + + + + eclipse-plugin + javax.annotation + 0.0.0 + + + + + diff --git a/test/de.cau.cs.kieler.sccharts.test.simulation/pom.xml b/test/de.cau.cs.kieler.sccharts.test.simulation/pom.xml index 4c4d904965..d7bbdef0d7 100644 --- a/test/de.cau.cs.kieler.sccharts.test.simulation/pom.xml +++ b/test/de.cau.cs.kieler.sccharts.test.simulation/pom.xml @@ -25,6 +25,23 @@ + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + + + + + eclipse-plugin + javax.annotation + 0.0.0 + + + + + diff --git a/test/de.cau.cs.kieler.sccharts.test/pom.xml b/test/de.cau.cs.kieler.sccharts.test/pom.xml index 9e5e330b3e..46383800b5 100644 --- a/test/de.cau.cs.kieler.sccharts.test/pom.xml +++ b/test/de.cau.cs.kieler.sccharts.test/pom.xml @@ -25,6 +25,23 @@ + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + + + + + eclipse-plugin + javax.annotation + 0.0.0 + + + + + diff --git a/test/de.cau.cs.kieler.test.common/pom.xml b/test/de.cau.cs.kieler.test.common/pom.xml index cfa85d6c28..c2a2a8b4dc 100644 --- a/test/de.cau.cs.kieler.test.common/pom.xml +++ b/test/de.cau.cs.kieler.test.common/pom.xml @@ -25,6 +25,23 @@ + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + + + + + eclipse-plugin + javax.annotation + 0.0.0 + + + + + diff --git a/test/de.cau.cs.kieler.verification.test/pom.xml b/test/de.cau.cs.kieler.verification.test/pom.xml index d343cb7dfe..f7cb79f9e3 100644 --- a/test/de.cau.cs.kieler.verification.test/pom.xml +++ b/test/de.cau.cs.kieler.verification.test/pom.xml @@ -25,6 +25,23 @@ + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + + + + + eclipse-plugin + javax.annotation + 0.0.0 + + + + +