Skip to content

Commit a978016

Browse files
BoykoAlexBoykoAlex
committed
e436 target and CI. Tycho 4.0.12. JDT LS 1.45
1 parent f034246 commit a978016

File tree

10 files changed

+91
-87
lines changed

10 files changed

+91
-87
lines changed

‎.github/workflows/release-eclipse-distro-build.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,30 +14,30 @@ on:
1414

1515
jobs:
1616

17-
e433-distro:
17+
e434-distro:
1818
uses: ./.github/workflows/gh-hosted-eclipse-distro-build.yml
1919
with:
20-
eclipse_profile: 'e433'
20+
eclipse_profile: 'e434'
2121
build_type: 'release'
2222
p2-qualifier: 'RELEASE'
2323
sts4-language-servers-version: ${{ inputs.sts4-language-servers-version }}
2424
java_version: '21'
2525
secrets: inherit
2626

27-
e434-distro:
27+
e435-distro:
2828
uses: ./.github/workflows/gh-hosted-eclipse-distro-build.yml
2929
with:
30-
eclipse_profile: 'e434'
30+
eclipse_profile: 'e435'
3131
build_type: 'release'
3232
p2-qualifier: 'RELEASE'
3333
sts4-language-servers-version: ${{ inputs.sts4-language-servers-version }}
3434
java_version: '21'
3535
secrets: inherit
3636

37-
e435-distro:
37+
e436-distro:
3838
uses: ./.github/workflows/gh-hosted-eclipse-distro-build.yml
3939
with:
40-
eclipse_profile: 'e435'
40+
eclipse_profile: 'e436'
4141
build_type: 'release'
4242
p2-qualifier: 'RELEASE'
4343
sts4-language-servers-version: ${{ inputs.sts4-language-servers-version }}

‎.github/workflows/snapshot-all.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,29 +28,29 @@ jobs:
2828
skip_tests: true
2929
secrets: inherit
3030

31-
e433-distro:
31+
e434-distro:
3232
needs: [ eclipse-ls-extensions ]
3333
uses: ./.github/workflows/gh-hosted-eclipse-distro-build.yml
3434
with:
35-
eclipse_profile: 'e433'
35+
eclipse_profile: 'e434'
3636
build_type: 'snapshot'
3737
java_version: '21'
3838
secrets: inherit
3939

40-
e434-distro:
40+
e435-distro:
4141
needs: [ eclipse-ls-extensions ]
4242
uses: ./.github/workflows/gh-hosted-eclipse-distro-build.yml
4343
with:
44-
eclipse_profile: 'e434'
44+
eclipse_profile: 'e435'
4545
build_type: 'snapshot'
4646
java_version: '21'
4747
secrets: inherit
4848

49-
e435-distro:
49+
e436-distro:
5050
needs: [ eclipse-ls-extensions ]
5151
uses: ./.github/workflows/gh-hosted-eclipse-distro-build.yml
5252
with:
53-
eclipse_profile: 'e435'
53+
eclipse_profile: 'e436'
5454
build_type: 'snapshot'
5555
java_version: '21'
5656
secrets: inherit

‎eclipse-distribution/local-build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
./mvnw clean install -Pe433 -Psnapshot -Dhttpclient.retry-max=20 -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Dorg.eclipse.equinox.p2.transport.ecf.retry=5
1+
./mvnw clean install -Pe436 -Psnapshot -Dhttpclient.retry-max=20 -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Dorg.eclipse.equinox.p2.transport.ecf.retry=5
22

‎eclipse-distribution/org.springframework.boot.ide.product.e433/category.xml‎ renamed to ‎eclipse-distribution/org.springframework.boot.ide.product.e436/category.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@
137137
<!-- <bundle id="javax.ws.rs"/> -->
138138
<!-- <bundle id="javax.xml.bind"/> -->
139139
<!-- <bundle id="javax.xml.bind.source"/> -->
140-
<bundle id="javax.xml.stream"/>
140+
<!-- <bundle id="javax.xml.stream"/> -->
141141
<bundle id="org.aopalliance"/>
142142
<bundle id="org.apache.log4j"/>
143143
<bundle id="org.yaml.snakeyaml"/>

‎eclipse-distribution/org.springframework.boot.ide.product.e433/org.springframework.boot.ide.product‎ renamed to ‎eclipse-distribution/org.springframework.boot.ide.product.e436/org.springframework.boot.ide.product‎

