Skip to content

Commit 2242a7e

Browse files
committed
Regenerate catalogs and include the JustJ 25 release
1 parent 05017f6 commit 2242a7e

File tree

6 files changed

+104
-63
lines changed

6 files changed

+104
-63
lines changed

plugins/org.eclipse.oomph.setup.installer/src/org/eclipse/oomph/setup/internal/installer/ProductCatalogGenerator.java

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2949,7 +2949,23 @@ private Macro getJREs() throws ProvisionException, URISyntaxException, SAXExcept
29492949
String description = iu.getProperty(IInstallableUnit.PROP_DESCRIPTION, null);
29502950
p2Task.setDescription(description);
29512951

2952-
if (osgiVersion.getMajor() >= 18)
2952+
if (osgiVersion.getMajor() >= 25)
2953+
{
2954+
Annotation jreSpecificTasks = BaseFactory.eINSTANCE.createAnnotation(AnnotationConstants.ANNOTATION_JRE_SPECIFIC_TASKS);
2955+
EclipseIniTask addOpensJavaLangTask = SetupFactory.eINSTANCE.createEclipseIniTask();
2956+
addOpensJavaLangTask.setOption("--add-opens=java.base/java.lang=ALL-UNNAMED");
2957+
addOpensJavaLangTask.setVm(true);
2958+
jreSpecificTasks.getContents().add(addOpensJavaLangTask);
2959+
2960+
EclipseIniTask allowSecurityManagerTask = SetupFactory.eINSTANCE.createEclipseIniTask();
2961+
allowSecurityManagerTask.setOption("-Djava.security.manager");
2962+
allowSecurityManagerTask.setValue("=disallow");
2963+
allowSecurityManagerTask.setVm(true);
2964+
jreSpecificTasks.getContents().add(allowSecurityManagerTask);
2965+
2966+
p2Task.getAnnotations().add(jreSpecificTasks);
2967+
}
2968+
else if (osgiVersion.getMajor() >= 18)
29532969
{
29542970
Annotation jreSpecificTasks = BaseFactory.eINSTANCE.createAnnotation(AnnotationConstants.ANNOTATION_JRE_SPECIFIC_TASKS);
29552971
EclipseIniTask addOpensJavaLangTask = SetupFactory.eINSTANCE.createEclipseIniTask();

setups/org.eclipse.all.product.setup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
label="Eclipse Eierlegende Wollmilchsau (Staging)">
5858
<requirement
5959
name="org.eclipse.platform.ide"
60-
versionRange="[4.37.0,5.0.0)"
60+
versionRange="[4.38.0,5.0.0)"
6161
filter="(|(&amp;(osgi.arch=aarch64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=aarch64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=aarch64)(osgi.os=win32)(osgi.ws=win32))(&amp;(osgi.arch=riscv64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=win32)(osgi.ws=win32)))"/>
6262
<requirement
6363
name="Application Development Frameworks"/>

setups/org.eclipse.birt.product.setup

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
</detail>
2424
</annotation>
2525
<version name="release"
26-
label="Release (4.20)"
26+
label="Release (4.21)"
2727
requiredJavaVersion="21">
2828
<annotation
2929
source="http://www.eclipse.org/oomph/setup/BrandingInfo">
@@ -34,7 +34,7 @@
3434
</annotation>
3535
<setupTask
3636
xsi:type="setup.p2:P2Task"
37-
label="BIRT - Release (4.20)">
37+
label="BIRT - Release (4.21)">
3838
<requirement
3939
name="org.eclipse.birt.report.designer.all"
4040
filter="(|(&amp;(osgi.arch=aarch64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=aarch64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=win32)(osgi.ws=win32)))"/>
@@ -263,7 +263,7 @@
263263
</setupTask>
264264
</version>
265265
<version name="nightly"
266-
label="Nightly (4.21)"
266+
label="Nightly (4.22)"
267267
requiredJavaVersion="21">
268268
<annotation
269269
source="http://www.eclipse.org/oomph/setup/BrandingInfo">
@@ -274,7 +274,7 @@
274274
</annotation>
275275
<setupTask
276276
xsi:type="setup.p2:P2Task"
277-
label="BIRT - Nightly (4.21)">
277+
label="BIRT - Nightly (4.22)">
278278
<requirement
279279
name="org.eclipse.birt.report.designer.all"
280280
filter="(|(&amp;(osgi.arch=aarch64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=aarch64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=linux)(osgi.ws=gtk))(&amp;(osgi.arch=x86_64)(osgi.os=macosx)(osgi.ws=cocoa))(&amp;(osgi.arch=x86_64)(osgi.os=win32)(osgi.ws=win32)))"/>

setups/org.eclipse.jres.setup

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,30 @@
9090
Provides the complete set of modules of the JDK, excluding incubators.
9191
</description>
9292
</setupTask>
93+
<setupTask
94+
xsi:type="setup.p2:P2Task"
95+
label="JRE 25.0.0">
96+
<annotation
97+
source="http://www.eclipse.org/oomph/setup/JRESpecificTasks">
98+
<content
99+
xsi:type="setup:EclipseIniTask"
100+
option="--add-opens=java.base/java.lang=ALL-UNNAMED"
101+
vm="true"/>
102+
<content
103+
xsi:type="setup:EclipseIniTask"
104+
option="-Djava.security.manager"
105+
value="=disallow"
106+
vm="true"/>
107+
</annotation>
108+
<requirement
109+
name="org.eclipse.justj.openjdk.hotspot.jre.full.feature.group"
110+
filter="(|(&amp;(osgi.arch=aarch64)(osgi.os=linux))(&amp;(osgi.arch=aarch64)(osgi.os=macosx))(&amp;(osgi.arch=ppc64le)(osgi.os=linux))(&amp;(osgi.arch=riscv64)(osgi.os=linux))(&amp;(osgi.arch=x86_64)(osgi.os=linux))(&amp;(osgi.arch=x86_64)(osgi.os=macosx))(&amp;(osgi.arch=x86_64)(osgi.os=win32)))"/>
111+
<repository
112+
url="https://download.eclipse.org/justj/jres/25/updates/release/latest"/>
113+
<description>
114+
Contains the plug-ins and fragments for the Adoptium OpenJDK Hotspot JRE Complete.
115+
Provides the complete set of modules of the JDK, excluding incubators.
116+
</description>
117+
</setupTask>
93118
<description>The JRE macro provides tasks for installing JREs from JustJ's p2 update sites</description>
94119
</setup:Macro>

setups/org.eclipse.platform.sdk.product.setup

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
source="http://www.eclipse.org/oomph/setup/BrandingInfo">
8686
<detail
8787
key="siteURI">
88-
<value>https://download.eclipse.org/eclipse/downloads/</value>
88+
<value>https://archive.eclipse.org/eclipse/downloads/drops4/R-4.37-202509050730/</value>
8989
</detail>
9090
<detail
9191
key="shortcut">
@@ -141,7 +141,7 @@
141141
</detail>
142142
<detail
143143
key="siteURI">
144-
<value>https://download.eclipse.org/eclipse/downloads/</value>
144+
<value>https://archive.eclipse.org/eclipse/downloads/drops4/R-4.37-202509050730/</value>
145145
</detail>
146146
<detail
147147
key="shortcut">

0 commit comments

Comments
 (0)