diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d25fb217bc..d43385042f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -9,6 +9,7 @@ name: Java CI with Maven on: + workflow_dispatch: push: branches: [ "master" ] pull_request: diff --git a/org.omg.kerml.expressions.xtext.ide/META-INF/MANIFEST.MF b/org.omg.kerml.expressions.xtext.ide/META-INF/MANIFEST.MF index 117539cdb5..253dc78f45 100644 --- a/org.omg.kerml.expressions.xtext.ide/META-INF/MANIFEST.MF +++ b/org.omg.kerml.expressions.xtext.ide/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.omg.kerml.xtext.ide Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: SysML v2 Submission Team -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Bundle-SymbolicName: org.omg.kerml.expressions.xtext.ide; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.omg.kerml.expressions.xtext, diff --git a/org.omg.kerml.expressions.xtext.ui/META-INF/MANIFEST.MF b/org.omg.kerml.expressions.xtext.ui/META-INF/MANIFEST.MF index 60771c0ef1..97fb0b335e 100644 --- a/org.omg.kerml.expressions.xtext.ui/META-INF/MANIFEST.MF +++ b/org.omg.kerml.expressions.xtext.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.omg.kerml.xtext.ui Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: SysML v2 Submission Team -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Bundle-SymbolicName: org.omg.kerml.expressions.xtext.ui; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.omg.kerml.expressions.xtext, @@ -19,7 +19,7 @@ Require-Bundle: org.omg.kerml.expressions.xtext, org.eclipse.xtext.builder, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional, - org.omg.sysml;bundle-version="0.63.0", + org.omg.sysml;bundle-version="0.63.1", org.eclipse.xtext.common.types.ui Import-Package: org.apache.log4j Export-Package: org.omg.kerml.expressions.xtext.ui.quickfix, diff --git a/org.omg.kerml.expressions.xtext/META-INF/MANIFEST.MF b/org.omg.kerml.expressions.xtext/META-INF/MANIFEST.MF index 8d4d2a8de8..6d49687b35 100644 --- a/org.omg.kerml.expressions.xtext/META-INF/MANIFEST.MF +++ b/org.omg.kerml.expressions.xtext/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: org.omg.kerml.expressions.xtext Bundle-ManifestVersion: 2 Bundle-Name: org.omg.kerml.xtext Bundle-RequiredExecutionEnvironment: JavaSE-21 -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Bundle-SymbolicName: org.omg.kerml.expressions.xtext; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, @@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.util, org.eclipse.xtend.lib;bundle-version="2.14.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", - org.omg.sysml.model.bundle;bundle-version="0.63.0", - org.omg.sysml;bundle-version="0.63.0", + org.omg.sysml.model.bundle;bundle-version="0.63.1", + org.omg.sysml;bundle-version="0.63.1", org.eclipse.uml2.uml, org.eclipse.uml2.uml.resources, org.eclipse.xtext.common.types, diff --git a/org.omg.kerml.owl.ide/META-INF/MANIFEST.MF b/org.omg.kerml.owl.ide/META-INF/MANIFEST.MF index 8fff56e829..2bc8a0f12c 100644 --- a/org.omg.kerml.owl.ide/META-INF/MANIFEST.MF +++ b/org.omg.kerml.owl.ide/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.omg.kerml.owl.ide Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: My Company -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Bundle-SymbolicName: org.omg.kerml.owl.ide;singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.omg.kerml.owl, diff --git a/org.omg.kerml.owl.ui/META-INF/MANIFEST.MF b/org.omg.kerml.owl.ui/META-INF/MANIFEST.MF index c3725fe9f1..ca18e188f1 100644 --- a/org.omg.kerml.owl.ui/META-INF/MANIFEST.MF +++ b/org.omg.kerml.owl.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.omg.kerml.owl.ui Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: My Company -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Bundle-SymbolicName: org.omg.kerml.owl.ui;singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.omg.kerml.owl, diff --git a/org.omg.kerml.owl/META-INF/MANIFEST.MF b/org.omg.kerml.owl/META-INF/MANIFEST.MF index 66a970fccf..50e298c5e1 100644 --- a/org.omg.kerml.owl/META-INF/MANIFEST.MF +++ b/org.omg.kerml.owl/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.omg.sysml.owl Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: My Company -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Bundle-SymbolicName: org.omg.kerml.owl;singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, diff --git a/org.omg.kerml.xpect.tests/META-INF/MANIFEST.MF b/org.omg.kerml.xpect.tests/META-INF/MANIFEST.MF index b1a2f7e482..5e0c51d6ab 100644 --- a/org.omg.kerml.xpect.tests/META-INF/MANIFEST.MF +++ b/org.omg.kerml.xpect.tests/META-INF/MANIFEST.MF @@ -4,17 +4,17 @@ Bundle-Name: org.omg.kerml.xpect.tests Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-SymbolicName: org.omg.kerml.xpect.tests;singleton:=true Bundle-Vendor: SysML v2 Submission Team -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Require-Bundle: org.eclipse.core.runtime, org.eclipse.xpect.xtext.lib;bundle-version="[0.3.0,0.4.0)", org.eclipse.xpect.xtext.xbase.lib;bundle-version="[0.3.0,0.4.0)", org.eclipse.emf.codegen;bundle-version="2.6.0", org.eclipse.xtext.xbase;bundle-version="2.9.2", org.eclipse.xtext.ui.shared;bundle-version="2.14.0", - org.omg.sysml;bundle-version="0.63.0", - org.omg.sysml.logic.bundle;bundle-version="0.63.0", - org.omg.kerml.xtext;bundle-version="0.63.0", - org.omg.kerml.xtext.ui;bundle-version="0.63.0", + org.omg.sysml;bundle-version="0.63.1", + org.omg.sysml.logic.bundle;bundle-version="0.63.1", + org.omg.kerml.xtext;bundle-version="0.63.1", + org.omg.kerml.xtext.ui;bundle-version="0.63.1", org.aopalliance;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy Export-Package: org.omg.kerml.xpect, diff --git a/org.omg.kerml.xtext.ide/META-INF/MANIFEST.MF b/org.omg.kerml.xtext.ide/META-INF/MANIFEST.MF index 1d1f9de71e..08404aafed 100644 --- a/org.omg.kerml.xtext.ide/META-INF/MANIFEST.MF +++ b/org.omg.kerml.xtext.ide/META-INF/MANIFEST.MF @@ -4,13 +4,13 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.omg.kerml.xtext.ide Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: SysML v2 Submission Team -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Bundle-SymbolicName: org.omg.kerml.xtext.ide; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.omg.kerml.xtext, org.eclipse.xtext.ide, org.eclipse.xtend.lib, org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", - org.omg.kerml.expressions.xtext;bundle-version="0.63.0", - org.omg.kerml.expressions.xtext.ide;bundle-version="0.63.0" + org.omg.kerml.expressions.xtext;bundle-version="0.63.1", + org.omg.kerml.expressions.xtext.ide;bundle-version="0.63.1" Export-Package: org.omg.kerml.xtext.ide.contentassist.antlr diff --git a/org.omg.kerml.xtext.ui/META-INF/MANIFEST.MF b/org.omg.kerml.xtext.ui/META-INF/MANIFEST.MF index 30ecd22714..fb4c55a2c2 100644 --- a/org.omg.kerml.xtext.ui/META-INF/MANIFEST.MF +++ b/org.omg.kerml.xtext.ui/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.omg.kerml.xtext.ui Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: SysML v2 Submission Team -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Bundle-SymbolicName: org.omg.kerml.xtext.ui; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.omg.kerml.xtext, @@ -19,12 +19,12 @@ Require-Bundle: org.omg.kerml.xtext, org.eclipse.xtext.builder, org.eclipse.xtext.xbase.lib;bundle-version="2.14.0", org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional, - org.omg.sysml.model.bundle;bundle-version="0.63.0", - org.omg.sysml.logic.bundle;bundle-version="0.63.0", - org.omg.sysml;bundle-version="0.63.0", - org.omg.kerml.expressions.xtext;bundle-version="0.63.0", - org.omg.kerml.expressions.xtext.ide;bundle-version="0.63.0", - org.omg.kerml.expressions.xtext.ui;bundle-version="0.63.0", + org.omg.sysml.model.bundle;bundle-version="0.63.1", + org.omg.sysml.logic.bundle;bundle-version="0.63.1", + org.omg.sysml;bundle-version="0.63.1", + org.omg.kerml.expressions.xtext;bundle-version="0.63.1", + org.omg.kerml.expressions.xtext.ide;bundle-version="0.63.1", + org.omg.kerml.expressions.xtext.ui;bundle-version="0.63.1", org.eclipse.xtext.common.types.ui, org.eclipse.emf.ecore.editor Import-Package: org.apache.log4j diff --git a/org.omg.kerml.xtext/META-INF/MANIFEST.MF b/org.omg.kerml.xtext/META-INF/MANIFEST.MF index 6c72a38fcd..db07e75d87 100644 --- a/org.omg.kerml.xtext/META-INF/MANIFEST.MF +++ b/org.omg.kerml.xtext/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Automatic-Module-Name: org.omg.kerml.xtext Bundle-ManifestVersion: 2 Bundle-Name: org.omg.kerml.xtext Bundle-RequiredExecutionEnvironment: JavaSE-21 -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Bundle-SymbolicName: org.omg.kerml.xtext; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.xtext, @@ -13,12 +13,12 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.util, org.eclipse.xtend.lib;bundle-version="2.14.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", - org.omg.sysml.model.bundle;bundle-version="0.63.0", - org.omg.sysml.logic.bundle;bundle-version="0.63.0", - org.omg.sysml;bundle-version="0.63.0", + org.omg.sysml.model.bundle;bundle-version="0.63.1", + org.omg.sysml.logic.bundle;bundle-version="0.63.1", + org.omg.sysml;bundle-version="0.63.1", org.eclipse.uml2.uml, org.eclipse.uml2.uml.resources, - org.omg.kerml.expressions.xtext;bundle-version="0.63.0", + org.omg.kerml.expressions.xtext;bundle-version="0.63.1", com.google.gson, org.eclipse.xtext.common.types, org.objectweb.asm;bundle-version="9.3.0";resolution:=optional diff --git a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/linking/KerMLLazyLinkingResource.java b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/linking/KerMLLazyLinkingResource.java index 171cdedc36..c68d111e89 100644 --- a/org.omg.kerml.xtext/src/org/omg/kerml/xtext/linking/KerMLLazyLinkingResource.java +++ b/org.omg.kerml.xtext/src/org/omg/kerml/xtext/linking/KerMLLazyLinkingResource.java @@ -1,6 +1,7 @@ /***************************************************************************** * SysML 2 Pilot Implementation * Copyright (c) 2024 Model Driven Solutions, Inc. + * Copyright (c) 2026 Budapest University of Technology and Economics * * This program is free software: you can redistribute it and/or modify * it under the terms of the Eclipse Public License as published by @@ -18,16 +19,57 @@ * * Contributors: * Ed Seidewitz, MDS + * Vince Molnár, BME * *****************************************************************************/ package org.omg.kerml.xtext.linking; +import java.util.ArrayDeque; +import java.util.ArrayList; +import java.util.Deque; +import java.util.List; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EReference; import org.eclipse.xtext.linking.lazy.LazyLinkingResource; +import org.eclipse.xtext.nodemodel.INode; +import org.eclipse.xtext.util.Triple; public class KerMLLazyLinkingResource extends LazyLinkingResource { + /** + * For each lazy link being resolved in the current thread, innermost first, the actions that forget the + * failures to resolve the lazy links nested in its resolution. + */ + private static final ThreadLocal>> resolutions = ThreadLocal.withInitial(ArrayDeque::new); + public void clearUnresolvableURIFragments() { getUnresolvableURIFragments().clear(); } + /** + * A failure to resolve a lazy link during the resolution of another one may be due to the elements excluded + * while that resolution is in progress, so it is cached only until that resolution ends. + */ + @Override + protected EObject getEObject(String uriFragment, Triple triple) throws AssertionError { + boolean wasUnresolvable = getUnresolvableURIFragments().contains(uriFragment); + Deque> inProgress = resolutions.get(); + inProgress.push(new ArrayList<>()); + EObject result = null; + try { + result = super.getEObject(uriFragment, triple); + return result; + } finally { + inProgress.pop().forEach(Runnable::run); + if (result == null && !wasUnresolvable && !inProgress.isEmpty()) { + inProgress.peek().add(() -> forgetUnresolvable(uriFragment)); + } + } + } + + private synchronized void forgetUnresolvable(String uriFragment) { + getUnresolvableURIFragments().remove(uriFragment); + } + } diff --git a/org.omg.sysml.edit/META-INF/MANIFEST.MF b/org.omg.sysml.edit/META-INF/MANIFEST.MF index a269867061..99dbd0566d 100644 --- a/org.omg.sysml.edit/META-INF/MANIFEST.MF +++ b/org.omg.sysml.edit/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.omg.sysml.edit;singleton:=true Automatic-Module-Name: org.omg.sysml.edit -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Bundle-ClassPath: . Bundle-Activator: org.omg.sysml.lang.sysml.provider.SysMLEditPlugin$Implementation Bundle-Vendor: %providerName @@ -13,5 +13,5 @@ Export-Package: org.omg.sysml.lang.sysml.provider Require-Bundle: org.eclipse.core.runtime, org.eclipse.emf.edit;visibility:=reexport, org.eclipse.uml2.common.edit;visibility:=reexport, - org.omg.sysml.model.bundle;bundle-version="0.63.0";visibility:=reexport + org.omg.sysml.model.bundle;bundle-version="0.63.1";visibility:=reexport Bundle-ActivationPolicy: lazy diff --git a/org.omg.sysml.editor.feature/feature.xml b/org.omg.sysml.editor.feature/feature.xml index 29a928eed6..feb5474500 100644 --- a/org.omg.sysml.editor.feature/feature.xml +++ b/org.omg.sysml.editor.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.omg.sysml.editor/META-INF/MANIFEST.MF b/org.omg.sysml.editor/META-INF/MANIFEST.MF index 17a9cca388..7e7947b523 100644 --- a/org.omg.sysml.editor/META-INF/MANIFEST.MF +++ b/org.omg.sysml.editor/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.omg.sysml.editor;singleton:=true Automatic-Module-Name: org.omg.sysml.editor -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Bundle-ClassPath: . Bundle-Activator: org.omg.sysml.lang.sysml.presentation.SysMLEditorPlugin$Implementation Bundle-Vendor: %providerName diff --git a/org.omg.sysml.execution/META-INF/MANIFEST.MF b/org.omg.sysml.execution/META-INF/MANIFEST.MF index a2c2586f1b..ee34a8040c 100644 --- a/org.omg.sysml.execution/META-INF/MANIFEST.MF +++ b/org.omg.sysml.execution/META-INF/MANIFEST.MF @@ -1,13 +1,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.omg.sysml.execution;singleton:=true -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Automatic-Module-Name: org.omg.sysml.execution Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Name: org.omg.sysml.execution Bundle-Vendor: SysML v2 Submission Team Bundle-ActivationPolicy: lazy Export-Package: org.omg.sysml.execution.expressions -Require-Bundle: org.omg.sysml.model.bundle;bundle-version="0.63.0", - org.omg.sysml.logic.bundle;bundle-version="0.63.0", - org.omg.sysml;bundle-version="0.63.0" +Require-Bundle: org.omg.sysml.model.bundle;bundle-version="0.63.1", + org.omg.sysml.logic.bundle;bundle-version="0.63.1", + org.omg.sysml;bundle-version="0.63.1" diff --git a/org.omg.sysml.feature/feature.xml b/org.omg.sysml.feature/feature.xml index c9d4feb212..32ae0ffe59 100644 --- a/org.omg.sysml.feature/feature.xml +++ b/org.omg.sysml.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.omg.sysml.interactive.tests/META-INF/MANIFEST.MF b/org.omg.sysml.interactive.tests/META-INF/MANIFEST.MF index 17c2c6fede..f7c8b7ac72 100644 --- a/org.omg.sysml.interactive.tests/META-INF/MANIFEST.MF +++ b/org.omg.sysml.interactive.tests/META-INF/MANIFEST.MF @@ -3,15 +3,15 @@ Bundle-ManifestVersion: 2 Bundle-Name: Tests Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-SymbolicName: org.omg.sysml.interactive.tests;singleton:=true -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Automatic-Module-Name: org.omg.sysml.interactive.tests Bundle-ActivationPolicy: lazy -Require-Bundle: org.omg.sysml.interactive;bundle-version="0.63.0", +Require-Bundle: org.omg.sysml.interactive;bundle-version="0.63.1", org.junit;bundle-version="4.12.0", - org.omg.sysml.model.bundle;bundle-version="0.63.0", - org.omg.sysml.logic.bundle;bundle-version="0.63.0", - org.omg.sysml;bundle-version="0.63.0", + org.omg.sysml.model.bundle;bundle-version="0.63.1", + org.omg.sysml.logic.bundle;bundle-version="0.63.1", + org.omg.sysml;bundle-version="0.63.1", org.eclipse.xtext;bundle-version="2.22.0", - org.omg.kerml.xtext;bundle-version="0.63.0", - org.omg.sysml.xtext;bundle-version="0.63.0", - org.omg.kerml.xpect.tests;bundle-version="0.63.0" + org.omg.kerml.xtext;bundle-version="0.63.1", + org.omg.sysml.xtext;bundle-version="0.63.1", + org.omg.kerml.xpect.tests;bundle-version="0.63.1" diff --git a/org.omg.sysml.interactive.tests/src/org/omg/sysml/interactive/tests/NestedResolutionTest.java b/org.omg.sysml.interactive.tests/src/org/omg/sysml/interactive/tests/NestedResolutionTest.java new file mode 100644 index 0000000000..11918183e7 --- /dev/null +++ b/org.omg.sysml.interactive.tests/src/org/omg/sysml/interactive/tests/NestedResolutionTest.java @@ -0,0 +1,118 @@ +/** + * SysML 2 Pilot Implementation + * Copyright (C) 2026 Budapest University of Technology and Economics + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the Eclipse Public License, version 2, as published by + * the Eclipse Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * Eclipse Public License for more details. + * + * You should have received a copy of the Eclipse Public License + * along with this program. If not, see . + * + * @license EPL-2.0 + */ +package org.omg.sysml.interactive.tests; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + +import java.nio.file.Path; +import java.util.List; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.resource.Resource; +import org.eclipse.emf.ecore.util.EcoreUtil; +import org.eclipse.xtext.validation.Issue; +import org.junit.After; +import org.junit.BeforeClass; +import org.junit.Test; +import org.omg.sysml.interactive.SysMLInteractive; +import org.omg.sysml.util.ElementUtil; + +/** Tests names that fail to resolve during the resolution of another name, and resolve later. */ +public class NestedResolutionTest { + + protected static SysMLInteractive interactive; + + /** Loads and resolves the standard library once for the textual test scenarios. */ + @BeforeClass + public static void loadLibraries() { + interactive = SysMLInteractive.createInstance(); + interactive.setVerbose(false); + interactive.loadLibrary(Path.of(System.getProperty("libraryPath")).toAbsolutePath().toString()); + } + + /** Removes each test model while retaining the shared resolved libraries. */ + @After + public void removeResource() { + interactive.removeResource(); + } + + /** + * VerificationMethodKind is found only through the first import and test only through the second, + * so a metadata value naming test must be bound to the literal, not to an unresolved proxy. + */ + @Test + public void metadataValueThroughDependentImport() throws Exception { + Resource resource = parse("dependentImport.sysml", """ + package P { + private import VerificationCases::*; + private import VerificationMethodKind::*; + verification def MassTest; + verification massTests : MassTest { + @VerificationMethod { kind = test; } + } + } + """); + assertNoIssues(); + ElementUtil.transformAll(resource, true); + for (var contents = EcoreUtil.getAllContents(resource, false); contents.hasNext();) { + assertFalse(((EObject) contents.next()).eIsProxy()); + } + } + + /** + * Service gets Interface as an implicit supertype from semantic metadata, so Endpoint inherits + * protocol from Interface only as redefined by Service. + */ + @Test + public void redefinitionThroughSemanticMetadata() throws Exception { + Resource resource = parse("semanticMetadata.sysml", """ + package P { + private import Metaobjects::SemanticMetadata; + private import ScalarValues::*; + port def Interface { + attribute url : String; + attribute protocol : String; + } + port interfaces : Interface; + metadata def ServiceMetadata :> SemanticMetadata { + :>> baseType default interfaces meta SysML::PortUsage; + } + #service def Service { + attribute :>> url = "pull"; + attribute :>> protocol = "JSON"; + } + port def Endpoint :> Service, Interface; + } + """); + EcoreUtil.resolveAll(resource); + assertNoIssues(); + } + + private Resource parse(String name, String text) throws Exception { + interactive.setResource(name); + interactive.parse(text); + return interactive.getResource(); + } + + private void assertNoIssues() { + List issues = interactive.validate(); + assertTrue(issues.toString(), issues.isEmpty()); + } + +} diff --git a/org.omg.sysml.interactive/META-INF/MANIFEST.MF b/org.omg.sysml.interactive/META-INF/MANIFEST.MF index e2db5cb7be..829a2ed32d 100644 --- a/org.omg.sysml.interactive/META-INF/MANIFEST.MF +++ b/org.omg.sysml.interactive/META-INF/MANIFEST.MF @@ -3,17 +3,17 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.omg.sysml.interactive Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-SymbolicName: org.omg.sysml.interactive -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Export-Package: org.omg.sysml.interactive Require-Bundle: org.eclipse.emf.ecore, com.google.inject, org.eclipse.xtext, - org.omg.sysml.model.bundle;bundle-version="0.63.0", - org.omg.sysml.logic.bundle;bundle-version="0.63.0", - org.omg.sysml;bundle-version="0.63.0", - org.omg.sysml.execution;bundle-version="0.63.0", - org.omg.kerml.xtext;bundle-version="0.63.0", - org.omg.sysml.xtext;bundle-version="0.63.0", + org.omg.sysml.model.bundle;bundle-version="0.63.1", + org.omg.sysml.logic.bundle;bundle-version="0.63.1", + org.omg.sysml;bundle-version="0.63.1", + org.omg.sysml.execution;bundle-version="0.63.1", + org.omg.kerml.xtext;bundle-version="0.63.1", + org.omg.sysml.xtext;bundle-version="0.63.1", com.google.gson;bundle-version="2.8.6", org.eclipse.xtext.common.types Import-Package: org.omg.sysml.plantuml diff --git a/org.omg.sysml.jupyter.jupyterlab/package.json b/org.omg.sysml.jupyter.jupyterlab/package.json index f2814d189f..07639dbe2d 100644 --- a/org.omg.sysml.jupyter.jupyterlab/package.json +++ b/org.omg.sysml.jupyter.jupyterlab/package.json @@ -1,6 +1,6 @@ { "name": "@systems-modeling/jupyterlab-sysml", - "version": "0.63.0-SNAPSHOT", + "version": "0.63.1-SNAPSHOT", "description": "A JupyterLab extension for system modeling using SysML", "repository": "github:Systems-Modeling/SysML-v2-Pilot-Implementation", "author": "SysML v2 Submission Team", diff --git a/org.omg.sysml.logic.bundle/.classpath b/org.omg.sysml.logic.bundle/.classpath index 4c03378645..830bf5c3b6 100644 --- a/org.omg.sysml.logic.bundle/.classpath +++ b/org.omg.sysml.logic.bundle/.classpath @@ -6,7 +6,7 @@ - + diff --git a/org.omg.sysml.logic.bundle/META-INF/MANIFEST.MF b/org.omg.sysml.logic.bundle/META-INF/MANIFEST.MF index 1c87075976..84fcd16219 100644 --- a/org.omg.sysml.logic.bundle/META-INF/MANIFEST.MF +++ b/org.omg.sysml.logic.bundle/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-21 -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Export-Package: org.omg.sysml.adapter, org.omg.sysml.delegate.invocation, org.omg.sysml.delegate.setting, @@ -20,9 +20,9 @@ Export-Package: org.omg.sysml.adapter, org.omg.sysml.util Require-Bundle: org.eclipse.emf.common;bundle-version="2.44.0", org.eclipse.emf.ecore;bundle-version="2.41.0", - org.omg.sysml.model.bundle;bundle-version="0.63.0" + org.omg.sysml.model.bundle;bundle-version="0.63.1" Bundle-ClassPath: ., - lib/org.omg.sysml.logic-0.63.0-SNAPSHOT.jar + lib/org.omg.sysml.logic-0.63.1-SNAPSHOT.jar Bundle-SymbolicName: org.omg.sysml.logic.bundle;singleton:=true Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.omg.sysml.logic.bundle diff --git a/org.omg.sysml.logic.bundle/build.properties b/org.omg.sysml.logic.bundle/build.properties index b588d8ea8d..d98b1a3d16 100644 --- a/org.omg.sysml.logic.bundle/build.properties +++ b/org.omg.sysml.logic.bundle/build.properties @@ -1,5 +1,5 @@ # bin.includes = META-INF/,\ plugin.properties,\ - lib/org.omg.sysml.logic-0.63.0-SNAPSHOT.jar -jars.extra.classpath = lib/org.omg.sysml.logic-0.63.0-SNAPSHOT.jar + lib/org.omg.sysml.logic-0.63.1-SNAPSHOT.jar +jars.extra.classpath = lib/org.omg.sysml.logic-0.63.1-SNAPSHOT.jar diff --git a/org.omg.sysml.logic.bundle/lib/org.omg.sysml.logic-0.63.0-SNAPSHOT.jar b/org.omg.sysml.logic.bundle/lib/org.omg.sysml.logic-0.63.1-SNAPSHOT.jar similarity index 76% rename from org.omg.sysml.logic.bundle/lib/org.omg.sysml.logic-0.63.0-SNAPSHOT.jar rename to org.omg.sysml.logic.bundle/lib/org.omg.sysml.logic-0.63.1-SNAPSHOT.jar index d8b0f57c98..35da0dbeb6 100644 Binary files a/org.omg.sysml.logic.bundle/lib/org.omg.sysml.logic-0.63.0-SNAPSHOT.jar and b/org.omg.sysml.logic.bundle/lib/org.omg.sysml.logic-0.63.1-SNAPSHOT.jar differ diff --git a/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FeatureAdapter.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FeatureAdapter.java index c2dfadfb74..ab97dd536d 100644 --- a/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FeatureAdapter.java +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/adapter/FeatureAdapter.java @@ -2,6 +2,7 @@ * SysML 2 Pilot Implementation * Copyright (c) 2021-2026 Model Driven Solutions, Inc. * Copyright (c) 2026 Obeo + * Copyright (c) 2026 Budapest University of Technology and Economics * * This program is free software: you can redistribute it and/or modify * it under the terms of the Eclipse Public License as published by @@ -477,6 +478,13 @@ public Set getAllRedefinedFeatures() { forceComputeRedefinitions(); addAllRedefinedFeaturesTo(allRedefinedFeatures); + + // Do not cache the result while a redefined feature is unresolved. + if (allRedefinedFeatures.stream().anyMatch(Feature::eIsProxy)) { + Set redefinedFeatures = allRedefinedFeatures; + allRedefinedFeatures = null; + return redefinedFeatures; + } } return allRedefinedFeatures; } diff --git a/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/ConnectorUtil.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/ConnectorUtil.java index 4143d1d4be..f0e70b4705 100644 --- a/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/ConnectorUtil.java +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/ConnectorUtil.java @@ -2,6 +2,7 @@ * SysML 2 Pilot Implementation * Copyright (c) 2021-2022 Model Driven Solutions, Inc. * Copyright (c) 2023 Mgnite Inc. + * Copyright (c) 2026 Budapest University of Technology and Economics * * This program is free software: you can redistribute it and/or modify * it under the terms of the Eclipse Public License as published by @@ -66,7 +67,7 @@ public static Feature addConnectorEndTo(Connector connector, Feature relatedFeat Feature endFeature = SysMLFactory.eINSTANCE.createFeature(); if (relatedFeature != null) { ReferenceSubsetting subsetting = SysMLFactory.eINSTANCE.createReferenceSubsetting(); - if (relatedFeature.getOwner() == null) { + if (relatedFeature.getOwner() == null && !relatedFeature.eIsProxy()) { subsetting.getOwnedRelatedElement().add(relatedFeature); } subsetting.setReferencedFeature(relatedFeature); diff --git a/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/FeatureUtil.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/FeatureUtil.java index 399ac56dfb..c9f858fe96 100644 --- a/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/FeatureUtil.java +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/FeatureUtil.java @@ -1,6 +1,7 @@ /******************************************************************************* * SysML 2 Pilot Implementation * Copyright (c) 2021-2025 Model Driven Solutions, Inc. + * Copyright (c) 2026 Budapest University of Technology and Economics * * This program is free software: you can redistribute it and/or modify * it under the terms of the Eclipse Public License as published by @@ -349,7 +350,7 @@ public static void insertImplicitTypeFeaturings(Feature feature) { featuring.setIsImplied(true); featuring.setFeaturingType(type); featuring.setFeatureOfType(feature); - if (type.getOwningRelationship() == null) { + if (type.getOwningRelationship() == null && !type.eIsProxy()) { featuring.getOwnedRelatedElement().add(type); } feature.getOwnedRelationship().add(featuring); diff --git a/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/TypeUtil.java b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/TypeUtil.java index 85a7df4220..ba23ba5629 100644 --- a/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/TypeUtil.java +++ b/org.omg.sysml.logic/src/main/java/org/omg/sysml/util/TypeUtil.java @@ -2,6 +2,7 @@ * SysML 2 Pilot Implementation * Copyright (c) 2021-2022, 2024-2026 Model Driven Solutions, Inc. * Copyright (c) 2026 Obeo + * Copyright (c) 2026 Budapest University of Technology and Economics * * This program is free software: you can redistribute it and/or modify * it under the terms of the Eclipse Public License as published by @@ -477,7 +478,7 @@ public static void insertImplicitSpecializations(Type type) { newSpecialization.setIsImplied(true); newSpecialization.setGeneral(general); newSpecialization.setSpecific(type); - if (general.getOwningRelationship() == null) { + if (general.getOwningRelationship() == null && !general.eIsProxy()) { newSpecialization.getOwnedRelatedElement().add(general); } type.getOwnedRelationship().add(newSpecialization); diff --git a/org.omg.sysml.model.bundle/.classpath b/org.omg.sysml.model.bundle/.classpath index 7495691d68..e973a533ca 100644 --- a/org.omg.sysml.model.bundle/.classpath +++ b/org.omg.sysml.model.bundle/.classpath @@ -6,7 +6,7 @@ - + diff --git a/org.omg.sysml.model.bundle/META-INF/MANIFEST.MF b/org.omg.sysml.model.bundle/META-INF/MANIFEST.MF index ab0f0c3821..5f44412ec8 100644 --- a/org.omg.sysml.model.bundle/META-INF/MANIFEST.MF +++ b/org.omg.sysml.model.bundle/META-INF/MANIFEST.MF @@ -4,14 +4,14 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-21 -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Export-Package: org.omg.sysml.lang.sysml, org.omg.sysml.lang.sysml.impl, org.omg.sysml.lang.sysml.util Require-Bundle: org.eclipse.emf.common;bundle-version="2.44.0", org.eclipse.emf.ecore;bundle-version="2.41.0" Bundle-ClassPath: ., - lib/org.omg.sysml.model-0.63.0-SNAPSHOT.jar + lib/org.omg.sysml.model-0.63.1-SNAPSHOT.jar Bundle-SymbolicName: org.omg.sysml.model.bundle;singleton:=true Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.omg.sysml.model.bundle diff --git a/org.omg.sysml.model.bundle/build.properties b/org.omg.sysml.model.bundle/build.properties index 1914999444..18bae3fc9f 100644 --- a/org.omg.sysml.model.bundle/build.properties +++ b/org.omg.sysml.model.bundle/build.properties @@ -1,6 +1,6 @@ # bin.includes = META-INF/,\ plugin.properties,\ - lib/org.omg.sysml.model-0.63.0-SNAPSHOT.jar,\ + lib/org.omg.sysml.model-0.63.1-SNAPSHOT.jar,\ model/ -jars.extra.classpath = lib/org.omg.sysml.model-0.63.0-SNAPSHOT.jar +jars.extra.classpath = lib/org.omg.sysml.model-0.63.1-SNAPSHOT.jar diff --git a/org.omg.sysml.model.bundle/lib/org.omg.sysml.model-0.63.0-SNAPSHOT.jar b/org.omg.sysml.model.bundle/lib/org.omg.sysml.model-0.63.1-SNAPSHOT.jar similarity index 94% rename from org.omg.sysml.model.bundle/lib/org.omg.sysml.model-0.63.0-SNAPSHOT.jar rename to org.omg.sysml.model.bundle/lib/org.omg.sysml.model-0.63.1-SNAPSHOT.jar index 4df2845cfd..8e3099e199 100644 Binary files a/org.omg.sysml.model.bundle/lib/org.omg.sysml.model-0.63.0-SNAPSHOT.jar and b/org.omg.sysml.model.bundle/lib/org.omg.sysml.model-0.63.1-SNAPSHOT.jar differ diff --git a/org.omg.sysml.plantuml.eclipse/META-INF/MANIFEST.MF b/org.omg.sysml.plantuml.eclipse/META-INF/MANIFEST.MF index 98ce474d72..fe4b84afe3 100644 --- a/org.omg.sysml.plantuml.eclipse/META-INF/MANIFEST.MF +++ b/org.omg.sysml.plantuml.eclipse/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: SysML 2 PlantUML visualization for Eclipse Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-SymbolicName: org.omg.sysml.plantuml.eclipse;singleton:=true -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Import-Package: net.sourceforge.plantuml.eclipse.utils;version="1.1.25.himi1", net.sourceforge.plantuml.ecore, net.sourceforge.plantuml.text, diff --git a/org.omg.sysml.plantuml.feature/feature.xml b/org.omg.sysml.plantuml.feature/feature.xml index 629c20ea0e..fdac890ac5 100644 --- a/org.omg.sysml.plantuml.feature/feature.xml +++ b/org.omg.sysml.plantuml.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/org.omg.sysml.plantuml/META-INF/MANIFEST.MF b/org.omg.sysml.plantuml/META-INF/MANIFEST.MF index 7edfa1df50..d9b06fa45f 100644 --- a/org.omg.sysml.plantuml/META-INF/MANIFEST.MF +++ b/org.omg.sysml.plantuml/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: SysML 2 PlantUML visualization Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-SymbolicName: org.omg.sysml.plantuml Automatic-Module-Name: org.omg.sysml.plantuml -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Export-Package: org.omg.sysml.plantuml Import-Package: com.google.common.collect, com.google.inject;version="1.3.0", diff --git a/org.omg.sysml.xpect.tests/META-INF/MANIFEST.MF b/org.omg.sysml.xpect.tests/META-INF/MANIFEST.MF index 13bfb77cc9..550b8c6a21 100644 --- a/org.omg.sysml.xpect.tests/META-INF/MANIFEST.MF +++ b/org.omg.sysml.xpect.tests/META-INF/MANIFEST.MF @@ -3,19 +3,19 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.omg.sysml.xpect.tests Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-SymbolicName: org.omg.sysml.xpect.tests;singleton:=true -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Require-Bundle: org.eclipse.core.runtime, org.eclipse.xpect.xtext.lib;bundle-version="0.3.0", org.eclipse.xpect.xtext.xbase.lib;bundle-version="[0.3.0,0.4.0)", org.eclipse.emf.codegen;bundle-version="2.6.0", org.eclipse.xtext.xbase;bundle-version="2.9.2", org.eclipse.xtext.ui.shared;bundle-version="2.14.0", - org.omg.sysml;bundle-version="0.63.0", - org.omg.kerml.xtext;bundle-version="0.63.0", - org.omg.kerml.xtext.ui;bundle-version="0.63.0", - org.omg.sysml.xtext;bundle-version="0.63.0", - org.omg.sysml.xtext.ui;bundle-version="0.63.0", - org.omg.kerml.xpect.tests;bundle-version="0.63.0" + org.omg.sysml;bundle-version="0.63.1", + org.omg.kerml.xtext;bundle-version="0.63.1", + org.omg.kerml.xtext.ui;bundle-version="0.63.1", + org.omg.sysml.xtext;bundle-version="0.63.1", + org.omg.sysml.xtext.ui;bundle-version="0.63.1", + org.omg.kerml.xpect.tests;bundle-version="0.63.1" Bundle-ActivationPolicy: lazy Export-Package: org.omg.sysml.xpect.tests Bundle-Vendor: SysML v2 Submission Team diff --git a/org.omg.sysml.xtext.ide/META-INF/MANIFEST.MF b/org.omg.sysml.xtext.ide/META-INF/MANIFEST.MF index 61af0b2c20..1a4f4f95b7 100644 --- a/org.omg.sysml.xtext.ide/META-INF/MANIFEST.MF +++ b/org.omg.sysml.xtext.ide/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.omg.sysml.xtext.ide Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: SysML v2 Submission Team -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Bundle-SymbolicName: org.omg.sysml.xtext.ide; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.omg.sysml.xtext, diff --git a/org.omg.sysml.xtext.ui/META-INF/MANIFEST.MF b/org.omg.sysml.xtext.ui/META-INF/MANIFEST.MF index a49a6175dd..b4b09507e1 100644 --- a/org.omg.sysml.xtext.ui/META-INF/MANIFEST.MF +++ b/org.omg.sysml.xtext.ui/META-INF/MANIFEST.MF @@ -3,12 +3,12 @@ Automatic-Module-Name: org.omg.sysml.xtext.ui Bundle-ManifestVersion: 2 Bundle-Name: org.omg.sysml.xtext.ui Bundle-RequiredExecutionEnvironment: JavaSE-21 -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Bundle-SymbolicName: org.omg.sysml.xtext.ui; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.omg.sysml.model.bundle;bundle-version="0.63.0", - org.omg.sysml.logic.bundle;bundle-version="0.63.0", - org.omg.sysml;bundle-version="0.63.0", +Require-Bundle: org.omg.sysml.model.bundle;bundle-version="0.63.1", + org.omg.sysml.logic.bundle;bundle-version="0.63.1", + org.omg.sysml;bundle-version="0.63.1", org.omg.sysml.xtext, org.omg.sysml.xtext.ide, org.eclipse.compare, @@ -20,8 +20,8 @@ Require-Bundle: org.omg.sysml.model.bundle;bundle-version="0.63.0", org.eclipse.xtext.ui, org.eclipse.xtext.ui.codetemplates.ui, org.eclipse.xtext.ui.shared, - org.omg.kerml.xtext;bundle-version="0.63.0", - org.omg.kerml.xtext.ui;bundle-version="0.63.0", + org.omg.kerml.xtext;bundle-version="0.63.1", + org.omg.kerml.xtext.ui;bundle-version="0.63.1", org.omg.kerml.expressions.xtext, org.omg.kerml.expressions.xtext.ide, org.omg.kerml.expressions.xtext.ui, diff --git a/org.omg.sysml.xtext/META-INF/MANIFEST.MF b/org.omg.sysml.xtext/META-INF/MANIFEST.MF index b14e870f34..97fa4aabad 100644 --- a/org.omg.sysml.xtext/META-INF/MANIFEST.MF +++ b/org.omg.sysml.xtext/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: org.omg.sysml.xtext Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-Vendor: SysML v2 Submission Team -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Bundle-SymbolicName: org.omg.sysml.xtext; singleton:=true Bundle-ActivationPolicy: lazy Bundle-ClassPath: ., @@ -16,13 +16,13 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.xtext.util, org.eclipse.xtend.lib;bundle-version="2.14.0", org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", - org.omg.sysml.model.bundle;bundle-version="0.63.0", - org.omg.sysml.logic.bundle;bundle-version="0.63.0", - org.omg.sysml;bundle-version="0.63.0", + org.omg.sysml.model.bundle;bundle-version="0.63.1", + org.omg.sysml.logic.bundle;bundle-version="0.63.1", + org.omg.sysml;bundle-version="0.63.1", org.eclipse.uml2.uml, org.eclipse.uml2.uml.resources, - org.omg.kerml.xtext;bundle-version="0.63.0", - org.omg.kerml.expressions.xtext;bundle-version="0.63.0", + org.omg.kerml.xtext;bundle-version="0.63.1", + org.omg.kerml.expressions.xtext;bundle-version="0.63.1", org.eclipse.xtext.common.types, org.objectweb.asm;bundle-version="9.3.0";resolution:=optional, org.apache.commons.cli diff --git a/org.omg.sysml/META-INF/MANIFEST.MF b/org.omg.sysml/META-INF/MANIFEST.MF index 5197d5b5b5..21a4157288 100644 --- a/org.omg.sysml/META-INF/MANIFEST.MF +++ b/org.omg.sysml/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: %pluginName Bundle-Vendor: %providerName Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-21 -Bundle-Version: 0.63.0.qualifier +Bundle-Version: 0.63.1.qualifier Bundle-ClassPath: ., lib/sysml-v2-api-client-all.jar Bundle-SymbolicName: org.omg.sysml;singleton:=true @@ -25,8 +25,8 @@ Require-Bundle: org.eclipse.xtext, org.eclipse.m2m.qvt.oml, org.eclipse.uml2.uml.resources, org.eclipse.equinox.common;bundle-version="3.5.0", - org.omg.sysml.model.bundle;bundle-version="0.63.0", - org.omg.sysml.logic.bundle;bundle-version="0.63.0" + org.omg.sysml.model.bundle;bundle-version="0.63.1", + org.omg.sysml.logic.bundle;bundle-version="0.63.1" Export-Package: org.omg.sysml, org.omg.sysml.api, org.omg.sysml.io, diff --git a/pom.xml b/pom.xml index 0800655149..78b24b856b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - 0.63.0-SNAPSHOT + 0.63.1-SNAPSHOT 20260901 20250201 4.0.13