File renamed without changes.

‎eclipse-distribution/org.springframework.boot.ide.product.e433/p2.inf‎ renamed to ‎eclipse-distribution/org.springframework.boot.ide.product.e436/p2.inf‎

File renamed without changes.

‎eclipse-distribution/org.springframework.boot.ide.product.e433/pom.xml‎ renamed to ‎eclipse-distribution/org.springframework.boot.ide.product.e436/pom.xml‎

File renamed without changes.

‎eclipse-distribution/pom.xml‎

Lines changed: 75 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878

7979
<sts4-language-servers-p2-repo>https://cdn.spring.io/spring-tools/${dist.type}/TOOLS/sts4-language-server-integrations/${sts4-language-servers-version}</sts4-language-servers-p2-repo>
8080

81-
<tycho-version>4.0.10</tycho-version>
81+
<tycho-version>4.0.12</tycho-version>
8282
<encoding>UTF-8</encoding>
8383

8484
<misc.p2.repo.version>3.9.4.202211021051</misc.p2.repo.version>
@@ -130,26 +130,26 @@
130130
</profile>
131131

132132
<profile>
133-
<id>e433</id>
133+
<id>e434</id>
134134
<properties>
135-
<dist.target>e4.33.0</dist.target>
136-
<dist.target.major>e4.33</dist.target.major>
137-
<dist.platform.name>2024-09</dist.platform.name>
138-
<dist.platform.name.long>2024-09 (4.33)</dist.platform.name.long>
139-
<dist.platform.id>2024-09</dist.platform.id>
140-
<dist.platform.version>4.33.0</dist.platform.version>
141-
<package.qualifierPrefix>e433</package.qualifierPrefix>
135+
<dist.target>e4.34.0</dist.target>
136+
<dist.target.major>e4.34</dist.target.major>
137+
<dist.platform.name>2024-12</dist.platform.name>
138+
<dist.platform.name.long>2024-12 (4.34)</dist.platform.name.long>
139+
<dist.platform.id>2024-12</dist.platform.id>
140+
<dist.platform.version>4.34.0</dist.platform.version>
141+
<package.qualifierPrefix>e434</package.qualifierPrefix>
142142
</properties>
143143
<repositories>
144144
<repository>
145-
<id>2024-09</id>
145+
<id>2024-12</id>
146146
<layout>p2</layout>
147-
<url>https://download.eclipse.org/releases/2024-09/</url>
147+
<url>https://download.eclipse.org/releases/2024-12/</url>
148148
</repository>
149149
<repository>
150150
<id>orbit</id>
151151
<layout>p2</layout>
152-
<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09</url>
152+
<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12</url>
153153
</repository>
154154
<repository> <!-- temporary p2 repo to grab early snapshot builds for testing fixes -->
155155
<id>buildship-snapshots</id>
@@ -206,7 +206,7 @@
206206
<repository>
207207
<id>lsp4e</id>
208208
<layout>p2</layout>
209-
<url>https://download.eclipse.org/lsp4e/releases/0.26.7/</url>
209+
<url>https://download.eclipse.org/lsp4e/releases/0.27.1/</url>
210210
<!-- <url>https://download.eclipse.org/lsp4e/snapshots/</url> -->
211211
</repository>
212212
<repository>
@@ -229,33 +229,38 @@
229229
<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.macosx.x86_64</module>
230230
<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.win32.x86_64</module>
231231
-->
232-
<module>org.springframework.boot.ide.product.e433</module>
232+
<module>org.springframework.boot.ide.product.e434</module>
233233
</modules>
234234

235235
</profile>
236236

