Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Tycho 4.0.1 #488

Merged
merged 1 commit into from
Aug 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ jobs:
java-version: '17'
distribution: 'temurin'
cache: maven
- name: Set up Maven
uses: stCarolas/setup-maven@07fbbe97d97ef44336b7382563d66743297e442f # v4.5
with:
maven-version: 3.9.2
- name: Install GCC & GDB & other build essentials
run: |
sudo apt-get -y install build-essential gcc g++ gdb gdbserver
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/code-cleanliness.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ jobs:
java-version: '17'
distribution: 'temurin'
cache: maven
- name: Set up Maven
uses: stCarolas/setup-maven@07fbbe97d97ef44336b7382563d66743297e442f # v4.5
with:
maven-version: 3.9.2
- name: Install dependencies
run: |
sudo apt-get update && sudo apt-get install -y --no-install-recommends \
Expand Down
2 changes: 1 addition & 1 deletion .mvn/extensions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<extension>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-build</artifactId>
<version>3.0.3</version>
<version>4.0.1</version>
</extension>
</extensions>
10 changes: 3 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,8 @@
<name>CDT Parent</name>

<properties>
<!-- Maven 3.6.1 and 3.6.2 do not work with Tycho, see Bug 551674
CDT enforces a minimum of 3.6.3 because that is what CDT's CI
runs with. It may work with older versions, but this is not
tested or supported. -->
<required-maven-version>3.6.3</required-maven-version>
<tycho-version>3.0.5</tycho-version>
<required-maven-version>3.9.1</required-maven-version>
<tycho-version>4.0.1</tycho-version>
<cbi-plugins.version>1.3.4</cbi-plugins.version>
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
<cdt-site>http://ci.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository</cdt-site>
Expand Down Expand Up @@ -619,7 +615,7 @@
<version>${required-maven-version}</version>
</requireMavenVersion>
<requireJavaVersion>
<version>11</version>
<version>17</version>
</requireJavaVersion>
</rules>
<fail>true</fail>
Expand Down
4 changes: 0 additions & 4 deletions releng/org.eclipse.cdt.repo/category.xml
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,6 @@
<bundle id="org.eclipse.cdt.remote.core" version="0.0.0"/>
<bundle id="org.eclipse.cdt.remote.core.source" version="0.0.0"/>
<bundle id="com.sun.xml.bind" version="0.0.0"/>
<bundle id="javax.activation" version="0.0.0"/>
<bundle id="javax.xml" version="0.0.0"/>
<bundle id="jakarta.xml.bind" version="0.0.0"/>
<bundle id="javax.xml.stream" version="0.0.0"/>
<bundle id="com.google.gson" version="0.0.0"/>
<bundle id="org.freemarker" version="0.0.0"/>
<bundle id="org.yaml.snakeyaml" version="0.0.0"/>
Expand Down
Loading