Skip to content

Commit 0f1a0d4

Browse files
martinlippertmartinlippert
committed
added target definitions for e4.28 and removed those for e4.25
1 parent 07d0456 commit 0f1a0d4

File tree

12 files changed

+164
-172
lines changed

12 files changed

+164
-172
lines changed

‎eclipse-distribution/common/html/nightly-distributions.html

+8-8
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ <h2>Eclipse p2 repositories</h2>
2323

2424
<p><b>STS4 Distribution:</b>
2525
<ul>
26+
<li>for Eclipse 2023-06 (4.28): <a href="https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.28">https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.28</a></li>
2627
<li>for Eclipse 2023-03 (4.27): <a href="https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.27">https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.27</a></li>
2728
<li>for Eclipse 2022-12 (4.26): <a href="https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.26">https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.26</a></li>
28-
<li>for Eclipse 2022-09 (4.25): <a href="https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.25">https://dist.springsource.com/snapshot/TOOLS/sts4/nightly/e4.25</a></li>
2929
</ul>
3030
</p>
3131

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

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

43-
<h3>Spring Tool Suite 4 - based on Eclipse 2023-03 Milestone Builds (4.27.0)</h3>
43+
<h3>Spring Tool Suite 4 - based on Eclipse 2023-06 Milestone Builds (4.28.0)</h3>
44+
<div id="e428"></div>
45+
<script type="text/javascript">
46+
$('#e428').load('sts4-nightly-e4.28.html');
47+
</script>
48+
49+
<h3>Spring Tool Suite 4 - based on Eclipse 2023-03 Release (4.27.0)</h3>
4450
<div id="e427"></div>
4551
<script type="text/javascript">
4652
$('#e427').load('sts4-nightly-e4.27.html');
@@ -52,12 +58,6 @@ <h3>Spring Tool Suite 4 - based on Eclipse 2022-12 Release (4.26.0)</h3>
5258
$('#e426').load('sts4-nightly-e4.26.html');
5359
</script>
5460

55-
<h3>Spring Tool Suite 4 - based on Eclipse 2022-09 Release (4.25.0)</h3>
56-
<div id="e425"></div>
57-
<script type="text/javascript">
58-
$('#e425').load('sts4-nightly-e4.25.html');
59-
</script>
60-
6161
<h2>Spring Tools 4 - Visual Studio Code Extensions</h2>
6262

6363
<div id="vsix"></div>

‎eclipse-distribution/org.springframework.boot.ide.product.e418/.project

-17
This file was deleted.

‎eclipse-distribution/org.springframework.boot.ide.product.e424/category.xml renamed to ‎eclipse-distribution/org.springframework.boot.ide.product.e428/category.xml

+5-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@
9595
</feature>
9696
9797
<feature id="com.make.chromium.cef.feature"/>
98-
--> <feature id="org.eclipse.wildwebdeveloper.embedder.node.feature"/>
98+
-->
99+
<feature id="org.eclipse.wildwebdeveloper.embedder.node.feature"/>
99100

100101
<bundle id="org.springframework.tooling.ls.eclipse.commons" />
101102
<bundle id="org.springframework.tooling.ls.eclipse.commons.source" />
@@ -140,9 +141,12 @@
140141
<bundle id="org.apache.log4j"/>
141142
<bundle id="org.yaml.snakeyaml"/>
142143
<bundle id="org.eclipse.lsp4e"/>
144+
<bundle id="org.eclipse.lsp4e.debug"/>
143145
<bundle id="org.eclipse.lsp4e.jdt"/>
144146
<bundle id="org.eclipse.lsp4j"/>
147+
<bundle id="org.eclipse.lsp4j.debug"/>
145148
<bundle id="org.eclipse.lsp4j.jsonrpc"/>
149+
<bundle id="org.eclipse.lsp4j.jsonrpc.debug"/>
146150
<bundle id="org.eclipse.xtext.xbase.lib"/>
147151
<bundle id="org.eclipse.zest.core"/>
148152
<bundle id="org.eclipse.zest.layouts"/>

