Skip to content

Commit

Permalink
updated eclipse build targets, removed 4.32 and added 4.35 targets
Browse files Browse the repository at this point in the history
  • Loading branch information
@martinlippert
martinlippert committed Dec 9, 2024
1 parent ea185e1 commit 4e7dccb
Show file tree
Hide file tree
Showing 8 changed files with 93 additions and 87 deletions.
16 changes: 8 additions & 8 deletions eclipse-distribution/common/html/nightly-distributions.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ <h2>Eclipse p2 repositories</h2>

<p><b>STS4 Distribution:</b>
<ul>
<li>for Eclipse 2024-12 (4.35): <a href="https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.35">https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.35</a></li>
<li>for Eclipse 2024-12 (4.34): <a href="https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.34">https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.34</a></li>
<li>for Eclipse 2024-09 (4.33): <a href="https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.33">https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.33</a></li>
<li>for Eclipse 2024-06 (4.32): <a href="https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.32">https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts4/nightly/e4.32</a></li>
</ul>
</p>

Expand All @@ -40,7 +40,13 @@ <h2>Eclipse p2 repositories</h2>

<h2>Eclipse-based Distribution Builds</h2>

<h3>Spring Tool Suite 4 - based on Eclipse 2024-12 Milstone Builds (4.34.0)</h3>
<h3>Spring Tool Suite 4 - based on Eclipse 2025-03 Milstone Builds (4.35.0)</h3>
<div id="e435"></div>
<script type="text/javascript">
$('#e435').load('sts4-nightly-e4.35.html');
</script>

<h3>Spring Tool Suite 4 - based on Eclipse 2024-12 Release (4.34.0)</h3>
<div id="e434"></div>
<script type="text/javascript">
$('#e434').load('sts4-nightly-e4.34.html');
Expand All @@ -52,12 +58,6 @@ <h3>Spring Tool Suite 4 - based on Eclipse 2024-09 Release (4.33.0)</h3>
$('#e433').load('sts4-nightly-e4.33.html');
</script>

<h3>Spring Tool Suite 4 - based on Eclipse 2024-06 Release (4.32.0)</h3>
<div id="e432"></div>
<script type="text/javascript">
$('#e432').load('sts4-nightly-e4.32.html');
</script>

<h2>Spring Tools 4 - Visual Studio Code Extensions</h2>

<div id="vsix"></div>
Expand Down
4 changes: 2 additions & 2 deletions ...mework.boot.ide.product.e432/category.xml → ...mework.boot.ide.product.e435/category.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@
<!-- <bundle id="javax.ws.rs"/> -->
<!-- <bundle id="javax.xml.bind"/> -->
<!-- <bundle id="javax.xml.bind.source"/> -->
<bundle id="javax.xml.stream"/>
<!-- <bundle id="javax.xml.stream"/> -->
<bundle id="org.aopalliance"/>
<bundle id="org.apache.log4j"/>
<bundle id="org.yaml.snakeyaml"/>
Expand All @@ -155,7 +155,7 @@
<bundle id="com.google.gson"/>
<bundle id="org.jcodings"/>
<bundle id="org.joni"/>
<bundle id="org.json"/>
<bundle id="json"/>
<bundle id="org.jsoup"/>
<bundle id="org.apache.commons.lang3"/>
<bundle id="org.apache.commons.collections"/>
Expand Down
0 ...e432/org.springframework.boot.ide.product → ...e435/org.springframework.boot.ide.product
View file
File renamed without changes.
0 ...ingframework.boot.ide.product.e432/p2.inf → ...ingframework.boot.ide.product.e435/p2.inf
View file
File renamed without changes.
0 ...ngframework.boot.ide.product.e432/pom.xml → ...ngframework.boot.ide.product.e435/pom.xml
View file
File renamed without changes.
83 changes: 44 additions & 39 deletions eclipse-distribution/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,26 +130,26 @@
</profile>

