diff options
3 files changed, 9 insertions, 13 deletions
diff --git a/packages/org.eclipse.epp.package.scout.feature/feature.xml b/packages/org.eclipse.epp.package.scout.feature/feature.xml index c64d5353..4a757c9c 100644 --- a/packages/org.eclipse.epp.package.scout.feature/feature.xml +++ b/packages/org.eclipse.epp.package.scout.feature/feature.xml @@ -31,8 +31,7 @@ search-location="both"/> <requires> - <import feature="org.eclipse.scout"/> - <import feature="org.eclipse.scout.rt.rap.target"/> + <import feature="org.eclipse.scout.sdk-feature"/> <import feature="org.eclipse.equinox.p2.user.ui"/> <import feature="org.eclipse.help"/> <import feature="org.eclipse.help.source"/> @@ -57,6 +56,7 @@ <import feature="org.eclipse.egit.import"/> <import feature="org.eclipse.egit.mylyn"/> <import feature="org.eclipse.jgit"/> + <import feature="org.eclipse.m2e.feature"/> </requires> <plugin diff --git a/packages/org.eclipse.epp.package.scout.product/epp.product b/packages/org.eclipse.epp.package.scout.product/epp.product index dafadc44..61f7981e 100644 --- a/packages/org.eclipse.epp.package.scout.product/epp.product +++ b/packages/org.eclipse.epp.package.scout.product/epp.product @@ -16,14 +16,10 @@ <launcherArgs> <programArgs>-product org.eclipse.epp.package.scout.product --launcher.defaultAction openFile</programArgs> - <programArgsWin>--launcher.XXMaxPermSize -256M</programArgsWin> - <vmArgs>-Dosgi.requiredJavaVersion=1.7 + <vmArgs>-Dosgi.requiredJavaVersion=1.8 -Xms256m -Xmx1024m</vmArgs> - <vmArgsLin>-XX:MaxPermSize=256m</vmArgsLin> - <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts --XX:MaxPermSize=256m</vmArgsMac> + <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac> </launcherArgs> <windowImages i16="/org.eclipse.epp.package.scout/eclipse16.png" i32="/org.eclipse.epp.package.scout/eclipse32.png" i48="/org.eclipse.epp.package.scout/eclipse48.png" i256="/org.eclipse.epp.package.scout/eclipse256.png"/> @@ -42,10 +38,10 @@ <intro introId="org.eclipse.ui.intro.universal"/> <vm> - <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</linux> - <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</macos> - <solaris include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</solaris> - <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7</windows> + <linux include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</linux> + <macos include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</macos> + <solaris include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</solaris> + <windows include="false">org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8</windows> </vm> <license> diff --git a/packages/org.eclipse.epp.package.scout/META-INF/MANIFEST.MF b/packages/org.eclipse.epp.package.scout/META-INF/MANIFEST.MF index 10055ebd..1656c00e 100644 --- a/packages/org.eclipse.epp.package.scout/META-INF/MANIFEST.MF +++ b/packages/org.eclipse.epp.package.scout/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: EPP Scout Bundle Bundle-SymbolicName: org.eclipse.epp.package.scout;singleton:=true Bundle-Version: 4.6.0.qualifier Bundle-Vendor: Eclipse Packaging Project -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Require-Bundle: org.eclipse.platform, org.eclipse.equinox.app Eclipse-BundleShape: dir |