Skip to content

Commit 0ca0e8c

Browse files
BoykoAlexBoykoAlex
committed
Revert breaking changes from cherry-picked commits
1 parent f986ba1 commit 0ca0e8c

File tree

1 file changed

+70
-76
lines changed

1 file changed

+70
-76
lines changed

‎eclipse-distribution/pom.xml‎

Lines changed: 70 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@
6565

6666
<properties>
6767
<p2.qualifier>${buildQualifier}-SNAPSHOT</p2.qualifier>
68-
<p2.repository.name>Spring Tool Suite</p2.repository.name>
68+
<p2.repository.name>Spring Tools for Eclipse</p2.repository.name>
6969

70-
<dist.name>Spring Tool Suite 4</dist.name>
70+
<dist.name>Spring Tools for Eclipse</dist.name>
7171

7272
<dist.key>TOOLS</dist.key>
7373

@@ -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>
@@ -311,8 +316,8 @@
311316
<repository>
312317
<id>lsp4e</id>
313318
<layout>p2</layout>
314-
<url>https://download.eclipse.org/lsp4e/releases/0.27.1/</url>
315-
<!-- <url>https://download.eclipse.org/lsp4e/snapshots/</url> -->
319+
<!-- <url>https://download.eclipse.org/lsp4e/releases/0.27.1/</url>-->
320+
<url>https://download.eclipse.org/lsp4e/snapshots/</url>
316321
</repository>
317322
<repository>
318323
<id>tm4e-snapshots</id>
@@ -334,54 +339,43 @@
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> -->
364363
<repository>
365364
<id>orbit</id>
366365
<layout>p2</layout>
367-
<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-03</url>
366+
<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-06</url>
368367
</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> -->
374368
<repository> <!-- temporary p2 repo to grab early snapshot builds for testing fixes -->
375369
<id>buildship-snapshots</id>
376370
<layout>p2</layout>
377-
<!-- <url>https://download.eclipse.org/buildship/updates/latest-snapshot/</url>-->
371+
<!-- <url>https://download.eclipse.org/buildship/updates/latest-snapshot/</url>-->
378372
<url>https://download.eclipse.org/buildship/updates/latest</url>
379373
</repository>
380374
<repository>
381375
<id>m2e</id>
382376
<layout>p2</layout>
383377
<url>https://download.eclipse.org/technology/m2e/releases/latest/</url>
384-
<!-- <url>https://download.eclipse.org/technology/m2e/snapshots/latest/</url>-->
378+
<!-- <url>https://download.eclipse.org/technology/m2e/snapshots/latest/</url>-->
385379
</repository>
386380
<repository>
387381
<id>latest-m2e-wtp-release</id>
@@ -408,11 +402,11 @@
408402
<layout>p2</layout>
409403
<url>https://ianbrandt.github.io/m2e-maven-dependency-plugin/</url>
410404
</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> -->
405+
<!-- <repository>
406+
<id>mylyn-markdown</id>
407+
<layout>p2</layout>
408+
<url>https://download.eclipse.org/mylyn/docs/releases/3.0.45/</url>
409+
</repository> -->
416410
<repository>
417411
<id>wildwebdeveloper</id>
418412
<layout>p2</layout>
@@ -426,30 +420,30 @@
426420
<repository>
427421
<id>lsp4e</id>
428422
<layout>p2</layout>
429-
<url>https://download.eclipse.org/lsp4e/releases/0.27.1/</url>
430-
<!-- <url>https://download.eclipse.org/lsp4e/snapshots/</url> -->
423+
<!--<url>https://download.eclipse.org/lsp4e/releases/0.27.1/</url>-->
424+
<url>https://download.eclipse.org/lsp4e/snapshots/</url>
431425
</repository>
432426
<repository>
433427
<id>tm4e-snapshots</id>
434428
<layout>p2</layout>
435429
<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>
430+
<!-- <url>https://download.eclipse.org/tm4e/snapshots/</url> -->
431+
</repository>
432+
<!-- <repository>
433+
<id>chromium-binaries</id>
434+
<layout>p2</layout>
435+
<url>https://dl.maketechnology.io/chromium-cef/rls/repository</url>
436+
</repository> -->
437+
</repositories>
444438
<modules>
445439
<!-- 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-
-->
452-
<module>org.springframework.boot.ide.product.e435</module>
440+
<!-- <module>../eclipse-extensions/org.springframework.ide.eclipse.xterm</module>
441+
<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.feature</module>
442+
<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.linux.x86_64</module>
443+
<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.macosx.x86_64</module>
444+
<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.win32.x86_64</module>
445+
-->
446+
<module>org.springframework.boot.ide.product.e436</module>
453447
</modules>
454448

455449
</profile>

0 commit comments

Comments
 (0)