<profile>
<id>e432</id>
<id>e433</id>
<properties>
<dist.target>e4.32.0</dist.target>
<dist.target.major>e4.32</dist.target.major>
<dist.platform.name>2024-06</dist.platform.name>
<dist.platform.name.long>2024-06 (4.32)</dist.platform.name.long>
<dist.platform.id>2024-06</dist.platform.id>
<dist.platform.version>4.32.0</dist.platform.version>
<package.qualifierPrefix>e432</package.qualifierPrefix>
<dist.target>e4.33.0</dist.target>
<dist.target.major>e4.33</dist.target.major>
<dist.platform.name>2024-09</dist.platform.name>
<dist.platform.name.long>2024-09 (4.33)</dist.platform.name.long>
<dist.platform.id>2024-09</dist.platform.id>
<dist.platform.version>4.33.0</dist.platform.version>
<package.qualifierPrefix>e433</package.qualifierPrefix>
</properties>
<repositories>
<repository>
<id>2024-06</id>
<id>2024-09</id>
<layout>p2</layout>
<url>https://download.eclipse.org/releases/2024-06/</url>
<url>https://download.eclipse.org/releases/2024-09/</url>
</repository>
<repository>
<id>orbit</id>
<layout>p2</layout>
<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06</url>
<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09</url>
</repository>
<repository> <!-- temporary p2 repo to grab early snapshot builds for testing fixes -->
<id>buildship-snapshots</id>
Expand Down Expand Up @@ -206,8 +206,8 @@
<repository>
<id>lsp4e</id>
<layout>p2</layout>
<!-- <url>https://download.eclipse.org/lsp4e/releases/0.26.0/</url> -->
<url>https://download.eclipse.org/lsp4e/snapshots/</url>
<url>https://download.eclipse.org/lsp4e/releases/0.26.7/</url>
<!-- <url>https://download.eclipse.org/lsp4e/snapshots/</url> -->
</repository>
<repository>
<id>tm4e-snapshots</id>
Expand All @@ -229,32 +229,32 @@
<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.macosx.x86_64</module>
<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.win32.x86_64</module>
-->
<module>org.springframework.boot.ide.product.e432</module>
<module>org.springframework.boot.ide.product.e433</module>
</modules>

</profile>

<profile>
<id>e433</id>
<id>e434</id>
<properties>
<dist.target>e4.33.0</dist.target>
<dist.target.major>e4.33</dist.target.major>
<dist.platform.name>2024-09</dist.platform.name>
<dist.platform.name.long>2024-09 (4.33)</dist.platform.name.long>
<dist.platform.id>2024-09</dist.platform.id>
<dist.platform.version>4.33.0</dist.platform.version>
<package.qualifierPrefix>e433</package.qualifierPrefix>
<dist.target>e4.34.0</dist.target>
<dist.target.major>e4.34</dist.target.major>
<dist.platform.name>2024-12</dist.platform.name>
<dist.platform.name.long>2024-12 (4.34)</dist.platform.name.long>
<dist.platform.id>2024-12</dist.platform.id>
<dist.platform.version>4.34.0</dist.platform.version>
<package.qualifierPrefix>e434</package.qualifierPrefix>
</properties>
<repositories>
<repository>
<id>2024-09</id>
<id>2024-12</id>
<layout>p2</layout>
<url>https://download.eclipse.org/releases/2024-09/</url>
<url>https://download.eclipse.org/releases/2024-12/</url>
</repository>
<repository>
<id>orbit</id>
<layout>p2</layout>
<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09</url>
<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12</url>
</repository>
<repository> <!-- temporary p2 repo to grab early snapshot builds for testing fixes -->
<id>buildship-snapshots</id>
Expand Down Expand Up @@ -311,7 +311,7 @@
<repository>
<id>lsp4e</id>
<layout>p2</layout>
<!-- <url>https://download.eclipse.org/lsp4e/releases/0.26.0/</url> -->
<!-- <url>https://download.eclipse.org/lsp4e/releases/0.26.7/</url> -->
<url>https://download.eclipse.org/lsp4e/snapshots/</url>
</repository>
<repository>
Expand All @@ -334,32 +334,37 @@
<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.macosx.x86_64</module>
<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.win32.x86_64</module>
-->
<module>org.springframework.boot.ide.product.e433</module>
<module>org.springframework.boot.ide.product.e434</module>
</modules>

</profile>

