Skip to content

Commit fa709f2

Browse files
seidewitzseidewitz
authored
Merge pull request #777 from Systems-Modeling/ST6RI-946
ST6RI-946 Release build is broken
2 parents 2a8e96c + c8f1d45 commit fa709f2

40 files changed

Lines changed: 132 additions & 133 deletions

File tree

‎.github/workflows/maven-publish.yml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,15 @@ jobs:
2525
java-version: '21'
2626
distribution: 'temurin'
2727
cache: maven
28-
- name: Remove -snapshot from version
29-
run: ./mvnw -B versions:set -DremoveSnapshot=true
28+
# Keep the checkout unchanged and pass the non-SNAPSHOT revision to Maven
29+
# explicitly, because versions:set updates project.version but leaves the
30+
# revision property behind in this build.
31+
- name: Resolve release version
32+
run: |
33+
release_version=$(sed -n 's:.*<revision>\(.*\)</revision>.*:\1:p' pom.xml | head -n 1 | sed 's/-SNAPSHOT$//')
34+
echo "RELEASE_VERSION=${release_version}" >> "$GITHUB_ENV"
3035
- name: Publish to Github Packages
31-
run: ./mvnw -B deploy -DskipTests=true
36+
run: ./mvnw -B clean deploy -DskipTests=true -Drevision=${{ env.RELEASE_VERSION }}
3237
env:
3338
GITHUB_TOKEN: ${{ github.token }} # GITHUB_TOKEN is the default env for the password
3439
- name: Upload SysML Library .kpar files

‎org.omg.kerml.expressions.xtext.ide/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
44
Bundle-Name: org.omg.kerml.xtext.ide
55
Bundle-RequiredExecutionEnvironment: JavaSE-21
66
Bundle-Vendor: SysML v2 Submission Team
7-
Bundle-Version: 0.60.0.qualifier
7+
Bundle-Version: 0.60.1.qualifier
88
Bundle-SymbolicName: org.omg.kerml.expressions.xtext.ide; singleton:=true
99
Bundle-ActivationPolicy: lazy
1010
Require-Bundle: org.omg.kerml.expressions.xtext,

‎org.omg.kerml.expressions.xtext.ui/META-INF/MANIFEST.MF‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
44
Bundle-Name: org.omg.kerml.xtext.ui
55
Bundle-RequiredExecutionEnvironment: JavaSE-21
66
Bundle-Vendor: SysML v2 Submission Team
7-
Bundle-Version: 0.60.0.qualifier
7+
Bundle-Version: 0.60.1.qualifier
88
Bundle-SymbolicName: org.omg.kerml.expressions.xtext.ui; singleton:=true
99
Bundle-ActivationPolicy: lazy
1010
Require-Bundle: org.omg.kerml.expressions.xtext,
@@ -19,7 +19,7 @@ Require-Bundle: org.omg.kerml.expressions.xtext,
1919
org.eclipse.xtext.builder,
2020
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
2121
org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional,
22-
org.omg.sysml;bundle-version="0.60.0",
22+
org.omg.sysml;bundle-version="0.60.1",
2323
org.eclipse.xtext.common.types.ui
2424
Import-Package: org.apache.log4j
2525
Export-Package: org.omg.kerml.expressions.xtext.ui.quickfix,

‎org.omg.kerml.expressions.xtext/META-INF/MANIFEST.MF‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Automatic-Module-Name: org.omg.kerml.expressions.xtext
33
Bundle-ManifestVersion: 2
44
Bundle-Name: org.omg.kerml.xtext
55
Bundle-RequiredExecutionEnvironment: JavaSE-21
6-
Bundle-Version: 0.60.0.qualifier
6+
Bundle-Version: 0.60.1.qualifier
77
Bundle-SymbolicName: org.omg.kerml.expressions.xtext; singleton:=true
88
Bundle-ActivationPolicy: lazy
99
Require-Bundle: org.eclipse.xtext,
@@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.xtext,
1313
org.eclipse.xtext.util,
1414
org.eclipse.xtend.lib;bundle-version="2.14.0",
1515
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
16-
org.omg.sysml.model.bundle;bundle-version="0.60.0",
17-
org.omg.sysml;bundle-version="0.60.0",
16+
org.omg.sysml.model.bundle;bundle-version="0.60.1",
17+
org.omg.sysml;bundle-version="0.60.1",
1818
org.eclipse.uml2.uml,
1919
org.eclipse.uml2.uml.resources,
2020
org.eclipse.xtext.common.types,

‎org.omg.kerml.owl.ide/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: org.omg.kerml.owl.ide
44
Bundle-RequiredExecutionEnvironment: JavaSE-21
55
Bundle-Vendor: My Company
6-
Bundle-Version: 0.60.0.qualifier
6+
Bundle-Version: 0.60.1.qualifier
77
Bundle-SymbolicName: org.omg.kerml.owl.ide;singleton:=true
88
Bundle-ActivationPolicy: lazy
99
Require-Bundle: org.omg.kerml.owl,

‎org.omg.kerml.owl.ui/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: org.omg.kerml.owl.ui
44
Bundle-RequiredExecutionEnvironment: JavaSE-21
55
Bundle-Vendor: My Company
6-
Bundle-Version: 0.60.0.qualifier
6+
Bundle-Version: 0.60.1.qualifier
77
Bundle-SymbolicName: org.omg.kerml.owl.ui;singleton:=true
88
Bundle-ActivationPolicy: lazy
99
Require-Bundle: org.omg.kerml.owl,