237237
<profile>
238-
<id>e434</id>
238+
<id>e435</id>
239239
<properties>
240-
<dist.target>e4.34.0</dist.target>
241-
<dist.target.major>e4.34</dist.target.major>
242-
<dist.platform.name>2024-12</dist.platform.name>
243-
<dist.platform.name.long>2024-12 (4.34)</dist.platform.name.long>
244-
<dist.platform.id>2024-12</dist.platform.id>
245-
<dist.platform.version>4.34.0</dist.platform.version>
246-
<package.qualifierPrefix>e434</package.qualifierPrefix>
240+
<dist.target>e4.35.0</dist.target>
241+
<dist.target.major>e4.35</dist.target.major>
242+
<dist.platform.name>2025-03</dist.platform.name>
243+
<dist.platform.name.long>2025-03 (4.35)</dist.platform.name.long>
244+
<dist.platform.id>2025-03</dist.platform.id>
245+
<dist.platform.version>4.35.0</dist.platform.version>
246+
<package.qualifierPrefix>e435</package.qualifierPrefix>
247247
</properties>
248248
<repositories>
249249
<repository>
250-
<id>2024-12</id>
250+
<id>2025-03</id>
251251
<layout>p2</layout>
252-
<url>https://download.eclipse.org/releases/2024-12/</url>
252+
<url>https://download.eclipse.org/releases/2025-03/</url>
253253
</repository>
254254
<repository>
255255
<id>orbit</id>
256256
<layout>p2</layout>
257-
<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12</url>
257+
<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-03</url>
258258
</repository>
259+
<!-- <repository>
260+
<id>mpc-client</id>
261+
<layout>p2</layout>
262+
<url>https://download.eclipse.org/mpc/drops/1.11.0/v20250125-1342/</url>
263+
</repository> -->
259264
<repository> <!-- temporary p2 repo to grab early snapshot builds for testing fixes -->
260265
<id>buildship-snapshots</id>
261266
<layout>p2</layout>
@@ -334,54 +339,53 @@
334339
<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.macosx.x86_64</module>
335340
<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.win32.x86_64</module>
336341
-->
337-
<module>org.springframework.boot.ide.product.e434</module>
342+
<module>org.springframework.boot.ide.product.e435</module>
338343
</modules>
339344