‎eclipse-distribution/org.springframework.boot.ide.product.e424/entitlements.plist renamed to ‎eclipse-distribution/org.springframework.boot.ide.product.e428/entitlements.plist

File renamed without changes.

‎eclipse-distribution/org.springframework.boot.ide.product.e424/macos-notarize.sh renamed to ‎eclipse-distribution/org.springframework.boot.ide.product.e428/macos-notarize.sh

File renamed without changes.

‎eclipse-distribution/org.springframework.boot.ide.product.e424/org.springframework.boot.ide.product renamed to ‎eclipse-distribution/org.springframework.boot.ide.product.e428/org.springframework.boot.ide.product

+12-10
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
</programArgs>
1212
<vmArgs>-Dosgi.requiredJavaVersion=17
1313
-Dosgi.dataAreaRequiresExplicitInit=true
14+
-Dsun.java.command=SpringToolSuite4
1415
-Xms256m
1516
-Xmx2048m
1617
--illegal-access=permit
@@ -58,6 +59,7 @@
5859
<feature id="org.eclipse.help" installMode="root"/>
5960

6061
<feature id="org.eclipse.jdt" installMode="root"/>
62+
<feature id="org.eclipse.jdt.bcoview.feature" installMode="root"/>
6163
<feature id="org.eclipse.jgit" installMode="root"/>
6264
<feature id="org.eclipse.jgit.lfs" installMode="root"/>
6365

@@ -69,7 +71,7 @@
6971
<feature id="org.eclipse.m2e.wtp.feature" installMode="root"/>
7072
<!-- <feature id="org.eclipse.m2e.wtp.jaxrs.feature" installMode="root"/> -->
7173
<!-- <feature id="org.eclipse.m2e.wtp.jsf.feature" installMode="root"/> -->
72-
<feature id="org.jboss.tools.maven.apt.feature" installMode="root"/>
74+
<!-- <feature id="org.jboss.tools.maven.apt.feature" installMode="root"/> -->
7375

7476
<!-- <feature id="org.eclipse.wst.web_ui.feature" installMode="root"/> -->
7577
<!-- <feature id="org.eclipse.wst.xml_ui.feature" installMode="root"/> -->
@@ -92,14 +94,14 @@
9294

9395
<feature id="org.eclipse.epp.mpc" installMode="root"/>
9496

95-
<feature id="org.sonatype.m2e.buildhelper.feature" installMode="root"/>
96-
<feature id="org.sonatype.m2e.mavenarchiver.feature" installMode="root"/>
97-
<!-- <feature id="org.sonatype.m2e.egit.feature" installMode="root"/> -->
97+
<!-- <feature id="org.sonatype.m2e.buildhelper.feature" installMode="root"/> -->
98+
<!-- <feature id="org.sonatype.m2e.mavenarchiver.feature" installMode="root"/> -->
99+
<feature id="org.sonatype.m2e.egit.feature" installMode="root"/>
98100
<feature id="org.jboss.tools.m2e.wro4j.feature" installMode="root"/>
99-
<feature id="com.ianbrandt.tools.m2e.mdp.feature" installMode="root"/>
100-
<feature id="m2e.chromatic.feature" installMode="root"/>
101+
<!-- <feature id="com.ianbrandt.tools.m2e.mdp.feature" installMode="root"/> -->
102+
<!-- <feature id="m2e.chromatic.feature" installMode="root"/> -->
101103

102-
<feature id="net.mihai-nita.ansicon" installMode="root"/>
104+
<!-- <feature id="net.mihai-nita.ansicon" installMode="root"/> -->
103105

104106
<feature id="org.eclipse.linuxtools.docker.feature" installMode="root"/>
105107
<feature id="org.eclipse.linuxtools.jdt.docker.launcher.feature" installMode="root"/>
@@ -111,9 +113,9 @@
111113
<feature id="org.springframework.ide.eclipse.xml.namespaces.feature" installMode="root"/>
112114