‎org.omg.kerml.owl/META-INF/MANIFEST.MF‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: org.omg.sysml.owl
44
Bundle-RequiredExecutionEnvironment: JavaSE-21
55
Bundle-Vendor: My Company
6-
Bundle-Version: 0.60.0.qualifier
6+
Bundle-Version: 0.60.1.qualifier
77
Bundle-SymbolicName: org.omg.kerml.owl;singleton:=true
88
Bundle-ActivationPolicy: lazy
99
Require-Bundle: org.eclipse.xtext,

‎org.omg.kerml.xpect.tests/META-INF/MANIFEST.MF‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@ Bundle-Name: org.omg.kerml.xpect.tests
44
Bundle-RequiredExecutionEnvironment: JavaSE-21
55
Bundle-SymbolicName: org.omg.kerml.xpect.tests;singleton:=true
66
Bundle-Vendor: SysML v2 Submission Team
7-
Bundle-Version: 0.60.0.qualifier
7+
Bundle-Version: 0.60.1.qualifier
88
Require-Bundle: org.eclipse.core.runtime,
99
org.eclipse.xpect.xtext.lib;bundle-version="[0.3.0,0.4.0)",
1010
org.eclipse.xpect.xtext.xbase.lib;bundle-version="[0.3.0,0.4.0)",
1111
org.eclipse.emf.codegen;bundle-version="2.6.0",
1212
org.eclipse.xtext.xbase;bundle-version="2.9.2",
1313
org.eclipse.xtext.ui.shared;bundle-version="2.14.0",
14-
org.omg.sysml;bundle-version="0.60.0",
15-
org.omg.sysml.logic.bundle;bundle-version="0.60.0",
16-
org.omg.kerml.xtext;bundle-version="0.60.0",
17-
org.omg.kerml.xtext.ui;bundle-version="0.60.0",
14+
org.omg.sysml;bundle-version="0.60.1",
15+
org.omg.sysml.logic.bundle;bundle-version="0.60.1",
16+
org.omg.kerml.xtext;bundle-version="0.60.1",
17+
org.omg.kerml.xtext.ui;bundle-version="0.60.1",
1818
org.aopalliance;bundle-version="1.0.0"
1919
Bundle-ActivationPolicy: lazy
2020
Export-Package: org.omg.kerml.xpect,

‎org.omg.kerml.xtext.ide/META-INF/MANIFEST.MF‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ Bundle-ManifestVersion: 2
44
Bundle-Name: org.omg.kerml.xtext.ide
55
Bundle-RequiredExecutionEnvironment: JavaSE-21
66
Bundle-Vendor: SysML v2 Submission Team
7-
Bundle-Version: 0.60.0.qualifier
7+
Bundle-Version: 0.60.1.qualifier
88
Bundle-SymbolicName: org.omg.kerml.xtext.ide; singleton:=true
99
Bundle-ActivationPolicy: lazy
1010
Require-Bundle: org.omg.kerml.xtext,
1111
org.eclipse.xtext.ide,
1212
org.eclipse.xtend.lib,
1313
org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
14-
org.omg.kerml.expressions.xtext;bundle-version="0.60.0",
15-
org.omg.kerml.expressions.xtext.ide;bundle-version="0.60.0"
14+
org.omg.kerml.expressions.xtext;bundle-version="0.60.1",
15+
org.omg.kerml.expressions.xtext.ide;bundle-version="0.60.1"
1616
Export-Package: org.omg.kerml.xtext.ide.contentassist.antlr

‎org.omg.kerml.xtext.ui/META-INF/MANIFEST.MF‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Bundle-ManifestVersion: 2
44
Bundle-Name: org.omg.kerml.xtext.ui
55
Bundle-RequiredExecutionEnvironment: JavaSE-21
66
Bundle-Vendor: SysML v2 Submission Team
7-
Bundle-Version: 0.60.0.qualifier
7+
Bundle-Version: 0.60.1.qualifier
88
Bundle-SymbolicName: org.omg.kerml.xtext.ui; singleton:=true
99
Bundle-ActivationPolicy: lazy
1010
Require-Bundle: org.omg.kerml.xtext,
@@ -19,12 +19,12 @@ Require-Bundle: org.omg.kerml.xtext,
1919
org.eclipse.xtext.builder,
2020
org.eclipse.xtext.xbase.lib;bundle-version="2.14.0",
2121
org.eclipse.xtend.lib;bundle-version="2.14.0";resolution:=optional,
22-
org.omg.sysml.model.bundle;bundle-version="0.60.0",
23-
org.omg.sysml.logic.bundle;bundle-version="0.60.0",
24-
org.omg.sysml;bundle-version="0.60.0",
25-
org.omg.kerml.expressions.xtext;bundle-version="0.60.0",
26-
org.omg.kerml.expressions.xtext.ide;bundle-version="0.60.0",
27-
org.omg.kerml.expressions.xtext.ui;bundle-version="0.60.0",
22+
org.omg.sysml.model.bundle;bundle-version="0.60.1",
23+
org.omg.sysml.logic.bundle;bundle-version="0.60.1",
24+
org.omg.sysml;bundle-version="0.60.1",
25+
org.omg.kerml.expressions.xtext;bundle-version="0.60.1",
26+
org.omg.kerml.expressions.xtext.ide;bundle-version="0.60.1",
27+
org.omg.kerml.expressions.xtext.ui;bundle-version="0.60.1",
2828
org.eclipse.xtext.common.types.ui,
2929
org.eclipse.emf.ecore.editor
3030
Import-Package: org.apache.log4j

0 commit comments

Comments
 (0)