<profile>
<id>e434</id>
<id>e435</id>
<properties>
<dist.target>e4.34.0</dist.target>
<dist.target.major>e4.34</dist.target.major>
<dist.platform.name>2024-12</dist.platform.name>
<dist.platform.name.long>2024-12 (4.34)</dist.platform.name.long>
<dist.platform.id>2024-12</dist.platform.id>
<dist.platform.version>4.34.0</dist.platform.version>
<package.qualifierPrefix>e434</package.qualifierPrefix>
<dist.target>e4.35.0</dist.target>
<dist.target.major>e4.35</dist.target.major>
<dist.platform.name>2025-03</dist.platform.name>
<dist.platform.name.long>2025-03 (4.35)</dist.platform.name.long>
<dist.platform.id>2025-03</dist.platform.id>
<dist.platform.version>4.35.0</dist.platform.version>
<package.qualifierPrefix>e435</package.qualifierPrefix>
</properties>
<repositories>
<repository>
<id>2024-12</id>
<id>2025-03</id>
<layout>p2</layout>
<url>https://download.eclipse.org/staging/2025-03/</url>
</repository>
<repository>
<id>2025-03-i-builds</id>
<layout>p2</layout>
<url>https://download.eclipse.org/staging/2024-12/</url>
<url>https://download.eclipse.org/eclipse/updates/4.35-I-builds/</url>
</repository>
<repository>
<id>orbit</id>
<layout>p2</layout>
<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12</url>
<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-03</url>
</repository>
<repository> <!-- temporary p2 repo to grab early snapshot builds for testing fixes -->
<id>buildship-snapshots</id>
Expand Down Expand Up @@ -439,7 +444,7 @@
<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.macosx.x86_64</module>
<module>../eclipse-extensions/org.springframework.ide.eclipse.xterm.win32.x86_64</module>
-->
<module>org.springframework.boot.ide.product.e434</module>
<module>org.springframework.boot.ide.product.e435</module>
</modules>

</profile>
Expand Down
71 changes: 36 additions & 35 deletions eclipse-language-servers/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,26 +139,26 @@
</profile>

<profile>
<id>e432</id>
<id>e433</id>
<properties>
<dist.target>e4.32.0</dist.target>
<dist.target.major>e4.32</dist.target.major>
<dist.platform.name>2024-06</dist.platform.name>
<dist.platform.name.long>2024-06 (4.32)</dist.platform.name.long>
<dist.platform.id>2024-06</dist.platform.id>
<dist.platform.version>4.32</dist.platform.version>
<package.qualifierPrefix>e432</package.qualifierPrefix>
<dist.target>e4.33.0</dist.target>
<dist.target.major>e4.33</dist.target.major>
<dist.platform.name>2024-09</dist.platform.name>
<dist.platform.name.long>2024-09 (4.33)</dist.platform.name.long>
<dist.platform.id>2024-09</dist.platform.id>
<dist.platform.version>4.33</dist.platform.version>
<package.qualifierPrefix>e433</package.qualifierPrefix>
</properties>
<repositories>
<repository>
<id>2024-06</id>
<id>2024-09</id>
<layout>p2</layout>
<url>https://download.eclipse.org/releases/2024-06/</url>
<url>https://download.eclipse.org/releases/2024-09/</url>
</repository>
<repository>
<id>orbit</id>
<layout>p2</layout>
<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-06</url>
<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09</url>
</repository>
<!-- <repository>
<id>mylyn-markdown</id>
Expand Down Expand Up @@ -187,26 +187,26 @@
</profile>