113115
<feature id="org.springframework.tooling.boot.ls.feature" installMode="root"/>
114-
<feature id="org.springframework.tooling.cloudfoundry.manifest.ls.feature" installMode="root"/>
115-
<feature id="org.springframework.tooling.bosh.ls.feature" installMode="root"/>
116-
<feature id="org.springframework.tooling.concourse.ls.feature" installMode="root"/>
116+
<!-- <feature id="org.springframework.tooling.cloudfoundry.manifest.ls.feature" installMode="root"/> -->
117+
<!-- <feature id="org.springframework.tooling.bosh.ls.feature" installMode="root"/> -->
118+
<!-- <feature id="org.springframework.tooling.concourse.ls.feature" installMode="root"/> -->
117119

118120
<!-- <feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/> -->
119121

‎eclipse-distribution/org.springframework.boot.ide.product.e424/p2.inf renamed to ‎eclipse-distribution/org.springframework.boot.ide.product.e428/p2.inf

File renamed without changes.

‎eclipse-distribution/org.springframework.boot.ide.product.e424/pom.xml renamed to ‎eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml

+31-24
Original file line numberDiff line numberDiff line change
@@ -495,20 +495,23 @@
495495
<target>
496496

497497
<property name="dmgName" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" />
498+
<property name="dmgName-aarch64" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" />
498499

499-
<exec executable="/bin/bash" failonerror="true">
500-
<arg value="${project.build.directory}/../macos-notarize.sh"/>
501-
<arg value="${dmgName}"/>
502-
<arg value="${env.MACOS_NOTARIZATION_SERVICE_URL}"/>
503-
</exec>
500+
<parallel failonany="true">
504501

505-
<property name="dmgName-aarch64" value="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" />
502+
<exec executable="/bin/bash" failonerror="true">
503+
<arg value="${project.build.directory}/../macos-notarize.sh" />
504+
<arg value="${dmgName}" />
505+
<arg value="${env.MACOS_NOTARIZATION_SERVICE_URL}" />
506+
</exec>
506507

507-
<exec executable="/bin/bash" failonerror="true">
508-
<arg value="${project.build.directory}/../macos-notarize.sh"/>
509-
<arg value="${dmgName-aarch64}"/>
510-
<arg value="${env.MACOS_NOTARIZATION_SERVICE_URL}"/>
511-
</exec>
508+
<exec executable="/bin/bash" failonerror="true">
509+
<arg value="${project.build.directory}/../macos-notarize.sh" />
510+
<arg value="${dmgName-aarch64}" />
511+
<arg value="${env.MACOS_NOTARIZATION_SERVICE_URL}" />
512+
</exec>
513+
514+
</parallel>
512515

513516
</target>
514517
</configuration>
@@ -526,17 +529,17 @@
526529
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
527530
<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
528531

529-
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="SHA1" fileext=".sha1" />
532+
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="SHA-256" fileext=".sha256" />
530533
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="MD5" fileext=".md5" />
531-
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" algorithm="SHA1" fileext=".sha1" />
534+
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" algorithm="SHA-256" fileext=".sha256" />
532535
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" algorithm="MD5" fileext=".md5" />
533-
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="SHA1" fileext=".sha1" />
536+
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="SHA-256" fileext=".sha256" />
534537
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="MD5" fileext=".md5" />
535-
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.aarch64.tar.gz" algorithm="SHA1" fileext=".sha1" />
538+
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.aarch64.tar.gz" algorithm="SHA-256" fileext=".sha256" />
536539
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.aarch64.tar.gz" algorithm="MD5" fileext=".md5" />
537-
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="SHA1" fileext=".sha1" />
540+
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="SHA-256" fileext=".sha256" />
538541
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.zip" algorithm="MD5" fileext=".md5" />
539-
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.self-extracting.jar" algorithm="SHA1" fileext=".sha1" />
542+
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.self-extracting.jar" algorithm="SHA-256" fileext=".sha256" />
540543
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-win32.win32.x86_64.self-extracting.jar" algorithm="MD5" fileext=".md5" />
541544

