Skip to content

Commit 500d336

Browse files
committed
Revert "Reverted change in approach for removing "SNAPSHOT" in maven-publish."
This reverts commit 0944b39.
1 parent 0944b39 commit 500d336

3 files changed

Lines changed: 12 additions & 7 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 clean install -DskipTests=true
36+
run: ./mvnw -B clean install -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.sysml.logic.bundle/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
</goals>
5050
<configuration>
5151
<target>
52-
<copy file="${project.basedir}/../org.omg.sysml.logic/target/org.omg.sysml.logic-${project.version}.jar"
53-
tofile="${project.basedir}/lib/org.omg.sysml.logic-${project.version}.jar"
52+
<copy file="${project.basedir}/../org.omg.sysml.logic/target/org.omg.sysml.logic-${revision}.jar"
53+
tofile="${project.basedir}/lib/org.omg.sysml.logic-${revision}.jar"
5454
overwrite="true" />
5555
</target>
5656
</configuration>

org.omg.sysml.model.bundle/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
</goals>
5050
<configuration>
5151
<target>
52-
<copy file="${project.basedir}/../org.omg.sysml.model/target/org.omg.sysml.model-${project.version}.jar"
53-
tofile="${project.basedir}/lib/org.omg.sysml.model-${project.version}}.jar"
52+
<copy file="${project.basedir}/../org.omg.sysml.model/target/org.omg.sysml.model-${revision}.jar"
53+
tofile="${project.basedir}/lib/org.omg.sysml.model-${revision}.jar"
5454
overwrite="true" />
5555
</target>
5656
</configuration>

0 commit comments

Comments
 (0)