diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml index 9a4d08ee5..44e378086 100644 --- a/.github/workflows/maven-publish.yml +++ b/.github/workflows/maven-publish.yml @@ -25,10 +25,15 @@ jobs: java-version: '21' distribution: 'temurin' cache: maven - - name: Remove -snapshot from version - run: ./mvnw -B versions:set -DremoveSnapshot=true + # Keep the checkout unchanged and pass the non-SNAPSHOT revision to Maven + # explicitly, because versions:set updates project.version but leaves the + # revision property behind in this build. + - name: Resolve release version + run: | + release_version=$(sed -n 's:.*\(.*\).*:\1:p' pom.xml | head -n 1 | sed 's/-SNAPSHOT$//') + echo "RELEASE_VERSION=${release_version}" >> "$GITHUB_ENV" - name: Publish to Github Packages - run: ./mvnw -B deploy -DskipTests=true + run: ./mvnw -B clean deploy -DskipTests=true -Drevision=${{ env.RELEASE_VERSION }} env: GITHUB_TOKEN: ${{ github.token }} # GITHUB_TOKEN is the default env for the password - name: Upload SysML Library .kpar files 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 dba1311d1..88769099c 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.60.0.qualifier +Bundle-Version: 0.60.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 d4085cd95..c24de695f 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.60.0.qualifier +Bundle-Version: 0.60.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.60.0", + org.omg.sysml;bundle-version="0.60.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 d0bb01b97..1fc33120c 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.60.0.qualifier +Bundle-Version: 0.60.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.60.0", - org.omg.sysml;bundle-version="0.60.0", + org.omg.sysml.model.bundle;bundle-version="0.60.1", + org.omg.sysml;bundle-version="0.60.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 3a8f48106..e4bcaa32a 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.60.0.qualifier +Bundle-Version: 0.60.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 d02483ec4..671917e91 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.60.0.qualifier +Bundle-Version: 0.60.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 d88934b54..849474e56 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.60.0.qualifier +Bundle-Version: 0.60.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 4a12904bf..7737d32c9 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.60.0.qualifier +Bundle-Version: 0.60.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.60.0", - org.omg.sysml.logic.bundle;bundle-version="0.60.0", - org.omg.kerml.xtext;bundle-version="0.60.0", - org.omg.kerml.xtext.ui;bundle-version="0.60.0", + org.omg.sysml;bundle-version="0.60.1", + org.omg.sysml.logic.bundle;bundle-version="0.60.1", + org.omg.kerml.xtext;bundle-version="0.60.1", + org.omg.kerml.xtext.ui;bundle-version="0.60.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 d12134145..f84cf9054 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.60.0.qualifier +Bundle-Version: 0.60.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.60.0", - org.omg.kerml.expressions.xtext.ide;bundle-version="0.60.0" + org.omg.kerml.expressions.xtext;bundle-version="0.60.1", + org.omg.kerml.expressions.xtext.ide;bundle-version="0.60.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 6feb7d8b4..73b3a94de 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.60.0.qualifier +Bundle-Version: 0.60.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.60.0", - org.omg.sysml.logic.bundle;bundle-version="0.60.0", - org.omg.sysml;bundle-version="0.60.0", - org.omg.kerml.expressions.xtext;bundle-version="0.60.0", - org.omg.kerml.expressions.xtext.ide;bundle-version="0.60.0", - org.omg.kerml.expressions.xtext.ui;bundle-version="0.60.0", + org.omg.sysml.model.bundle;bundle-version="0.60.1", + org.omg.sysml.logic.bundle;bundle-version="0.60.1", + org.omg.sysml;bundle-version="0.60.1", + org.omg.kerml.expressions.xtext;bundle-version="0.60.1", + org.omg.kerml.expressions.xtext.ide;bundle-version="0.60.1", + org.omg.kerml.expressions.xtext.ui;bundle-version="0.60.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 73a9fae59..0fe7bac8e 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.60.0.qualifier +Bundle-Version: 0.60.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.60.0", - org.omg.sysml.logic.bundle;bundle-version="0.60.0", - org.omg.sysml;bundle-version="0.60.0", + org.omg.sysml.model.bundle;bundle-version="0.60.1", + org.omg.sysml.logic.bundle;bundle-version="0.60.1", + org.omg.sysml;bundle-version="0.60.1", org.eclipse.uml2.uml, org.eclipse.uml2.uml.resources, - org.omg.kerml.expressions.xtext;bundle-version="0.60.0", + org.omg.kerml.expressions.xtext;bundle-version="0.60.1", com.google.gson, org.eclipse.xtext.common.types, org.objectweb.asm;bundle-version="9.3.0";resolution:=optional diff --git a/org.omg.sysml.edit/META-INF/MANIFEST.MF b/org.omg.sysml.edit/META-INF/MANIFEST.MF index c7d6a3828..af0b55f5b 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.60.0.qualifier +Bundle-Version: 0.60.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.60.0";visibility:=reexport + org.omg.sysml.model.bundle;bundle-version="0.60.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 9af194405..6068b44e1 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 32a74bd52..2c8d82b23 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.60.0.qualifier +Bundle-Version: 0.60.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 a4fd4d1e2..52a494d9a 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.60.0.qualifier +Bundle-Version: 0.60.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.60.0", - org.omg.sysml.logic.bundle;bundle-version="0.60.0", - org.omg.sysml;bundle-version="0.60.0" +Require-Bundle: org.omg.sysml.model.bundle;bundle-version="0.60.1", + org.omg.sysml.logic.bundle;bundle-version="0.60.1", + org.omg.sysml;bundle-version="0.60.1" diff --git a/org.omg.sysml.feature/feature.xml b/org.omg.sysml.feature/feature.xml index 1411f675c..6f64f8e46 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 63017c73a..42ce7c014 100644 --- a/org.omg.sysml.interactive.tests/META-INF/MANIFEST.MF +++ b/org.omg.sysml.interactive.tests/META-INF/MANIFEST.MF @@ -3,12 +3,12 @@ Bundle-ManifestVersion: 2 Bundle-Name: Tests Bundle-RequiredExecutionEnvironment: JavaSE-21 Bundle-SymbolicName: org.omg.sysml.interactive.tests;singleton:=true -Bundle-Version: 0.60.0.qualifier +Bundle-Version: 0.60.1.qualifier Automatic-Module-Name: org.omg.sysml.interactive.tests Bundle-ActivationPolicy: lazy -Require-Bundle: org.omg.sysml.interactive;bundle-version="0.60.0", +Require-Bundle: org.omg.sysml.interactive;bundle-version="0.60.1", org.junit;bundle-version="4.12.0", - org.omg.sysml.model.bundle;bundle-version="0.60.0", - org.omg.sysml.logic.bundle;bundle-version="0.60.0", - org.omg.sysml;bundle-version="0.60.0", + org.omg.sysml.model.bundle;bundle-version="0.60.1", + org.omg.sysml.logic.bundle;bundle-version="0.60.1", + org.omg.sysml;bundle-version="0.60.1", org.eclipse.xtext;bundle-version="2.22.0" diff --git a/org.omg.sysml.interactive/META-INF/MANIFEST.MF b/org.omg.sysml.interactive/META-INF/MANIFEST.MF index e46c90d57..e91e5bf50 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.60.0.qualifier +Bundle-Version: 0.60.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.60.0", - org.omg.sysml.logic.bundle;bundle-version="0.60.0", - org.omg.sysml;bundle-version="0.60.0", - org.omg.sysml.execution;bundle-version="0.60.0", - org.omg.kerml.xtext;bundle-version="0.60.0", - org.omg.sysml.xtext;bundle-version="0.60.0", + org.omg.sysml.model.bundle;bundle-version="0.60.1", + org.omg.sysml.logic.bundle;bundle-version="0.60.1", + org.omg.sysml;bundle-version="0.60.1", + org.omg.sysml.execution;bundle-version="0.60.1", + org.omg.kerml.xtext;bundle-version="0.60.1", + org.omg.sysml.xtext;bundle-version="0.60.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.logic.bundle/.classpath b/org.omg.sysml.logic.bundle/.classpath index 4f028a280..01ebb68e2 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/.settings/org.eclipse.jdt.core.prefs b/org.omg.sysml.logic.bundle/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..23fa13b17 --- /dev/null +++ b/org.omg.sysml.logic.bundle/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,9 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=21 +org.eclipse.jdt.core.compiler.compliance=21 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=21 diff --git a/org.omg.sysml.logic.bundle/META-INF/MANIFEST.MF b/org.omg.sysml.logic.bundle/META-INF/MANIFEST.MF index 925e48e4a..e93717813 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.60.0.qualifier +Bundle-Version: 0.60.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.60.0" + org.omg.sysml.model.bundle;bundle-version="0.60.1" Bundle-ClassPath: ., - lib/org.omg.sysml.logic-0.60.0-SNAPSHOT.jar + lib/org.omg.sysml.logic-0.60.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 390c94f7e..e97f1fc15 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.60.0-SNAPSHOT.jar -jars.extra.classpath = lib/org.omg.sysml.logic-0.60.0-SNAPSHOT.jar + lib/org.omg.sysml.logic-0.60.1-SNAPSHOT.jar +jars.extra.classpath = lib/org.omg.sysml.logic-0.60.1-SNAPSHOT.jar diff --git a/org.omg.sysml.logic.bundle/lib/org.omg.sysml.logic-0.60.0-SNAPSHOT.jar b/org.omg.sysml.logic.bundle/lib/org.omg.sysml.logic-0.60.0-SNAPSHOT.jar deleted file mode 100644 index 3c42ca489..000000000 Binary files a/org.omg.sysml.logic.bundle/lib/org.omg.sysml.logic-0.60.0-SNAPSHOT.jar and /dev/null differ diff --git a/org.omg.sysml.logic.bundle/lib/org.omg.sysml.logic-0.60.1-SNAPSHOT.jar b/org.omg.sysml.logic.bundle/lib/org.omg.sysml.logic-0.60.1-SNAPSHOT.jar new file mode 100644 index 000000000..e076865a3 Binary files /dev/null and b/org.omg.sysml.logic.bundle/lib/org.omg.sysml.logic-0.60.1-SNAPSHOT.jar differ diff --git a/org.omg.sysml.logic.bundle/pom.xml b/org.omg.sysml.logic.bundle/pom.xml index 2e1428be8..1fcef7ea5 100644 --- a/org.omg.sysml.logic.bundle/pom.xml +++ b/org.omg.sysml.logic.bundle/pom.xml @@ -38,32 +38,21 @@ - org.apache.maven.plugins - maven-resources-plugin - ${maven-resources-plugin.version} + maven-antrun-plugin + ${maven-antrun-plugin.version} copy-jar-org.omg.sysml.logic initialize - copy-resources + run - ${project.basedir}/lib - - - - ${project.basedir}/../org.omg.sysml.logic/target - - org.omg.sysml.logic-*.jar - - - *-sources.jar - *-tests.jar - - false - - + + + @@ -87,10 +76,10 @@ org.apache.maven.plugins - maven-resources-plugin + maven-antrun-plugin [0,) - copy-resources + run diff --git a/org.omg.sysml.model.bundle/.classpath b/org.omg.sysml.model.bundle/.classpath index cdf9da41c..9609579ff 100644 --- a/org.omg.sysml.model.bundle/.classpath +++ b/org.omg.sysml.model.bundle/.classpath @@ -11,6 +11,6 @@ - + diff --git a/org.omg.sysml.model.bundle/META-INF/MANIFEST.MF b/org.omg.sysml.model.bundle/META-INF/MANIFEST.MF index 977b676b7..ae74f30fe 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.60.0.qualifier +Bundle-Version: 0.60.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.60.0-SNAPSHOT.jar + lib/org.omg.sysml.model-0.60.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 dd73c9840..255dc70c0 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.60.0-SNAPSHOT.jar,\ + lib/org.omg.sysml.model-0.60.1-SNAPSHOT.jar,\ model/ -jars.extra.classpath = lib/org.omg.sysml.model-0.60.0-SNAPSHOT.jar +jars.extra.classpath = lib/org.omg.sysml.model-0.60.1-SNAPSHOT.jar diff --git a/org.omg.sysml.model.bundle/lib/org.omg.sysml.model-0.60.0-SNAPSHOT.jar b/org.omg.sysml.model.bundle/lib/org.omg.sysml.model-0.60.0-SNAPSHOT.jar deleted file mode 100644 index e20b9e92b..000000000 Binary files a/org.omg.sysml.model.bundle/lib/org.omg.sysml.model-0.60.0-SNAPSHOT.jar and /dev/null differ diff --git a/org.omg.sysml.model.bundle/lib/org.omg.sysml.model-0.60.1-SNAPSHOT.jar b/org.omg.sysml.model.bundle/lib/org.omg.sysml.model-0.60.1-SNAPSHOT.jar new file mode 100644 index 000000000..d9c057c13 Binary files /dev/null and b/org.omg.sysml.model.bundle/lib/org.omg.sysml.model-0.60.1-SNAPSHOT.jar differ diff --git a/org.omg.sysml.model.bundle/pom.xml b/org.omg.sysml.model.bundle/pom.xml index 86adf740f..a4c55b2d8 100644 --- a/org.omg.sysml.model.bundle/pom.xml +++ b/org.omg.sysml.model.bundle/pom.xml @@ -38,34 +38,30 @@ - org.apache.maven.plugins - maven-resources-plugin - ${maven-resources-plugin.version} + maven-antrun-plugin + ${maven-antrun-plugin.version} copy-jar-org.omg.sysml.model initialize - copy-resources + run - ${project.basedir}/lib - - - - ${project.basedir}/../org.omg.sysml.model/target - - org.omg.sysml.model-*.jar - - - *-sources.jar - *-tests.jar - - false - - + + + + + + + org.apache.maven.plugins + maven-resources-plugin + ${maven-resources-plugin.version} + copy-ecore-genmodel-org.omg.sysml.model initialize @@ -108,10 +104,10 @@ org.apache.maven.plugins - maven-resources-plugin + maven-antrun-plugin [0,) - copy-resources + run diff --git a/org.omg.sysml.plantuml.eclipse/META-INF/MANIFEST.MF b/org.omg.sysml.plantuml.eclipse/META-INF/MANIFEST.MF index 11f253517..4b1190fc0 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.60.0.qualifier +Bundle-Version: 0.60.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 69760b6a2..4947952e6 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 0793f0ed2..98e5ac9dd 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.60.0.qualifier +Bundle-Version: 0.60.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 def00546a..91f6f31a0 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.60.0.qualifier +Bundle-Version: 0.60.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.60.0", - org.omg.kerml.xtext;bundle-version="0.60.0", - org.omg.kerml.xtext.ui;bundle-version="0.60.0", - org.omg.sysml.xtext;bundle-version="0.60.0", - org.omg.sysml.xtext.ui;bundle-version="0.60.0", - org.omg.kerml.xpect.tests;bundle-version="0.60.0" + org.omg.sysml;bundle-version="0.60.1", + org.omg.kerml.xtext;bundle-version="0.60.1", + org.omg.kerml.xtext.ui;bundle-version="0.60.1", + org.omg.sysml.xtext;bundle-version="0.60.1", + org.omg.sysml.xtext.ui;bundle-version="0.60.1", + org.omg.kerml.xpect.tests;bundle-version="0.60.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 86b92c077..7739b32ba 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.60.0.qualifier +Bundle-Version: 0.60.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 17254a446..3104b65bf 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.60.0.qualifier +Bundle-Version: 0.60.1.qualifier Bundle-SymbolicName: org.omg.sysml.xtext.ui; singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.omg.sysml.model.bundle;bundle-version="0.60.0", - org.omg.sysml.logic.bundle;bundle-version="0.60.0", - org.omg.sysml;bundle-version="0.60.0", +Require-Bundle: org.omg.sysml.model.bundle;bundle-version="0.60.1", + org.omg.sysml.logic.bundle;bundle-version="0.60.1", + org.omg.sysml;bundle-version="0.60.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.60.0", org.eclipse.xtext.ui, org.eclipse.xtext.ui.codetemplates.ui, org.eclipse.xtext.ui.shared, - org.omg.kerml.xtext;bundle-version="0.60.0", - org.omg.kerml.xtext.ui;bundle-version="0.60.0", + org.omg.kerml.xtext;bundle-version="0.60.1", + org.omg.kerml.xtext.ui;bundle-version="0.60.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 147b09936..d1ae7530c 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.60.0.qualifier +Bundle-Version: 0.60.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.60.0", - org.omg.sysml.logic.bundle;bundle-version="0.60.0", - org.omg.sysml;bundle-version="0.60.0", + org.omg.sysml.model.bundle;bundle-version="0.60.1", + org.omg.sysml.logic.bundle;bundle-version="0.60.1", + org.omg.sysml;bundle-version="0.60.1", org.eclipse.uml2.uml, org.eclipse.uml2.uml.resources, - org.omg.kerml.xtext;bundle-version="0.60.0", - org.omg.kerml.expressions.xtext;bundle-version="0.60.0", + org.omg.kerml.xtext;bundle-version="0.60.1", + org.omg.kerml.expressions.xtext;bundle-version="0.60.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 5e1dd4b4a..c3e992c67 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.60.0.qualifier +Bundle-Version: 0.60.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.60.0", - org.omg.sysml.logic.bundle;bundle-version="0.60.0" + org.omg.sysml.model.bundle;bundle-version="0.60.1", + org.omg.sysml.logic.bundle;bundle-version="0.60.1" Export-Package: org.omg.sysml, org.omg.sysml.api, org.omg.sysml.io, diff --git a/pom.xml b/pom.xml index f57bd2e2d..789311763 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - 0.60.0-SNAPSHOT + 0.60.1-SNAPSHOT 20260501 20250201 4.0.13