Skip to content

Commit 28347a0

Browse files
committed
Update to Tycho 4.0.6
A newer Tycho is needed to enable build and test against more recent platform. tycho-packaging-plugin is needed explicitly to ensure that the headers in MANIFEST.MF are not removed during build. This ensures cdt-lsp doesn't have this same problem as CDT had recently eclipse-cdt/cdt#551 The inclusion of tycho-packaging-plugin also contains the missing source references in the MANIFEST.MF outputs.
1 parent 6c50bd3 commit 28347a0

File tree

4 files changed

+48
-5
lines changed

4 files changed

+48
-5
lines changed

.github/workflows/tycho-build.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
java-version: '17'
1515
distribution: 'temurin'
1616
- name: Setup Maven
17-
uses: stCarolas/setup-maven@v.4.5
17+
uses: stCarolas/setup-maven@v5
1818
with:
19-
maven-version: 3.8.7
19+
maven-version: 3.9.6
2020
- name: Download clangd
2121
run: |
2222
curl -L https://github.com/clangd/clangd/releases/download/15.0.6/clangd-linux-15.0.6.zip > clangd.zip

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ check_code_cleanliness_workspace/
99
.META-INF_MANIFEST.MF
1010
*.takari_issue_192
1111
*.log
12+
pom.tycho
1213
.tycho-consumer-pom.xml
1314
/eclipse/
1415
/*~

.mvn/extensions.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<extension>
44
<groupId>org.eclipse.tycho</groupId>
55
<artifactId>tycho-build</artifactId>
6-
<version>2.7.5</version>
6+
<version>4.0.6</version>
77
</extension>
88
</extensions>

pom.xml

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
<packaging>pom</packaging>
1717

1818
<properties>
19-
<tycho.version>2.7.5</tycho.version>
20-
<cbi-plugins.version>1.3.4</cbi-plugins.version>
19+
<tycho.version>4.0.6</tycho.version>
20+
<cbi-plugins.version>1.4.3</cbi-plugins.version>
2121
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
22+
<tycho.scmUrl>scm:git:https://github.com/eclipse-cdt/cdt-lsp</tycho.scmUrl>
2223
</properties>
2324

2425
<pluginRepositories>
@@ -53,6 +54,47 @@
5354
<product>org.eclipse.platform.ide</product>
5455
</configuration>
5556
</plugin>
57+
<plugin>
58+
<groupId>org.eclipse.tycho</groupId>
59+
<artifactId>tycho-packaging-plugin</artifactId>
60+
<version>${tycho.version}</version>
61+
<configuration>
62+
<deriveHeaderFromProject>false</deriveHeaderFromProject>
63+
<deriveHeaderFromSource>false</deriveHeaderFromSource>
64+
<!-- Uncomment this to make jgit timestamps work (you may want to pull out jgit.dirtyWorkingTree as a variable)
65+
This can't be done until bundles get version bumped because otherwise the version numbers go backwards
66+
<format>${qualifier.format}</format>
67+
<timestampProvider>jgit</timestampProvider>
68+
<jgit.ignore>
69+
pom.xml
70+
.polyglot.*
71+
</jgit.ignore>
72+
<jgit.dirtyWorkingTree>error</jgit.dirtyWorkingTree> -->
73+
<sourceReferences>
74+
<generate>true</generate>
75+
</sourceReferences>
76+
</configuration>
77+
<dependencies>
78+
<!-- Uncomment this to make jgit timestamps work
79+
<dependency>
80+
<groupId>org.eclipse.tycho</groupId>
81+
<artifactId>tycho-buildtimestamp-jgit</artifactId>
82+
<version>${tycho.version}</version>
83+
</dependency> -->
84+
<dependency>
85+
<groupId>org.eclipse.tycho.extras</groupId>
86+
<artifactId>tycho-sourceref-jgit</artifactId>
87+
<version>${tycho.version}</version>
88+
</dependency>
89+
</dependencies>
90+
<executions>
91+
<execution>
92+
<!-- disable default consumer pom. not needed here, and it shows a warning for each module -->
93+
<id>default-update-consumer-pom</id>
94+
<phase>none</phase>
95+
</execution>
96+
</executions>
97+
</plugin>
5698
</plugins>
5799
</pluginManagement>
58100
<plugins>

0 commit comments

Comments
 (0)