542545
<s3 accessKey="${dist.accessKey}" secretKey="${dist.secretKey}">
@@ -546,15 +549,19 @@
546549
<include name="spring-tool-suite-4*.zip" />
547550
<include name="spring-tool-suite-4*.zip.md5" />
548551
<include name="spring-tool-suite-4*.zip.sha1" />
552+
<include name="spring-tool-suite-4*.zip.sha256" />
549553
<include name="spring-tool-suite-4*.jar" />
550554
<include name="spring-tool-suite-4*.jar.md5" />
551555
<include name="spring-tool-suite-4*.jar.sha1" />
556+
<include name="spring-tool-suite-4*.jar.sha256" />
552557
<include name="spring-tool-suite-4*.tar.gz" />
553558
<include name="spring-tool-suite-4*.tar.gz.md5" />
554559
<include name="spring-tool-suite-4*.tar.gz.sha1" />
560+
<include name="spring-tool-suite-4*.tar.gz.sha256" />
555561
<include name="spring-tool-suite-4*.dmg" />
556562
<include name="spring-tool-suite-4*.dmg.md5" />
557563
<include name="spring-tool-suite-4*.dmg.sha1" />
564+
<include name="spring-tool-suite-4*.dmg.sha256" />
558565
</fileset>
559566
</delete>
560567

@@ -563,16 +570,16 @@
563570
<fileset dir="${project.build.directory}/products">
564571
<include name="spring-tool-suite-4*.zip" />
565572
<include name="spring-tool-suite-4*.zip.md5" />
566-
<include name="spring-tool-suite-4*.zip.sha1" />
573+
<include name="spring-tool-suite-4*.zip.sha256" />
567574
<include name="spring-tool-suite-4*.jar" />
568575
<include name="spring-tool-suite-4*.jar.md5" />
569-
<include name="spring-tool-suite-4*.jar.sha1" />
576+
<include name="spring-tool-suite-4*.jar.sha256" />
570577
<include name="spring-tool-suite-4*.tar.gz" />
571578
<include name="spring-tool-suite-4*.tar.gz.md5" />
572-
<include name="spring-tool-suite-4*.tar.gz.sha1" />
579+
<include name="spring-tool-suite-4*.tar.gz.sha256" />
573580
<include name="spring-tool-suite-4*.dmg" />
574581
<include name="spring-tool-suite-4*.dmg.md5" />
575-
<include name="spring-tool-suite-4*.dmg.sha1" />
582+
<include name="spring-tool-suite-4*.dmg.sha256" />
576583
</fileset>
577584
</upload>
578585

@@ -632,7 +639,7 @@
632639
</zipfileset>
633640
</zip>
634641

635-
<checksum file="${project.build.directory}/repository/${dist.file.name}" algorithm="SHA1" fileext=".sha1" />
642+
<checksum file="${project.build.directory}/repository/${dist.file.name}" algorithm="SHA-256" fileext=".sha256" />
636643
<checksum file="${project.build.directory}/repository/${dist.file.name}" algorithm="MD5" fileext=".md5" />
637644

638645
</target>
@@ -665,7 +672,7 @@
665672
<include name="features/**" />
666673
<include name="binary/**" />
667674
<include name="*.zip" />
668-
<include name="*.sha1" />
675+
<include name="*.sha256" />
669676
<include name="*.md5" />
670677
</fileset>
671678
</delete>
@@ -726,4 +733,4 @@
726733
</plugins>
727734
</pluginManagement> -->
728735
</build>
729-
</project>
736+
</project>

‎eclipse-distribution/org.springframework.boot.ide.product.e424/spring-tool-suite-4-dmg-config-e4.24-aarch64.json renamed to ‎eclipse-distribution/org.springframework.boot.ide.product.e428/spring-tool-suite-4-dmg-config-e4.28-aarch64.json

File renamed without changes.

‎eclipse-distribution/org.springframework.boot.ide.product.e424/spring-tool-suite-4-dmg-config-e4.24-x86.json renamed to ‎eclipse-distribution/org.springframework.boot.ide.product.e428/spring-tool-suite-4-dmg-config-e4.28-x86.json

File renamed without changes.

0 commit comments

Comments
 (0)