Update build to use Tycho 4.0 #2748
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumps `tycho-version` from 3.0.5 to 4.0.0. Updates `tycho-packaging-plugin` from 3.0.5 to 4.0.0 - [Release notes](https://github.com/eclipse-tycho/tycho/releases) - [Changelog](https://github.com/eclipse-tycho/tycho/blob/master/RELEASE_NOTES.md) - [Commits](eclipse-tycho/tycho@tycho-3.0.5...tycho-4.0.0) Updates `tycho-p2-plugin` from 3.0.5 to 4.0.0 - [Release notes](https://github.com/eclipse-tycho/tycho/releases) - [Changelog](https://github.com/eclipse-tycho/tycho/blob/master/RELEASE_NOTES.md) - [Commits](eclipse-tycho/tycho@tycho-3.0.5...tycho-4.0.0) Updates `target-platform-configuration` from 3.0.5 to 4.0.0 - [Release notes](https://github.com/eclipse-tycho/tycho/releases) - [Changelog](https://github.com/eclipse-tycho/tycho/blob/master/RELEASE_NOTES.md) - [Commits](eclipse-tycho/tycho@tycho-3.0.5...tycho-4.0.0) Updates `tycho-maven-plugin` from 3.0.5 to 4.0.0 - [Release notes](https://github.com/eclipse-tycho/tycho/releases) - [Changelog](https://github.com/eclipse-tycho/tycho/blob/master/RELEASE_NOTES.md) - [Commits](eclipse-tycho/tycho@tycho-3.0.5...tycho-4.0.0) Updates `tycho-source-plugin` from 3.0.5 to 4.0.0 - [Release notes](https://github.com/eclipse-tycho/tycho/releases) - [Changelog](https://github.com/eclipse-tycho/tycho/blob/master/RELEASE_NOTES.md) - [Commits](eclipse-tycho/tycho@tycho-3.0.5...tycho-4.0.0) Updates `tycho-surefire-plugin` from 3.0.5 to 4.0.0 Updates `tycho-p2-repository-plugin` from 3.0.5 to 4.0.0 - [Release notes](https://github.com/eclipse-tycho/tycho/releases) - [Changelog](https://github.com/eclipse-tycho/tycho/blob/master/RELEASE_NOTES.md) - [Commits](eclipse-tycho/tycho@tycho-3.0.5...tycho-4.0.0) Updates `tycho-p2-director-plugin` from 3.0.5 to 4.0.0 - [Release notes](https://github.com/eclipse-tycho/tycho/releases) - [Changelog](https://github.com/eclipse-tycho/tycho/blob/master/RELEASE_NOTES.md) - [Commits](eclipse-tycho/tycho@tycho-3.0.5...tycho-4.0.0) --- updated-dependencies: - dependency-name: org.eclipse.tycho:tycho-packaging-plugin dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.eclipse.tycho:tycho-p2-plugin dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.eclipse.tycho:target-platform-configuration dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.eclipse.tycho:tycho-maven-plugin dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.eclipse.tycho:tycho-source-plugin dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.eclipse.tycho:tycho-surefire-plugin dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.eclipse.tycho:tycho-p2-repository-plugin dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.eclipse.tycho:tycho-p2-director-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>
|
please update https://github.com/eclipse/eclipse.jdt.ls/blob/master/.mvn/wrapper/maven-wrapper.properties as well Can you give a meaningful PR title? |
fbricon
reviewed
Jul 6, 2023
|
This is continuation of #2740 |
Required by Tycho 4.0
|
Only annoying part is even for Fedora 38 Maven is on 3.8.x https://koji.fedoraproject.org/koji/packageinfo?packageID=11290 still so wrapper is the way to go now. Not sure why it still failed on the codeql verification build with the 3.9 version error. |
|
Maven in Fedora will likely never be updated again. I've moved to using Maven via sdkman. Actually I expect Maven to be dropped by Fedora. |
|
I use 
|
|
The autobuild step, through patchdiff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index ee7ade6c..5872f6ed 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -44,10 +44,6 @@ jobs:
with:
java-version: '17'
distribution: 'temurin'
- - name: Set up Maven
- uses: stCarolas/setup-maven@v4.5
- with:
- maven-version: 3.9.3
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
@@ -63,8 +59,8 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- - name: Autobuild
- uses: github/codeql-action/autobuild@v2
+ # - name: Autobuild
+ # uses: github/codeql-action/autobuild@v2
# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -72,9 +68,8 @@ jobs:
# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
- # - run: |
- # echo "Run, Build Application using script"
- # ./location_of_script_within_repo/buildscript.sh
+ - name: Manual build
+ run: ./mvnw clean package -f "pom.xml" -B -V -e -Dfindbugs.skip -Dcheckstyle.skip -Dpmd.skip=true -Dspotbugs.skip -Denforcer.skip -Dmaven.javadoc.skip -DskipTests -Dmaven.test.skip.exec -Dlicense.skip=true -Drat.skip=true -Dspotless.check.skip=true
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2Let me know if there's some way to bypass the wrapper re-generating. It's really strange that it would override existing wrapper of 3.9.3 with 3.6.3. |
|
It even overrides the Maven wrapper with the old takari one. I would move to your patch so we can finish here. |
CodeQL autobuild uses old Takari Maven wrapper together bundled with old Maven version which is not sufficient for Tycho requirements.
|
@rgrunber I consider this one good to go. |
rgrunber
approved these changes
Jul 7, 2023
|
After upgrading to tycho 4.0.0, I encountered an error when running the command |
|
I can't test on Windows but the very same command worked for me on Linux without problem. |
|
Similar to eclipse-tycho/tycho#2042 ? |
|
Here's what I get on Windows, using PowerShell: on Command Prompt, it works properly. |
|
One aspect that I changed is that I ran |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.