Skip to content

Commit 6b78411

Browse files
committed
[Build] Unify version configuration of 'tycho-versions-plugin'
1 parent 71bdc74 commit 6b78411

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

.github/workflows/prepareRelease.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ jobs:
3232
distribution: 'temurin'
3333
cache: maven
3434
- name: Update Main Versions
35-
run: mvn -U -ntp -f eclipse-platform-parent org.eclipse.tycho:tycho-versions-plugin:4.0.6:set-version -DnewVersion=${{ github.event.milestone.title }}.0-SNAPSHOT -Dmodules=../eclipse.platform.releng.prereqs.sdk
35+
run: mvn -U -ntp -f eclipse-platform-parent org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=${{ github.event.milestone.title }}.0-SNAPSHOT -Dmodules=../eclipse.platform.releng.prereqs.sdk
3636
- name: Update Release Versions
37-
run: mvn -ntp -f eclipse-platform-parent/pom.xml --non-recursive org.eclipse.tycho:tycho-versions-plugin:4.0.8:set-property -Dproperties=releaseNumberSDK,releaseNumberPlatform,releaseName -DnewReleaseName=${{ steps.get-release-name.outputs.name }} -DnewReleaseNumberSDK=${{ github.event.milestone.title }} -DnewReleaseNumberPlatform=${{ github.event.milestone.title }}
37+
run: mvn -ntp -f eclipse-platform-parent/pom.xml --non-recursive org.eclipse.tycho:tycho-versions-plugin:set-property -Dproperties=releaseNumberSDK,releaseNumberPlatform,releaseName -DnewReleaseName=${{ steps.get-release-name.outputs.name }} -DnewReleaseNumberSDK=${{ github.event.milestone.title }} -DnewReleaseNumberPlatform=${{ github.event.milestone.title }}
3838
- name: Create Pull Request for Release ${{ github.event.milestone.title }}
3939
uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 # v7.0.3
4040
with:

.github/workflows/updateRelease.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ jobs:
2424
- name: Update Versions
2525
run: >-
2626
mvn -U -Pbuild-individual-bundles -ntp
27-
org.eclipse.tycho:tycho-versions-plugin:4.0.6:set-version -DnewVersion=${{ github.event.milestone.title }}.0-SNAPSHOT
28-
org.eclipse.tycho:tycho-versions-plugin:4.0.6:set-parent-version -DnewParentVersion=${{ github.event.milestone.title }}.0-SNAPSHOT
27+
org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=${{ github.event.milestone.title }}.0-SNAPSHOT
28+
org.eclipse.tycho:tycho-versions-plugin:set-parent-version -DnewParentVersion=${{ github.event.milestone.title }}.0-SNAPSHOT
2929
- name: Build and Bump Versions
3030
uses: Wandalen/wretry.action@6feedb7dedadeb826de0f45ff482b53b379a7844 # master
3131
with:
@@ -36,7 +36,7 @@ jobs:
3636
clean verify
3737
-DskipTests
3838
-Dcompare-version-with-baselines.skip=false
39-
org.eclipse.tycho:tycho-versions-plugin:4.0.6:bump-versions -Dtycho.bump-versions.increment=100
39+
org.eclipse.tycho:tycho-versions-plugin:bump-versions -Dtycho.bump-versions.increment=100
4040
- name: Create Pull Request for Release ${{ github.event.milestone.title }}
4141
uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 # v7.0.3
4242
with:

eclipse-platform-parent/pom.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,6 +556,11 @@
556556
<generateDownloadStatsProperty>true</generateDownloadStatsProperty>
557557
</configuration>
558558
</plugin>
559+
<plugin>
560+
<groupId>org.eclipse.tycho</groupId>
561+
<artifactId>tycho-versions-plugin</artifactId>
562+
<version>${tycho.version}</version>
563+
</plugin>
559564
<plugin>
560565
<groupId>org.apache.maven.plugins</groupId>
561566
<artifactId>maven-assembly-plugin</artifactId>
@@ -779,7 +784,6 @@
779784
<plugin>
780785
<groupId>org.eclipse.tycho</groupId>
781786
<artifactId>tycho-versions-plugin</artifactId>
782-
<version>${tycho.version}</version>
783787
<executions>
784788
<execution>
785789
<id>bump</id>

0 commit comments

Comments
 (0)