Skip to content

Commit

Permalink
Updated build for justJ java - (Task #1184)
Browse files Browse the repository at this point in the history
- Integarted justJ jre 17 to Virsat builds for server and core

---
Task #1184: Updating to Eclipse 2024/03 and all dependencies
  • Loading branch information
PhilMFischer committed May 7, 2024
1 parent 5ee6416 commit c92a023
Show file tree
Hide file tree
Showing 7 changed files with 116 additions and 157 deletions.
43 changes: 25 additions & 18 deletions de.dlr.sc.virsat.product/virsat_core.product
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="VirSat 4 - Core" uid="de.dlr.virsat.core.product" id="de.dlr.sc.virsat.branding.ui.VirSat_Core" application="org.eclipse.ui.ide.workbench" version="4.16.0.qualifier" useFeatures="true" includeLaunchers="true">
<product name="VirSat 4 - Core" uid="de.dlr.virsat.core.product" id="de.dlr.sc.virsat.branding.ui.VirSat_Core" application="org.eclipse.ui.ide.workbench" version="4.16.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">

<aboutInfo>
<image path="/de.dlr.sc.virsat.branding.ui/resources/images/Branding/Configuration.gif"/>
Expand Down Expand Up @@ -30,17 +30,19 @@ Germany
<launcherArgs>
<programArgs>-console -consoleLog
</programArgs>
<vmArgs>-Dosgi.requiredJavaVersion=11
-Dsun.java.command=Eclipse
-XX:+UseG1GC
-XX:+UseStringDeduplication
-Dosgi.dataAreaRequiresExplicitInit=true
-Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true
-Xms256m
-Xmx2048m
<vmArgs>-Dosgi.requiredJavaVersion=17
-Dosgi.instance.area.default=@user.home/eclipse-workspace
-Dosgi.dataAreaRequiresExplicitInit=true
-Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true
-Declipse.e4.inject.jakarta.warning=false
-Dsun.java.command=VirSat4_Core
-Xms256m
-Xmx2048m
-XX:+UseG1GC
-XX:+UseStringDeduplication
--add-modules=ALL-SYSTEM
-Djava.security.manager=allow
</vmArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
</vmArgsMac>
</launcherArgs>

<windowImages i16="/de.dlr.sc.virsat.branding.ui/resources/images/Branding/VirSat16.gif" i32="/de.dlr.sc.virsat.branding.ui/resources/images/Branding/VirSat32.gif" i48="/de.dlr.sc.virsat.branding.ui/resources/images/Branding/VirSat48.gif" i64="/de.dlr.sc.virsat.branding.ui/resources/images/Branding/VirSat64.gif" i128="/de.dlr.sc.virsat.branding.ui/resources/images/Branding/VirSat128.gif"/>
Expand All @@ -66,6 +68,7 @@ Germany
<intro introId="de.dlr.sc.virsat.branding.ui.intro"/>

<vm>
<linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</linux>
<windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17</windows>
</vm>

Expand Down Expand Up @@ -118,13 +121,7 @@ Germany
<feature id="org.eclipse.emf.workspace" installMode="root"/>
<feature id="org.eclipse.emf.databinding" installMode="root"/>
<feature id="org.eclipse.emf.validation" installMode="root"/>
<feature id="org.eclipse.ecf.core.feature" installMode="root"/>
<feature id="org.eclipse.ecf.core.ssl.feature" installMode="root"/>
<feature id="org.eclipse.ecf.filetransfer.feature" installMode="root"/>
<feature id="org.eclipse.ecf.filetransfer.ssl.feature" installMode="root"/>
<feature id="org.eclipse.ecf.filetransfer.httpclient5.feature" installMode="root"/>
<feature id="org.eclipse.team.svn" installMode="root"/>
<feature id="org.eclipse.ocl" installMode="root"/>
<feature id="org.eclipse.emf.compare" installMode="root"/>
<feature id="org.eclipse.xtext.xbase.lib" installMode="root"/>
<feature id="org.eclipse.xtext.xbase" installMode="root"/>
Expand All @@ -151,6 +148,16 @@ Germany
<feature id="org.eclipse.rmf.reqif10.feature" installMode="root"/>
<feature id="org.eclipse.rmf.reqif10.pror.feature" installMode="root"/>
<feature id="org.eclipse.rmf.reqif10.thirdparty.feature" installMode="root"/>
<feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/>
<feature id="de.dlr.sc.virsat.server.feature" installMode="root"/>
<feature id="org.eclipse.ecf.core.ssl.feature" installMode="root"/>
<feature id="org.eclipse.ecf.filetransfer.ssl.feature" installMode="root"/>
<feature id="org.eclipse.ecf.filetransfer.feature" installMode="root"/>
<feature id="org.eclipse.ecf.filetransfer.httpclientjava.feature" installMode="root"/>
<feature id="org.eclipse.ocl.tools" installMode="root"/>
<feature id="org.eclipse.ecf.filetransfer.httpclient5.feature" installMode="root"/>
<feature id="org.eclipse.ocl" installMode="root"/>
<feature id="org.eclipse.ecf.core.feature" installMode="root"/>
</features>

<configurations>
Expand All @@ -163,7 +170,7 @@ Germany
</configurations>

<repositories>
<repository location="http://community.polarion.com/projects/subversive/download/eclipse/6.0/update-site/" enabled="true" />
<repository location="http://community.polarion.com/projects/subversive/download/eclipse/6.0/update-site/" name="" enabled="true" />
</repositories>

<preferencesInfo>
Expand Down
90 changes: 65 additions & 25 deletions de.dlr.sc.virsat.product/virsat_server.product
Original file line number Diff line number Diff line change
@@ -1,14 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>

<product name="Virtual Satellite 4 - Headless Server" uid="de.dlr.virsat.server.product" application="de.dlr.sc.virsat.server.application" version="4.16.0.qualifier" useFeatures="true" includeLaunchers="true">
<product name="Virtual Satellite 4 - Headless Server" uid="de.dlr.virsat.server.product" application="de.dlr.sc.virsat.server.application" version="4.16.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">

<configIni use="default">
</configIni>

<launcherArgs>
<programArgs>-consoleLog -console
</programArgs>
<vmArgs>-Dosgi.requiredJavaVersion=17
-Dosgi.instance.area.default=@user.home/eclipse-workspace
-Dosgi.dataAreaRequiresExplicitInit=true
-Dorg.eclipse.swt.graphics.Resource.reportNonDisposed=true
-Declipse.e4.inject.jakarta.warning=false
-Dsun.java.command=VirSat4_Server
-Xms256m
-Xmx2048m
-XX:+UseG1GC
-XX:+UseStringDeduplication
--add-modules=ALL-SYSTEM
-Djava.security.manager=allow
</vmArgs>
<vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts
</vmArgsMac>
</launcherArgs>
Expand All @@ -28,18 +41,18 @@

<plugins>
<plugin id="de.dlr.sc.virsat.apps"/>
<plugin id="de.dlr.sc.virsat.apps.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.apps.test"/>
<plugin id="de.dlr.sc.virsat.apps.ui"/>
<plugin id="de.dlr.sc.virsat.branding.ui"/>
<plugin id="de.dlr.sc.virsat.build"/>
<plugin id="de.dlr.sc.virsat.build.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.build.test"/>
<plugin id="de.dlr.sc.virsat.build.ui"/>
<plugin id="de.dlr.sc.virsat.commons"/>
<plugin id="de.dlr.sc.virsat.commons.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.commons.test"/>
<plugin id="de.dlr.sc.virsat.commons.ui"/>
<plugin id="de.dlr.sc.virsat.concept.unittest.util"/>
<plugin id="de.dlr.sc.virsat.excel"/>
<plugin id="de.dlr.sc.virsat.excel.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.excel.test"/>
<plugin id="de.dlr.sc.virsat.excel.ui"/>
<plugin id="de.dlr.sc.virsat.external.lib"/>
<plugin id="de.dlr.sc.virsat.external.lib.apache.poi"/>
Expand All @@ -57,68 +70,68 @@
<plugin id="de.dlr.sc.virsat.external.lib.zmq.linux.x86_64"/>
<plugin id="de.dlr.sc.virsat.external.lib.zmq.win32.x86_64"/>
<plugin id="de.dlr.sc.virsat.graphiti"/>
<plugin id="de.dlr.sc.virsat.graphiti.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.graphiti.test"/>
<plugin id="de.dlr.sc.virsat.graphiti.ui"/>
<plugin id="de.dlr.sc.virsat.javadoc.api"/>
<plugin id="de.dlr.sc.virsat.model"/>
<plugin id="de.dlr.sc.virsat.model.calculation"/>
<plugin id="de.dlr.sc.virsat.model.calculation.ide"/>
<plugin id="de.dlr.sc.virsat.model.calculation.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.model.calculation.test"/>
<plugin id="de.dlr.sc.virsat.model.calculation.ui"/>
<plugin id="de.dlr.sc.virsat.model.concept"/>
<plugin id="de.dlr.sc.virsat.model.concept.ide"/>
<plugin id="de.dlr.sc.virsat.model.concept.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.model.concept.test"/>
<plugin id="de.dlr.sc.virsat.model.concept.ui"/>
<plugin id="de.dlr.sc.virsat.model.edit"/>
<plugin id="de.dlr.sc.virsat.model.edit.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.model.edit.test"/>
<plugin id="de.dlr.sc.virsat.model.extension..ui"/>
<plugin id="de.dlr.sc.virsat.model.extension.budget.mass"/>
<plugin id="de.dlr.sc.virsat.model.extension.budget.mass.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.model.extension.budget.mass.test"/>
<plugin id="de.dlr.sc.virsat.model.extension.budget.mass.ui"/>
<plugin id="de.dlr.sc.virsat.model.extension.budget.power"/>
<plugin id="de.dlr.sc.virsat.model.extension.budget.power.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.model.extension.budget.power.test"/>
<plugin id="de.dlr.sc.virsat.model.extension.budget.power.ui"/>
<plugin id="de.dlr.sc.virsat.model.extension.funcelectrical"/>
<plugin id="de.dlr.sc.virsat.model.extension.funcelectrical.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.model.extension.funcelectrical.test"/>
<plugin id="de.dlr.sc.virsat.model.extension.funcelectrical.ui"/>
<plugin id="de.dlr.sc.virsat.model.extension.maturity"/>
<plugin id="de.dlr.sc.virsat.model.extension.maturity.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.model.extension.maturity.test"/>
<plugin id="de.dlr.sc.virsat.model.extension.maturity.ui"/>
<plugin id="de.dlr.sc.virsat.model.extension.mechanical"/>
<plugin id="de.dlr.sc.virsat.model.extension.mechanical.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.model.extension.mechanical.test"/>
<plugin id="de.dlr.sc.virsat.model.extension.mechanical.ui"/>
<plugin id="de.dlr.sc.virsat.model.extension.ps"/>
<plugin id="de.dlr.sc.virsat.model.extension.ps.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.model.extension.ps.test"/>
<plugin id="de.dlr.sc.virsat.model.extension.ps.ui"/>
<plugin id="de.dlr.sc.virsat.model.extension.requirements"/>
<plugin id="de.dlr.sc.virsat.model.extension.requirements.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.model.extension.requirements.test"/>
<plugin id="de.dlr.sc.virsat.model.extension.requirements.ui"/>
<plugin id="de.dlr.sc.virsat.model.extension.statemachines"/>
<plugin id="de.dlr.sc.virsat.model.extension.statemachines.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.model.extension.statemachines.test"/>
<plugin id="de.dlr.sc.virsat.model.extension.statemachines.ui"/>
<plugin id="de.dlr.sc.virsat.model.extension.tests"/>
<plugin id="de.dlr.sc.virsat.model.extension.tests.edit"/>
<plugin id="de.dlr.sc.virsat.model.extension.tests.edit.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.model.extension.tests.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.model.extension.tests.edit.test"/>
<plugin id="de.dlr.sc.virsat.model.extension.tests.test"/>
<plugin id="de.dlr.sc.virsat.model.extension.tests.ui"/>
<plugin id="de.dlr.sc.virsat.model.extension.thermal"/>
<plugin id="de.dlr.sc.virsat.model.extension.thermal.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.model.extension.thermal.test"/>
<plugin id="de.dlr.sc.virsat.model.extension.visualisation"/>
<plugin id="de.dlr.sc.virsat.model.extension.visualisation.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.model.extension.visualisation.test"/>
<plugin id="de.dlr.sc.virsat.model.extension.visualisation.ui"/>
<plugin id="de.dlr.sc.virsat.model.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.model.test"/>
<plugin id="de.dlr.sc.virsat.model.ui"/>
<plugin id="de.dlr.sc.virsat.performance.test"/>
<plugin id="de.dlr.sc.virsat.project"/>
<plugin id="de.dlr.sc.virsat.project.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.project.test"/>
<plugin id="de.dlr.sc.virsat.project.ui"/>
<plugin id="de.dlr.sc.virsat.qudv.ui"/>
<plugin id="de.dlr.sc.virsat.server"/>
<plugin id="de.dlr.sc.virsat.server.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.server.test"/>
<plugin id="de.dlr.sc.virsat.swtbot.test"/>
<plugin id="de.dlr.sc.virsat.target"/>
<plugin id="de.dlr.sc.virsat.team"/>
<plugin id="de.dlr.sc.virsat.team.test" fragment="true"/>
<plugin id="de.dlr.sc.virsat.team.test"/>
<plugin id="de.dlr.sc.virsat.team.ui"/>
<plugin id="de.dlr.sc.virsat.test"/>
<plugin id="de.dlr.sc.virsat.uiengine.ui"/>
Expand Down Expand Up @@ -188,6 +201,33 @@
<feature id="de.dlr.sc.virsat.model.extension.thermal.feature" installMode="root"/>
<feature id="de.dlr.sc.virsat.model.extension.sequencing.feature" installMode="root"/>
<feature id="de.dlr.sc.virsat.model.extension.budget.cost.feature" installMode="root"/>
<feature id="org.eclipse.justj.openjdk.hotspot.jre.full" installMode="root"/>
<feature id="org.eclipse.emf.mapping.ecore" installMode="root"/>
<feature id="org.eclipse.emf.mwe2.language.sdk" installMode="root"/>
<feature id="org.eclipse.emf.codegen" installMode="root"/>
<feature id="org.eclipse.xtext.xtext.ui.graph" installMode="root"/>
<feature id="org.eclipse.emf.mwe2.runtime.sdk" installMode="root"/>
<feature id="org.eclipse.emf.codegen.ui" installMode="root"/>
<feature id="org.eclipse.emf.codegen.ecore" installMode="root"/>
<feature id="org.eclipse.emf.converter" installMode="root"/>
<feature id="org.eclipse.ecf.filetransfer.httpclientjava.feature" installMode="root"/>
<feature id="org.eclipse.xtext.ui" installMode="root"/>
<feature id="org.eclipse.ocl.tools" installMode="root"/>
<feature id="org.eclipse.xtext.docs" installMode="root"/>
<feature id="org.eclipse.xtext.redist" installMode="root"/>
<feature id="org.eclipse.xtext.xtext.ui" installMode="root"/>
<feature id="org.eclipse.emf.common.ui" installMode="root"/>
<feature id="org.eclipse.emf.mapping.ui" installMode="root"/>
<feature id="org.eclipse.xtend.sdk" installMode="root"/>
<feature id="org.eclipse.emf.mwe2.launcher" installMode="root"/>
<feature id="org.eclipse.emf.mwe2.launcher.source" installMode="root"/>
<feature id="org.eclipse.emf.mapping" installMode="root"/>
<feature id="org.eclipse.xtext.examples" installMode="root"/>
<feature id="org.eclipse.emf.codegen.ecore.ui" installMode="root"/>
<feature id="org.eclipse.xtend.lib" installMode="root"/>
<feature id="org.eclipse.emf.ecore.editor" installMode="root"/>
<feature id="org.eclipse.emf.mapping.ecore.editor" installMode="root"/>
<feature id="org.eclipse.emf.ecore.edit" installMode="root"/>
</features>

<configurations>
Expand Down
8 changes: 7 additions & 1 deletion de.dlr.sc.virsat.target/tmodel-src/virsat.tmodel
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ TargetLibrary virsat {
// Purely named Eclipse. The name is important for target models having this one as
// super model. Then this name can be referenced to explicitly exclude
// certain features from the target model
RepositoryLocation Eclipse url "https://download.eclipse.org/releases/2024-03"{
RepositoryLocation Eclipse url "https://download.eclipse.org/releases/2024-03"{
// Unit addAll;
Unit org.eclipse.emf.compare.ide.ui.feature.group version 3.3.24.202401051648;
Unit org.eclipse.emf.edapt.runtime.feature.feature.group version 1.5.0.202201311430;
Unit org.eclipse.emf.sdk.feature.group version 2.37.0.v20240203-1010;
Expand Down Expand Up @@ -65,4 +66,9 @@ TargetLibrary virsat {
Unit org.eclipse.rmf.reqif10.thirdparty.feature.feature.group version 0.13.0.201509161042;
Unit org.eclipse.rmf.reqif10.sdk.feature.feature.group version 0.13.0.201509161042;
}

RepositoryLocation JustJ url "https://download.eclipse.org/justj/jres/17/updates/release/17.0.11" {
Unit org.eclipse.justj.openjdk.hotspot.jre.full.feature.group version newest;
}

}
4 changes: 4 additions & 0 deletions de.dlr.sc.virsat.target/virsat_linux.target
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@
<unit id="org.eclipse.rmf.reqif10.sdk.feature.feature.group" version="0.13.0.201509161042"/>
<repository location="https://download.eclipse.org/rmf/updates/releases"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.justj.openjdk.hotspot.jre.full.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/justj/jres/17/updates/release/17.0.11"/>
</location>
</locations>
<environment>
<os>linux</os>
Expand Down
4 changes: 4 additions & 0 deletions de.dlr.sc.virsat.target/virsat_windows.target
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@
<unit id="org.eclipse.rmf.reqif10.sdk.feature.feature.group" version="0.13.0.201509161042"/>
<repository location="https://download.eclipse.org/rmf/updates/releases"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.justj.openjdk.hotspot.jre.full.feature.group" version="0.0.0"/>
<repository location="https://download.eclipse.org/justj/jres/17/updates/release/17.0.11"/>
</location>
</locations>
<environment>
<os>win32</os>
Expand Down
Loading

0 comments on commit c92a023

Please sign in to comment.