diff --git a/.github/workflows/prepareRelease.yml b/.github/workflows/prepareRelease.yml index 08551760dc4..e91db239139 100644 --- a/.github/workflows/prepareRelease.yml +++ b/.github/workflows/prepareRelease.yml @@ -32,9 +32,9 @@ jobs: distribution: 'temurin' cache: maven - name: Update Main Versions - 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 + 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 - name: Update Release Versions - 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 }} + 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 }} - name: Create Pull Request for Release ${{ github.event.milestone.title }} uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 # v7.0.3 with: diff --git a/.github/workflows/updateRelease.yml b/.github/workflows/updateRelease.yml index d1532244bf9..5eb251bbb34 100644 --- a/.github/workflows/updateRelease.yml +++ b/.github/workflows/updateRelease.yml @@ -24,8 +24,8 @@ jobs: - name: Update Versions run: >- mvn -U -Pbuild-individual-bundles -ntp - org.eclipse.tycho:tycho-versions-plugin:4.0.6:set-version -DnewVersion=${{ github.event.milestone.title }}.0-SNAPSHOT - org.eclipse.tycho:tycho-versions-plugin:4.0.6:set-parent-version -DnewParentVersion=${{ github.event.milestone.title }}.0-SNAPSHOT + org.eclipse.tycho:tycho-versions-plugin:set-version -DnewVersion=${{ github.event.milestone.title }}.0-SNAPSHOT + org.eclipse.tycho:tycho-versions-plugin:set-parent-version -DnewParentVersion=${{ github.event.milestone.title }}.0-SNAPSHOT - name: Build and Bump Versions uses: Wandalen/wretry.action@6feedb7dedadeb826de0f45ff482b53b379a7844 # master with: @@ -36,7 +36,7 @@ jobs: clean verify -DskipTests -Dcompare-version-with-baselines.skip=false - org.eclipse.tycho:tycho-versions-plugin:4.0.6:bump-versions -Dtycho.bump-versions.increment=100 + org.eclipse.tycho:tycho-versions-plugin:bump-versions -Dtycho.bump-versions.increment=100 - name: Create Pull Request for Release ${{ github.event.milestone.title }} uses: peter-evans/create-pull-request@6cd32fd93684475c31847837f87bb135d40a2b79 # v7.0.3 with: diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml index 90ab8a64c61..038c613adf2 100644 --- a/eclipse-platform-parent/pom.xml +++ b/eclipse-platform-parent/pom.xml @@ -556,6 +556,11 @@ true + + org.eclipse.tycho + tycho-versions-plugin + ${tycho.version} + org.apache.maven.plugins maven-assembly-plugin @@ -779,7 +784,6 @@ org.eclipse.tycho tycho-versions-plugin - ${tycho.version} bump