340345
</profile>
341-
342346
<profile>
343-
<id>e435</id>
347+
<id>e436</id>
344348
<properties>
345-
<dist.target>e4.35.0</dist.target>
346-
<dist.target.major>e4.35</dist.target.major>
347-
<dist.platform.name>2025-03</dist.platform.name>
348-
<dist.platform.name.long>2025-03 (4.35)</dist.platform.name.long>
349-
<dist.platform.id>2025-03</dist.platform.id>
350-
<dist.platform.version>4.35.0</dist.platform.version>
351-
<package.qualifierPrefix>e435</package.qualifierPrefix>
349+
<dist.target>e4.36.0</dist.target>
350+
<dist.target.major>e4.36</dist.target.major>
351+
<dist.platform.name>2025-06</dist.platform.name>
352+
<dist.platform.name.long>2025-06 (4.36)</dist.platform.name.long>
353+
<dist.platform.id>2025-06</dist.platform.id>
354+
<dist.platform.version>4.36.0</dist.platform.version>
355+
<package.qualifierPrefix>e436</package.qualifierPrefix>
352356
</properties>
353357
<repositories>
354358
<repository>
355-
<id>2025-03</id>
359+
<id>2025-06</id>
356360
<layout>p2</layout>
357-
<url>https://download.eclipse.org/staging/2025-03/</url>
361+
<url>https://download.eclipse.org/staging/2025-06/</url>
358362
</repository>
359-
<!-- <repository>
360-
<id>2025-03-i-builds</id>
361-
<layout>p2</layout>
362-
<url>https://download.eclipse.org/eclipse/updates/4.35-I-builds/</url>
363-
</repository> -->
363+
<!-- <repository>
364+
<id>2025-06-i-builds</id>
365+
<layout>p2</layout>
366+
<url>https://download.eclipse.org/eclipse/updates/4.36-I-builds/</url>
367+
</repository> -->
364368
<repository>
365369
<id>orbit</id>
366370
<layout>p2</layout>
367-
<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-03</url>
371+
<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-06</url>
368372
</repository>
369-
<!-- <repository>
370-
<id>mpc-client</id>
371-
<layout>p2</layout>
372-
<url>https://download.eclipse.org/mpc/drops/1.11.0/v20250125-1342/</url>
373-
</repository> -->
373+
<!-- <repository>
374+
<id>mpc-client</id>
375+
<layout>p2</layout>
376+
<url>https://download.eclipse.org/mpc/drops/1.11.0/v20250125-1342/</url>
377+
</repository> -->
374378
<repository> <!-- temporary p2 repo to grab early snapshot builds for testing fixes -->
375379
<id>buildship-snapshots</id>
376380
<layout>p2</layout>
377-
<!-- <url>https://download.eclipse.org/buildship/updates/latest-snapshot/</url>-->
381+
<!-- <url>https://download.eclipse.org/buildship/updates/latest-snapshot/</url>-->
378382
<url>https://download.eclipse.org/buildship/updates/latest</url>
379383
</repository>
380384
<repository>
381385
<id>m2e</id>
382386
<layout>p2</layout>
383387
<url>https://download.eclipse.org/technology/m2e/releases/latest/</url>
384-
<!-- <url>https://download.eclipse.org/technology/m2e/snapshots/latest/</url>-->
388+
<!-- <url>https://download.eclipse.org/technology/m2e/snapshots/latest/</url>-->
385389
</repository>
386390
<repository>
387391
<id>latest-m2e-wtp-release</id>
@@ -408,11 +412,11 @@
408412
<layout>p2</layout>
409413
<url>https://ianbrandt.github.io/m2e-maven-dependency-plugin/</url>
410414
</repository>
411-
<!-- <repository>
412-
<id>mylyn-markdown</id>
413-
<layout>p2</layout>
414-
<url>https://download.eclipse.org/mylyn/docs/releases/3.0.45/</url>
415-
</repository> -->
415+
<!-- <repository>
416+
<id>mylyn-markdown</id>
417+
<layout>p2</layout>
418+
<url>https://download.eclipse.org/mylyn/docs/releases/3.0.45/</url>
419+
</repository> -->
416420
<repository>
417421
<id>wildwebdeveloper</id>
418422
<layout>p2</layout>
@@ -426,29 +430,29 @@
426430
<repository>
427431
<id>lsp4e</id>
428432
<layout>p2</layout>
429-
<url>https://download.eclipse.org/lsp4e/releases/0.27.1/</url>
430-
<!-- <url>https://download.eclipse.org/lsp4e/snapshots/</url> -->
433+
<!--<url>https://download.eclipse.org/lsp4e/releases/0.27.1/</url>-->
434+
<url>https://download.eclipse.org/lsp4e/snapshots/</url>
431435
</repository>
432436
<repository>
433437
<id>tm4e-snapshots</id>
434438
<layout>p2</layout>
435439
<url>https://download.eclipse.org/tm4e/releases/latest/</url>
436-
<!-- <url>https://download.eclipse.org/tm4e/snapshots/</url> -->
437-
</repository>
438-
<!-- <repository>
439-
<id>chromium-binaries</id>
440-
<layout>p2</layout>
441-
<url>https://dl.maketechnology.io/chromium-cef/rls/repository</url>
442-
</repository> -->
443-
</repositories>
440+
<!-- <url>https://download.eclipse.org/tm4e/snapshots/</url> -->
441+
</repository>
442+
<!-- <repository>
443+
<id>chromium-binaries</id>
444+
<layout>p2</layout>
445+
<url>https://dl.maketechnology.io/chromium-cef/rls/repository</url>
446+
</repository> -->
447+
</repositories>
444448
<modules>
445449
<!-- Xterm modules -->
446-
<!-- <module>../eclipse-extensions/org.springframework.ide.eclipse.xterm</module>
447-
<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.feature</module>
448-
<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.linux.x86_64</module>
449-
<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.macosx.x86_64</module>
450-
<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.win32.x86_64</module>
451-
-->
450+
<!-- <module>../eclipse-extensions/org.springframework.ide.eclipse.xterm</module>
451+
<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.feature</module>
452+
<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.linux.x86_64</module>
453+
<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.macosx.x86_64</module>
454+
<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.win32.x86_64</module>
455+
-->
452456
<module>org.springframework.boot.ide.product.e435</module>
453457
</modules>
454458

‎eclipse-language-servers/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
<p2.qualifier>SNAPSHOT</p2.qualifier>
8080
<p2.repository.name>Spring Boot IDE Language Server</p2.repository.name>
8181

82-
<tycho-version>4.0.10</tycho-version>
82+
<tycho-version>4.0.12</tycho-version>
8383
<encoding>UTF-8</encoding>
8484

8585
<dist.bucket>tools-spring-io</dist.bucket>

‎headless-services/jdt-ls-extension/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
</modules>
4747

4848
<properties>
49-
<tycho-version>4.0.10</tycho-version>
49+
<tycho-version>4.0.12</tycho-version>
5050

5151
<!-- Signing -->
5252
<signing.skip>true</signing.skip>

0 commit comments

Comments
 (0)