<profile>
<id>e433</id>
<id>e434</id>
<properties>
<dist.target>e4.33.0</dist.target>
<dist.target.major>e4.33</dist.target.major>
<dist.platform.name>2024-09</dist.platform.name>
<dist.platform.name.long>2024-09 (4.33)</dist.platform.name.long>
<dist.platform.id>2024-09</dist.platform.id>
<dist.platform.version>4.33</dist.platform.version>
<package.qualifierPrefix>e433</package.qualifierPrefix>
<dist.target>e4.34.0</dist.target>
<dist.target.major>e4.34</dist.target.major>
<dist.platform.name>2024-12</dist.platform.name>
<dist.platform.name.long>2024-12 (4.34)</dist.platform.name.long>
<dist.platform.id>2024-12</dist.platform.id>
<dist.platform.version>4.34</dist.platform.version>
<package.qualifierPrefix>e434</package.qualifierPrefix>
</properties>
<repositories>
<repository>
<id>2024-09</id>
<id>2024-12</id>
<layout>p2</layout>
<url>https://download.eclipse.org/releases/2024-09/</url>
<url>https://download.eclipse.org/releases/2024-12/</url>
</repository>
<repository>
<id>orbit</id>
<layout>p2</layout>
<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-09</url>
<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12</url>
</repository>
<!-- <repository>
<id>mylyn-markdown</id>
Expand All @@ -216,7 +216,7 @@
<repository>
<id>lsp4e</id>
<layout>p2</layout>
<url>https://download.eclipse.org/lsp4e/releases/0.26.0/</url>
<url>https://download.eclipse.org/lsp4e/releases/0.26.7/</url>
<!-- <url>https://download.eclipse.org/lsp4e/snapshots</url> -->
</repository>
<repository>
Expand All @@ -235,26 +235,26 @@
</profile>

<profile>
<id>e434</id>
<id>e435</id>
<properties>
<dist.target>e4.34.0</dist.target>
<dist.target.major>e4.34</dist.target.major>
<dist.platform.name>2024-12</dist.platform.name>
<dist.platform.name.long>2024-12 (4.34)</dist.platform.name.long>
<dist.platform.id>2024-12</dist.platform.id>
<dist.platform.version>4.34</dist.platform.version>
<package.qualifierPrefix>e434</package.qualifierPrefix>
<dist.target>e4.35.0</dist.target>
<dist.target.major>e4.35</dist.target.major>
<dist.platform.name>2025-03</dist.platform.name>
<dist.platform.name.long>2025-03 (4.35)</dist.platform.name.long>
<dist.platform.id>2025-03</dist.platform.id>
<dist.platform.version>4.35</dist.platform.version>
<package.qualifierPrefix>e435</package.qualifierPrefix>
</properties>
<repositories>
<repository>
<id>2024-12</id>
<id>2025-03</id>
<layout>p2</layout>
<url>https://download.eclipse.org/staging/2024-12/</url>
<url>https://download.eclipse.org/staging/2025-03/</url>
</repository>
<repository>
<id>orbit</id>
<layout>p2</layout>
<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2024-12</url>
<url>https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/2025-03</url>
</repository>
<!-- <repository>
<id>mylyn-markdown</id>
Expand All @@ -264,7 +264,7 @@
<repository>
<id>lsp4e</id>
<layout>p2</layout>
<url>https://download.eclipse.org/lsp4e/releases/0.26.0/</url>
<url>https://download.eclipse.org/lsp4e/releases/0.26.7/</url>
<!-- <url>https://download.eclipse.org/lsp4e/snapshots</url> -->
</repository>
<repository>
Expand All @@ -281,6 +281,7 @@
</repository>
</repositories>
</profile>

</profiles>

<repositories>
Expand Down
6 changes: 3 additions & 3 deletions headless-services/jdt-ls-extension/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,16 +96,16 @@
<repositories>
<!-- composite update site contains http references, using exact https urls instead -->
<repository>
<id>eclipse-2023-09</id>
<id>eclipse-2024-09</id>
<layout>p2</layout>
<url>https://download.eclipse.org/releases/2023-12</url>
<url>https://download.eclipse.org/releases/2024-09</url>
</repository>

<repository>
<id>JDT.LS</id>
<layout>p2</layout>
<!-- <url>${jdt.ls.updatesite}</url> -->
<url>https://download.eclipse.org/jdtls/milestones/1.30.1/repository/</url>
<url>https://download.eclipse.org/jdtls/milestones/1.40.0/repository/</url>
<!-- <url>https://download.eclipse.org/jdtls/snapshots/repository/latest/</url> -->
<!-- The latest JDT LS requires a JDK 17, so we need to run builds on a JDK 17 and raise the minimum level to JDK 17 -->
<!-- In order to avoid this for the 2022-06-based release, I set the JDK LS version here to the latest milestone that does NOT require JDK 17 yet -->
Expand Down

0 comments on commit 4e7dccb

Please sign in to comment.