removed Java memory arguments

in particular, XX:MaxPermSize, which is not available anymore in Java 17
eclipse-emf-parsley · Nov 25, 2022 · 9634be9 · 9634be9
1 parent 075b91e
commit 9634be9
Show file tree

Hide file tree

Showing 46 changed files with 13 additions and 1,420 deletions.
diff --git a/dsl/org.eclipse.emf.parsley.dsl.ui.tests/EmfParsleyDslAllUiTests.launch b/dsl/org.eclipse.emf.parsley.dsl.ui.tests/EmfParsleyDslAllUiTests.launch
@@ -28,7 +28,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.parsley.dsl.ui.tests"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:ReservedCodeCacheSize=64m -Xms40m -Xmx1024m -XX:MaxPermSize=256m -Dorg.eclipse.swt.browser.DefaultType=mozilla"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.swt.browser.DefaultType=mozilla"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
 <booleanAttribute key="run_in_ui_thread" value="true"/>

diff --git a/dsl/org.eclipse.emf.parsley.dsl.ui.tests/launches/EmfParsleyDslPluginXmlBuilderTest.launch b/dsl/org.eclipse.emf.parsley.dsl.ui.tests/launches/EmfParsleyDslPluginXmlBuilderTest.launch
@@ -28,7 +28,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.parsley.dsl.ui.tests"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:ReservedCodeCacheSize=64m -Xms40m -Xmx1024m -XX:MaxPermSize=256m -Dorg.eclipse.swt.browser.DefaultType=mozilla"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.swt.browser.DefaultType=mozilla"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
 <booleanAttribute key="run_in_ui_thread" value="true"/>

diff --git a/dsl/org.eclipse.emf.parsley.dsl.ui.tests/launches/EmfParsleyDslWorkbenchTest.launch b/dsl/org.eclipse.emf.parsley.dsl.ui.tests/launches/EmfParsleyDslWorkbenchTest.launch
@@ -28,7 +28,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.parsley.dsl.ui.tests"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:ReservedCodeCacheSize=64m -Xms40m -Xmx1024m -XX:MaxPermSize=256m -Dorg.eclipse.swt.browser.DefaultType=mozilla"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dorg.eclipse.swt.browser.DefaultType=mozilla"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.platform.ide"/>
 <booleanAttribute key="run_in_ui_thread" value="true"/>

diff --git a/...ples/org.eclipse.emf.parsley.examples.maven/org.eclipse.emf.parsley.examples.maven.launch b/...ples/org.eclipse.emf.parsley.examples.maven/org.eclipse.emf.parsley.examples.maven.launch
@@ -12,6 +12,5 @@
 <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="true"/>
 <stringAttribute key="M2_USER_SETTINGS" value=""/>
 <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx384m -XX:MaxPermSize=256m"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.emf.parsley.examples.maven}"/>
 </launchConfiguration>
diff --git a/...se.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent INDIGO Other Display.launch b/...se.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent INDIGO Other Display.launch
diff --git a/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent INDIGO.launch b/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent INDIGO.launch
diff --git a/...se.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent KEPLER Other Display.launch b/...se.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent KEPLER Other Display.launch
diff --git a/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent KEPLER.launch b/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent KEPLER.launch
diff --git a/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent LUNA.launch b/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent LUNA.launch
diff --git a/...pse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent Maven Clean Install.launch b/...pse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent Maven Clean Install.launch
diff --git a/...org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent No Findbugs.launch b/...org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent No Findbugs.launch
diff --git a/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent RAP.launch b/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent RAP.launch
@@ -12,6 +12,5 @@
 <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
 <stringAttribute key="M2_USER_SETTINGS" value=""/>
 <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m -XX:MaxPermSize=256m"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.emf.parsley.parent}"/>
 </launchConfiguration>
diff --git a/...org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent SWTBOT Only.launch b/...org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent SWTBOT Only.launch
@@ -12,6 +12,5 @@
 <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
 <stringAttribute key="M2_USER_SETTINGS" value=""/>
 <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m -XX:MaxPermSize=256m"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.emf.parsley.parent}"/>
 </launchConfiguration>
diff --git a/...se.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent SWTBOT Other Display.launch b/...se.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent SWTBOT Other Display.launch
@@ -15,6 +15,5 @@
 <mapAttribute key="org.eclipse.debug.core.environmentVariables">
 <mapEntry key="DISPLAY" value=":50"/>
 </mapAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m -XX:MaxPermSize=256m"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.emf.parsley.parent}"/>
 </launchConfiguration>
diff --git a/...unches/org.eclipse.emf.parsley.parent Test RAP Release Composite (without signing).launch b/...unches/org.eclipse.emf.parsley.parent Test RAP Release Composite (without signing).launch
diff --git a/...t/launches/org.eclipse.emf.parsley.parent Test Release Composite (without signing).launch b/...t/launches/org.eclipse.emf.parsley.parent Test Release Composite (without signing).launch
diff --git a/...parent/launches/org.eclipse.emf.parsley.parent Test eclipse-sign (without signing).launch b/...parent/launches/org.eclipse.emf.parsley.parent Test eclipse-sign (without signing).launch
diff --git a/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent.launch b/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.parent.launch
@@ -12,6 +12,5 @@
 <booleanAttribute key="M2_UPDATE_SNAPSHOTS" value="false"/>
 <stringAttribute key="M2_USER_SETTINGS" value=""/>
 <booleanAttribute key="M2_WORKSPACE_RESOLUTION" value="false"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx1024m -XX:MaxPermSize=256m"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:/org.eclipse.emf.parsley.parent}"/>
 </launchConfiguration>
diff --git a/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.rap examples.launch b/releng/org.eclipse.emf.parsley.parent/launches/org.eclipse.emf.parsley.rap examples.launch
diff --git a/releng/org.eclipse.emf.parsley.parent/pom.xml b/releng/org.eclipse.emf.parsley.parent/pom.xml
@@ -80,7 +80,7 @@
 
 		<!-- tests and runtime args -->
 		<os-jvm-flags />
-		<memoryArgs>-Xms256M -Xmx4G -XX:PermSize=256M -XX:MaxPermSize=256M -XX:+HeapDumpOnOutOfMemoryError</memoryArgs>
+		<memoryArgs>-XX:+HeapDumpOnOutOfMemoryError</memoryArgs>
 		<uiTestsArgs>${memoryArgs} ${os-jvm-flags} -Dorg.eclipse.swt.browser.DefaultType=mozilla</uiTestsArgs>
 		<!-- 
 		The following is not needed anymore