Upgrade to Jetty 10.0.3
Use Jetty 10.0.3 bundles provided by the Eclipse Webtools project as a
p2 repository. Consuming these bundles requires changing the required
execution environment to JavaSE-11 and switching the Java Servlet API
level.
Add osgi.serviceloader to RWT tools launch bundle based on the upstream
example in WebTools.
Change-Id: I18898d403268a0b18a1d71f4b795e8e3802ecc7d
diff --git a/bundles/org.eclipse.rap.doc/guide/articles/launcher.html b/bundles/org.eclipse.rap.doc/guide/articles/launcher.html
index a11ff3b..7eb2ea0 100644
--- a/bundles/org.eclipse.rap.doc/guide/articles/launcher.html
+++ b/bundles/org.eclipse.rap.doc/guide/articles/launcher.html
@@ -255,7 +255,6 @@
<b>The Jetty servlet container</b>
</p>
<ul>
- <li><em>org.eclipse.jetty.continuation</em></li>
<li><em>org.eclipse.jetty.http</em></li>
<li><em>org.eclipse.jetty.io</em></li>
<li><em>org.eclipse.jetty.security</em></li>
diff --git a/bundles/org.eclipse.rap.tools.intro/.classpath b/bundles/org.eclipse.rap.tools.intro/.classpath
index eca7bdb..e801ebf 100644
--- a/bundles/org.eclipse.rap.tools.intro/.classpath
+++ b/bundles/org.eclipse.rap.tools.intro/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.rap.tools.intro/.settings/RAP Tools.launch b/bundles/org.eclipse.rap.tools.intro/.settings/RAP Tools.launch
index f00bebb..a5702fb 100644
--- a/bundles/org.eclipse.rap.tools.intro/.settings/RAP Tools.launch
+++ b/bundles/org.eclipse.rap.tools.intro/.settings/RAP Tools.launch
@@ -1,31 +1,294 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
-<booleanAttribute key="askclear" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="clearws" value="false"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/RAP Tools"/>
-<booleanAttribute key="default" value="false"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<stringAttribute key="location" value="${workspace_loc}/../runtime-rap-tools"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console -consolelog"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<stringAttribute key="selected_target_plugins" value="com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.sun.el@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.codec@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.logging@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.jasper.glassfish@default:default,org.apache.lucene*2.9.1.v201101211721@default:default,org.apache.lucene*3.5.0.v20120319-2345@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core*2.9.1.v201101211721@default:default,org.apache.lucene.core*3.5.0.v20120319-2345@default:default,org.apache.lucene.misc@default:default,org.apache.lucene.queries@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare.win32@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.cvs@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.apache.felix.scr@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.reconciler.dropins@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jetty.webapp@default:default,org.eclipse.jetty.xml@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.hamcrest.core@default:default,org.junit*4.10.0.v4_10_0_v20120426-0900@default:default,org.junit4@default:default,org.objectweb.asm@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
-<stringAttribute key="selected_workspace_plugins" value="org.eclipse.rap.doc@default:default,org.eclipse.rap.tools.intro@default:default,org.eclipse.rap.tools.launch.rwt@default:default,org.eclipse.rap.tools.launch@default:default,org.eclipse.rap.tools.templates@default:default"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useProduct" value="true"/>
-<booleanAttribute key="usefeatures" value="false"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench">
+ <booleanAttribute key="askclear" value="true"/>
+ <booleanAttribute key="automaticAdd" value="false"/>
+ <booleanAttribute key="automaticValidate" value="false"/>
+ <stringAttribute key="bootstrap" value=""/>
+ <stringAttribute key="checked" value="[NONE]"/>
+ <booleanAttribute key="clearConfig" value="true"/>
+ <booleanAttribute key="clearws" value="false"/>
+ <booleanAttribute key="clearwslog" value="false"/>
+ <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/RAP Tools"/>
+ <booleanAttribute key="default" value="false"/>
+ <setAttribute key="deselected_workspace_bundles"/>
+ <booleanAttribute key="includeOptional" value="false"/>
+ <stringAttribute key="location" value="${workspace_loc}/../runtime-rap-tools"/>
+ <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+ <booleanAttribute key="org.eclipse.jdt.launching.ATTR_ATTR_USE_ARGFILE" value="false"/>
+ <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+ <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-console -consolelog"/>
+ <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+ <stringAttribute key="pde.version" value="3.3"/>
+ <stringAttribute key="product" value="org.eclipse.platform.ide"/>
+ <setAttribute key="selected_target_bundles">
+ <setEntry value="com.ibm.icu@default:default"/>
+ <setEntry value="com.jcraft.jsch@default:default"/>
+ <setEntry value="com.sun.el@default:default"/>
+ <setEntry value="com.sun.jna.platform@default:default"/>
+ <setEntry value="com.sun.jna@default:default"/>
+ <setEntry value="jakarta.enterprise.cdi-api@default:default"/>
+ <setEntry value="jakarta.interceptor-api@default:default"/>
+ <setEntry value="jakarta.servlet-api@default:default"/>
+ <setEntry value="jakarta.transaction-api@default:default"/>
+ <setEntry value="javax.annotation@default:default"/>
+ <setEntry value="javax.el-api@default:default"/>
+ <setEntry value="javax.el@default:default"/>
+ <setEntry value="javax.inject@default:default"/>
+ <setEntry value="javax.servlet.jsp@default:default"/>
+ <setEntry value="org.apache.ant@default:default"/>
+ <setEntry value="org.apache.batik.constants@default:default"/>
+ <setEntry value="org.apache.batik.css@default:default"/>
+ <setEntry value="org.apache.batik.i18n@default:default"/>
+ <setEntry value="org.apache.batik.util@default:default"/>
+ <setEntry value="org.apache.commons.codec@default:default"/>
+ <setEntry value="org.apache.commons.io@default:default"/>
+ <setEntry value="org.apache.commons.jxpath@default:default"/>
+ <setEntry value="org.apache.commons.logging@default:default"/>
+ <setEntry value="org.apache.felix.gogo.command@default:default"/>
+ <setEntry value="org.apache.felix.gogo.runtime@default:default"/>
+ <setEntry value="org.apache.felix.gogo.shell@default:default"/>
+ <setEntry value="org.apache.felix.scr@1:true"/>
+ <setEntry value="org.apache.httpcomponents.httpclient@default:default"/>
+ <setEntry value="org.apache.httpcomponents.httpcore@default:default"/>
+ <setEntry value="org.apache.jasper.glassfish@default:default"/>
+ <setEntry value="org.apache.lucene.analyzers-common@default:default"/>
+ <setEntry value="org.apache.lucene.analyzers-smartcn@default:default"/>
+ <setEntry value="org.apache.lucene.core@default:default"/>
+ <setEntry value="org.apache.xmlgraphics@default:default"/>
+ <setEntry value="org.bouncycastle.bcpg@default:default"/>
+ <setEntry value="org.bouncycastle.bcprov@default:default"/>
+ <setEntry value="org.eclipse.ant.core@default:default"/>
+ <setEntry value="org.eclipse.ant.launching@default:default"/>
+ <setEntry value="org.eclipse.ant.ui@default:default"/>
+ <setEntry value="org.eclipse.compare.core@default:default"/>
+ <setEntry value="org.eclipse.compare@default:default"/>
+ <setEntry value="org.eclipse.core.commands@default:default"/>
+ <setEntry value="org.eclipse.core.contenttype@default:default"/>
+ <setEntry value="org.eclipse.core.databinding.beans@default:default"/>
+ <setEntry value="org.eclipse.core.databinding.observable@default:default"/>
+ <setEntry value="org.eclipse.core.databinding.property@default:default"/>
+ <setEntry value="org.eclipse.core.databinding@default:default"/>
+ <setEntry value="org.eclipse.core.expressions@default:default"/>
+ <setEntry value="org.eclipse.core.externaltools@default:default"/>
+ <setEntry value="org.eclipse.core.filebuffers@default:default"/>
+ <setEntry value="org.eclipse.core.filesystem.linux.x86_64@default:false"/>
+ <setEntry value="org.eclipse.core.filesystem@default:default"/>
+ <setEntry value="org.eclipse.core.jobs@default:default"/>
+ <setEntry value="org.eclipse.core.net.linux.x86_64@default:false"/>
+ <setEntry value="org.eclipse.core.net.linux@default:false"/>
+ <setEntry value="org.eclipse.core.net@default:default"/>
+ <setEntry value="org.eclipse.core.resources@default:default"/>
+ <setEntry value="org.eclipse.core.runtime@default:true"/>
+ <setEntry value="org.eclipse.core.variables@default:default"/>
+ <setEntry value="org.eclipse.debug.core@default:default"/>
+ <setEntry value="org.eclipse.debug.ui@default:default"/>
+ <setEntry value="org.eclipse.e4.core.commands@default:default"/>
+ <setEntry value="org.eclipse.e4.core.contexts@default:default"/>
+ <setEntry value="org.eclipse.e4.core.di.annotations@default:default"/>
+ <setEntry value="org.eclipse.e4.core.di.extensions.supplier@default:default"/>
+ <setEntry value="org.eclipse.e4.core.di.extensions@default:default"/>
+ <setEntry value="org.eclipse.e4.core.di@default:default"/>
+ <setEntry value="org.eclipse.e4.core.services@default:default"/>
+ <setEntry value="org.eclipse.e4.emf.xpath@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.bindings@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.css.core@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.css.swt.theme@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.css.swt@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.di@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.dialogs@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.ide@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.model.workbench@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.services@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.swt.gtk@default:false"/>
+ <setEntry value="org.eclipse.e4.ui.widgets@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.workbench.addons.swt@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.workbench.renderers.swt@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.workbench.swt@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.workbench3@default:default"/>
+ <setEntry value="org.eclipse.e4.ui.workbench@default:default"/>
+ <setEntry value="org.eclipse.ecf.filetransfer@default:default"/>
+ <setEntry value="org.eclipse.ecf.identity@default:default"/>
+ <setEntry value="org.eclipse.ecf.provider.filetransfer.httpclient45@default:default"/>
+ <setEntry value="org.eclipse.ecf.provider.filetransfer.ssl@default:false"/>
+ <setEntry value="org.eclipse.ecf.provider.filetransfer@default:default"/>
+ <setEntry value="org.eclipse.ecf.ssl@default:false"/>
+ <setEntry value="org.eclipse.ecf@default:default"/>
+ <setEntry value="org.eclipse.emf.common@default:default"/>
+ <setEntry value="org.eclipse.emf.ecore.change@default:default"/>
+ <setEntry value="org.eclipse.emf.ecore.xmi@default:default"/>
+ <setEntry value="org.eclipse.emf.ecore@default:default"/>
+ <setEntry value="org.eclipse.equinox.app@default:default"/>
+ <setEntry value="org.eclipse.equinox.bidi@default:default"/>
+ <setEntry value="org.eclipse.equinox.cm@default:default"/>
+ <setEntry value="org.eclipse.equinox.common@2:true"/>
+ <setEntry value="org.eclipse.equinox.concurrent@default:default"/>
+ <setEntry value="org.eclipse.equinox.console@default:default"/>
+ <setEntry value="org.eclipse.equinox.event@default:default"/>
+ <setEntry value="org.eclipse.equinox.frameworkadmin.equinox@default:default"/>
+ <setEntry value="org.eclipse.equinox.frameworkadmin@default:default"/>
+ <setEntry value="org.eclipse.equinox.http.jetty@default:default"/>
+ <setEntry value="org.eclipse.equinox.http.registry@default:default"/>
+ <setEntry value="org.eclipse.equinox.http.servlet@default:default"/>
+ <setEntry value="org.eclipse.equinox.jsp.jasper.registry@default:default"/>
+ <setEntry value="org.eclipse.equinox.jsp.jasper@default:default"/>
+ <setEntry value="org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false"/>
+ <setEntry value="org.eclipse.equinox.launcher@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.artifact.repository@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.console@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.core@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.director.app@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.director@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.directorywatcher@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.engine@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.extensionlocation@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.garbagecollector@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.jarprocessor@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.metadata.repository@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.metadata@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.operations@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.publisher.eclipse@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.publisher@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.reconciler.dropins@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.repository.tools@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.repository@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.touchpoint.eclipse@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.touchpoint.natives@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.transport.ecf@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.ui.importexport@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.ui.sdk.scheduler@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.ui.sdk@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.ui@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.updatechecker@default:default"/>
+ <setEntry value="org.eclipse.equinox.p2.updatesite@default:default"/>
+ <setEntry value="org.eclipse.equinox.preferences@default:default"/>
+ <setEntry value="org.eclipse.equinox.registry@default:default"/>
+ <setEntry value="org.eclipse.equinox.security.linux.x86_64@default:false"/>
+ <setEntry value="org.eclipse.equinox.security.linux@default:false"/>
+ <setEntry value="org.eclipse.equinox.security.ui@default:default"/>
+ <setEntry value="org.eclipse.equinox.security@default:default"/>
+ <setEntry value="org.eclipse.equinox.simpleconfigurator.manipulator@default:default"/>
+ <setEntry value="org.eclipse.equinox.simpleconfigurator@1:true"/>
+ <setEntry value="org.eclipse.help.base@default:default"/>
+ <setEntry value="org.eclipse.help.ui@default:default"/>
+ <setEntry value="org.eclipse.help.webapp@default:default"/>
+ <setEntry value="org.eclipse.help@default:default"/>
+ <setEntry value="org.eclipse.jdt.annotation*1.1.500.v20200407-1355@default:default"/>
+ <setEntry value="org.eclipse.jdt.annotation*2.2.600.v20200408-1511@default:default"/>
+ <setEntry value="org.eclipse.jdt.apt.core@default:default"/>
+ <setEntry value="org.eclipse.jdt.apt.pluggable.core@default:default"/>
+ <setEntry value="org.eclipse.jdt.apt.ui@default:default"/>
+ <setEntry value="org.eclipse.jdt.compiler.apt@default:false"/>
+ <setEntry value="org.eclipse.jdt.compiler.tool@default:false"/>
+ <setEntry value="org.eclipse.jdt.core.manipulation@default:default"/>
+ <setEntry value="org.eclipse.jdt.core@default:default"/>
+ <setEntry value="org.eclipse.jdt.debug.ui@default:default"/>
+ <setEntry value="org.eclipse.jdt.debug@default:default"/>
+ <setEntry value="org.eclipse.jdt.doc.user@default:default"/>
+ <setEntry value="org.eclipse.jdt.junit.core@default:default"/>
+ <setEntry value="org.eclipse.jdt.junit.runtime@default:default"/>
+ <setEntry value="org.eclipse.jdt.junit4.runtime@default:default"/>
+ <setEntry value="org.eclipse.jdt.junit@default:default"/>
+ <setEntry value="org.eclipse.jdt.launching@default:default"/>
+ <setEntry value="org.eclipse.jdt.ui@default:default"/>
+ <setEntry value="org.eclipse.jdt@default:default"/>
+ <setEntry value="org.eclipse.jetty.http@default:default"/>
+ <setEntry value="org.eclipse.jetty.io@default:default"/>
+ <setEntry value="org.eclipse.jetty.jndi@default:default"/>
+ <setEntry value="org.eclipse.jetty.plus@default:default"/>
+ <setEntry value="org.eclipse.jetty.security@default:default"/>
+ <setEntry value="org.eclipse.jetty.server@default:default"/>
+ <setEntry value="org.eclipse.jetty.servlet-api@default:default"/>
+ <setEntry value="org.eclipse.jetty.servlet@default:default"/>
+ <setEntry value="org.eclipse.jetty.util.ajax@default:default"/>
+ <setEntry value="org.eclipse.jetty.util@default:default"/>
+ <setEntry value="org.eclipse.jetty.webapp@default:default"/>
+ <setEntry value="org.eclipse.jetty.xml@default:default"/>
+ <setEntry value="org.eclipse.jface.databinding@default:default"/>
+ <setEntry value="org.eclipse.jface.notifications@default:default"/>
+ <setEntry value="org.eclipse.jface.text@default:default"/>
+ <setEntry value="org.eclipse.jface@default:default"/>
+ <setEntry value="org.eclipse.jsch.core@default:default"/>
+ <setEntry value="org.eclipse.jsch.ui@default:default"/>
+ <setEntry value="org.eclipse.ltk.core.refactoring@default:default"/>
+ <setEntry value="org.eclipse.ltk.ui.refactoring@default:default"/>
+ <setEntry value="org.eclipse.osgi.compatibility.state@default:false"/>
+ <setEntry value="org.eclipse.osgi.services@default:default"/>
+ <setEntry value="org.eclipse.osgi.util@default:default"/>
+ <setEntry value="org.eclipse.osgi@-1:true"/>
+ <setEntry value="org.eclipse.pde.api.tools.ui@default:default"/>
+ <setEntry value="org.eclipse.pde.api.tools@default:default"/>
+ <setEntry value="org.eclipse.pde.build@default:default"/>
+ <setEntry value="org.eclipse.pde.core@default:default"/>
+ <setEntry value="org.eclipse.pde.doc.user@default:default"/>
+ <setEntry value="org.eclipse.pde.ds.core@default:default"/>
+ <setEntry value="org.eclipse.pde.ds.ui@default:default"/>
+ <setEntry value="org.eclipse.pde.junit.runtime@default:default"/>
+ <setEntry value="org.eclipse.pde.launching@default:default"/>
+ <setEntry value="org.eclipse.pde.runtime@default:default"/>
+ <setEntry value="org.eclipse.pde.ua.core@default:default"/>
+ <setEntry value="org.eclipse.pde.ua.ui@default:default"/>
+ <setEntry value="org.eclipse.pde.ui.templates@default:default"/>
+ <setEntry value="org.eclipse.pde.ui@default:default"/>
+ <setEntry value="org.eclipse.pde@default:default"/>
+ <setEntry value="org.eclipse.platform.doc.isv@default:default"/>
+ <setEntry value="org.eclipse.platform.doc.user@default:default"/>
+ <setEntry value="org.eclipse.platform@default:default"/>
+ <setEntry value="org.eclipse.rcp@default:default"/>
+ <setEntry value="org.eclipse.search@default:default"/>
+ <setEntry value="org.eclipse.swt.gtk.linux.x86_64@default:false"/>
+ <setEntry value="org.eclipse.swt@default:default"/>
+ <setEntry value="org.eclipse.team.core@default:default"/>
+ <setEntry value="org.eclipse.team.ui@default:default"/>
+ <setEntry value="org.eclipse.text@default:default"/>
+ <setEntry value="org.eclipse.ui.browser@default:default"/>
+ <setEntry value="org.eclipse.ui.cheatsheets@default:default"/>
+ <setEntry value="org.eclipse.ui.console@default:default"/>
+ <setEntry value="org.eclipse.ui.editors@default:default"/>
+ <setEntry value="org.eclipse.ui.externaltools@default:default"/>
+ <setEntry value="org.eclipse.ui.forms@default:default"/>
+ <setEntry value="org.eclipse.ui.genericeditor@default:default"/>
+ <setEntry value="org.eclipse.ui.ide.application@default:default"/>
+ <setEntry value="org.eclipse.ui.ide@default:default"/>
+ <setEntry value="org.eclipse.ui.intro.quicklinks@default:default"/>
+ <setEntry value="org.eclipse.ui.intro.universal@default:default"/>
+ <setEntry value="org.eclipse.ui.intro@default:default"/>
+ <setEntry value="org.eclipse.ui.navigator.resources@default:default"/>
+ <setEntry value="org.eclipse.ui.navigator@default:default"/>
+ <setEntry value="org.eclipse.ui.net@default:default"/>
+ <setEntry value="org.eclipse.ui.trace@default:default"/>
+ <setEntry value="org.eclipse.ui.views.log@default:default"/>
+ <setEntry value="org.eclipse.ui.views.properties.tabbed@default:default"/>
+ <setEntry value="org.eclipse.ui.views@default:default"/>
+ <setEntry value="org.eclipse.ui.workbench.texteditor@default:default"/>
+ <setEntry value="org.eclipse.ui.workbench@default:default"/>
+ <setEntry value="org.eclipse.ui@default:default"/>
+ <setEntry value="org.eclipse.urischeme@default:default"/>
+ <setEntry value="org.hamcrest.core@default:default"/>
+ <setEntry value="org.junit@default:default"/>
+ <setEntry value="org.objectweb.asm.tree@default:default"/>
+ <setEntry value="org.objectweb.asm@default:default"/>
+ <setEntry value="org.sat4j.core@default:default"/>
+ <setEntry value="org.sat4j.pb@default:default"/>
+ <setEntry value="org.tukaani.xz@default:default"/>
+ <setEntry value="org.w3c.css.sac@default:default"/>
+ <setEntry value="org.w3c.dom.events@default:default"/>
+ <setEntry value="org.w3c.dom.smil@default:default"/>
+ <setEntry value="org.w3c.dom.svg@default:default"/>
+ <setEntry value="slf4j.api@default:default"/>
+ </setAttribute>
+ <setAttribute key="selected_workspace_bundles">
+ <setEntry value="org.eclipse.rap.doc@default:default"/>
+ <setEntry value="org.eclipse.rap.tools.intro@default:default"/>
+ <setEntry value="org.eclipse.rap.tools.launch.rwt@default:default"/>
+ <setEntry value="org.eclipse.rap.tools.launch@default:default"/>
+ <setEntry value="org.eclipse.rap.tools.templates@default:default"/>
+ </setAttribute>
+ <booleanAttribute key="show_selected_only" value="false"/>
+ <stringAttribute key="templateConfig" value="${target_home}\configuration\config.ini"/>
+ <booleanAttribute key="tracing" value="false"/>
+ <booleanAttribute key="useCustomFeatures" value="false"/>
+ <booleanAttribute key="useDefaultConfig" value="true"/>
+ <booleanAttribute key="useDefaultConfigArea" value="true"/>
+ <booleanAttribute key="useProduct" value="true"/>
+ <booleanAttribute key="usefeatures" value="false"/>
+</launchConfiguration>
diff --git a/bundles/org.eclipse.rap.tools.intro/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.tools.intro/META-INF/MANIFEST.MF
index 540e647..9295f8f 100644
--- a/bundles/org.eclipse.rap.tools.intro/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.tools.intro/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@
org.eclipse.equinox.p2.metadata,
org.eclipse.equinox.p2.core,
org.eclipse.equinox.p2.repository
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Eclipse-LazyStart: true
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
@@ -23,3 +23,4 @@
Export-Package: org.eclipse.rap.tools.intro.internal;x-friends:="org.eclipse.rap.tools.tests",
org.eclipse.rap.tools.intro.internal.commands;x-internal:=true,
org.eclipse.rap.tools.intro.internal.target;x-friends:="org.eclipse.rap.tools.tests"
+Automatic-Module-Name: org.eclipse.rap.tools.intro
diff --git a/bundles/org.eclipse.rap.tools.intro/build.properties b/bundles/org.eclipse.rap.tools.intro/build.properties
index e56acc7..60c4a1b 100644
--- a/bundles/org.eclipse.rap.tools.intro/build.properties
+++ b/bundles/org.eclipse.rap.tools.intro/build.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2007, 2019 Innoopract Informationssysteme GmbH and others.
+# Copyright (c) 2007, 2021 Innoopract Informationssysteme GmbH and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -22,6 +22,4 @@
intro/,\
about.html
javacDefaultEncoding.. = UTF-8
-jre.compilation.profile = JavaSE-1.8
-javacSource = 1.8
-javacTarget = 1.8
+jre.compilation.profile = JavaSE-11
diff --git a/bundles/org.eclipse.rap.tools.launch.rwt/.classpath b/bundles/org.eclipse.rap.tools.launch.rwt/.classpath
index eca7bdb..e801ebf 100644
--- a/bundles/org.eclipse.rap.tools.launch.rwt/.classpath
+++ b/bundles/org.eclipse.rap.tools.launch.rwt/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.rap.tools.launch.rwt/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.tools.launch.rwt/META-INF/MANIFEST.MF
index 6c410fa..1d7645a 100644
--- a/bundles/org.eclipse.rap.tools.launch.rwt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.tools.launch.rwt/META-INF/MANIFEST.MF
@@ -15,18 +15,17 @@
org.eclipse.jdt.ui;bundle-version="[3.6.0,4.0.0)",
org.eclipse.jdt.debug.ui;bundle-version="[3.5.0,4.0.0)",
org.eclipse.jdt.launching;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.jetty.continuation;bundle-version="[9.2.0,10.0.0)",
- org.eclipse.jetty.http;bundle-version="[9.2.0,10.0.0)",
- org.eclipse.jetty.io;bundle-version="[9.2.0,10.0.0)",
- org.eclipse.jetty.security;bundle-version="[9.2.0,10.0.0)",
- org.eclipse.jetty.server;bundle-version="[9.2.0,10.0.0)",
- org.eclipse.jetty.servlet;bundle-version="[9.2.0,10.0.0)",
- org.eclipse.jetty.util;bundle-version="[9.2.0,10.0.0)",
- org.eclipse.jetty.util.ajax;bundle-version="[9.2.0,10.0.0)",
- org.eclipse.jetty.webapp;bundle-version="[9.2.0,10.0.0)",
- org.eclipse.jetty.xml;bundle-version="[9.2.0,10.0.0)"
+ org.eclipse.jetty.http;bundle-version="[10.0.0,11.0.0)",
+ org.eclipse.jetty.io;bundle-version="[10.0.0,11.0.0)",
+ org.eclipse.jetty.security;bundle-version="[10.0.0,11.0.0)",
+ org.eclipse.jetty.server;bundle-version="[10.0.0,11.0.0)",
+ org.eclipse.jetty.servlet;bundle-version="[10.0.0,11.0.0)",
+ org.eclipse.jetty.util;bundle-version="[10.0.0,11.0.0)",
+ org.eclipse.jetty.util.ajax;bundle-version="[10.0.0,11.0.0)",
+ org.eclipse.jetty.webapp;bundle-version="[10.0.0,11.0.0)",
+ org.eclipse.jetty.xml;bundle-version="[10.0.0,11.0.0)"
Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-Localization: OSGI-INF/l10n/bundle
Bundle-Vendor: %Bundle-Vendor
Export-Package: org.eclipse.rap.tools.launch.rwt.internal;x-internal:=true,
@@ -36,3 +35,6 @@
org.eclipse.rap.tools.launch.rwt.internal.shortcut;x-internal:=true,
org.eclipse.rap.tools.launch.rwt.internal.tab;x-internal:=true,
org.eclipse.rap.tools.launch.rwt.internal.util;x-internal:=true
+Automatic-Module-Name: org.eclipse.rap.tools.launch.rwt
+Provide-Capability: osgi.extender;osgi.extender="osgi.serviceloader.registrar";version:Version="1.0",
+ osgi.extender;osgi.extender="osgi.serviceloader.processor";version:Version="1.0"
diff --git a/bundles/org.eclipse.rap.tools.launch.rwt/META-INF/services/osgi.serviceloader.processor b/bundles/org.eclipse.rap.tools.launch.rwt/META-INF/services/osgi.serviceloader.processor
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bundles/org.eclipse.rap.tools.launch.rwt/META-INF/services/osgi.serviceloader.processor
diff --git a/bundles/org.eclipse.rap.tools.launch.rwt/META-INF/services/osgi.serviceloader.registrar b/bundles/org.eclipse.rap.tools.launch.rwt/META-INF/services/osgi.serviceloader.registrar
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/bundles/org.eclipse.rap.tools.launch.rwt/META-INF/services/osgi.serviceloader.registrar
diff --git a/bundles/org.eclipse.rap.tools.launch.rwt/build.properties b/bundles/org.eclipse.rap.tools.launch.rwt/build.properties
index 645c884..30a1e79 100644
--- a/bundles/org.eclipse.rap.tools.launch.rwt/build.properties
+++ b/bundles/org.eclipse.rap.tools.launch.rwt/build.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2011, 2019 Ruediger Herrmann and others.
+# Copyright (c) 2011, 2021 Ruediger Herrmann and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -18,9 +18,7 @@
OSGI-INF/,\
OSGI-INF/l10n/,\
about.html
-javacDefaultEncoding.. = UTF-8
-jre.compilation.profile = JavaSE-1.8
-javacSource = 1.8
-javacTarget = 1.8
src.includes = about.html,\
icons/
+javacDefaultEncoding.. = UTF-8
+jre.compilation.profile = JavaSE-11
diff --git a/bundles/org.eclipse.rap.tools.launch.rwt/src/org/eclipse/rap/tools/launch/rwt/internal/delegate/RWTLaunchDelegate.java b/bundles/org.eclipse.rap.tools.launch.rwt/src/org/eclipse/rap/tools/launch/rwt/internal/delegate/RWTLaunchDelegate.java
index 94d3772..1788a3d 100644
--- a/bundles/org.eclipse.rap.tools.launch.rwt/src/org/eclipse/rap/tools/launch/rwt/internal/delegate/RWTLaunchDelegate.java
+++ b/bundles/org.eclipse.rap.tools.launch.rwt/src/org/eclipse/rap/tools/launch/rwt/internal/delegate/RWTLaunchDelegate.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2020 Rüdiger Herrmann and others.
+ * Copyright (c) 2011, 2021 Rüdiger Herrmann and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -12,7 +12,9 @@
package org.eclipse.rap.tools.launch.rwt.internal.delegate;
import java.text.MessageFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import org.eclipse.core.runtime.*;
import org.eclipse.debug.core.ILaunch;
@@ -69,17 +71,17 @@
public String[] getClasspath( ILaunchConfiguration configuration ) throws CoreException {
List<String> list = new ArrayList<String>( Arrays.asList( super.getClasspath( configuration ) ) );
list.add( BundleFileLocator.locate( "org.eclipse.rap.tools.launch.rwt" ) ); //$NON-NLS-1$
- list.add( BundleFileLocator.locate( "org.eclipse.jetty.continuation" ) ); //$NON-NLS-1$
list.add( BundleFileLocator.locate( "org.eclipse.jetty.http" ) ); //$NON-NLS-1$
list.add( BundleFileLocator.locate( "org.eclipse.jetty.io" ) ); //$NON-NLS-1$
list.add( BundleFileLocator.locate( "org.eclipse.jetty.security" ) ); //$NON-NLS-1$
list.add( BundleFileLocator.locate( "org.eclipse.jetty.server" ) ); //$NON-NLS-1$
list.add( BundleFileLocator.locate( "org.eclipse.jetty.servlet" ) ); //$NON-NLS-1$
+ list.add( BundleFileLocator.locate( "org.eclipse.jetty.servlet-api" ) ); //$NON-NLS-1$
list.add( BundleFileLocator.locate( "org.eclipse.jetty.util" ) ); //$NON-NLS-1$
list.add( BundleFileLocator.locate( "org.eclipse.jetty.util.ajax" ) ); //$NON-NLS-1$
list.add( BundleFileLocator.locate( "org.eclipse.jetty.webapp" ) ); //$NON-NLS-1$
list.add( BundleFileLocator.locate( "org.eclipse.jetty.xml" ) ); //$NON-NLS-1$
- list.add( BundleFileLocator.locate( "javax.servlet" ) ); //$NON-NLS-1$
+ list.add( BundleFileLocator.locate( "slf4j.api" ) ); //$NON-NLS-1$
return list.toArray( new String[0] );
}
diff --git a/bundles/org.eclipse.rap.tools.launch/.classpath b/bundles/org.eclipse.rap.tools.launch/.classpath
index eca7bdb..e801ebf 100644
--- a/bundles/org.eclipse.rap.tools.launch/.classpath
+++ b/bundles/org.eclipse.rap.tools.launch/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.rap.tools.launch/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.tools.launch/META-INF/MANIFEST.MF
index e8b3211..ef9ae67 100644
--- a/bundles/org.eclipse.rap.tools.launch/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.tools.launch/META-INF/MANIFEST.MF
@@ -16,7 +16,8 @@
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Export-Package: org.eclipse.rap.tools.launch.internal;x-friends:="org.eclipse.rap.tools.tests",
org.eclipse.rap.tools.launch.internal.tab;x-friends:="org.eclipse.rap.tools.tests",
org.eclipse.rap.tools.launch.internal.util;x-friends:="org.eclipse.rap.tools.tests"
+Automatic-Module-Name: org.eclipse.rap.tools.launch
diff --git a/bundles/org.eclipse.rap.tools.launch/build.properties b/bundles/org.eclipse.rap.tools.launch/build.properties
index 064a710..36b77ed 100644
--- a/bundles/org.eclipse.rap.tools.launch/build.properties
+++ b/bundles/org.eclipse.rap.tools.launch/build.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2007, 2019 Innoopract Informationssysteme GmbH.
+# Copyright (c) 2007, 2021 Innoopract Informationssysteme GmbH.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -20,6 +20,4 @@
src.includes = icons/,\
about.html
javacDefaultEncoding.. = UTF-8
-jre.compilation.profile = JavaSE-1.8
-javacSource = 1.8
-javacTarget = 1.8
+jre.compilation.profile = JavaSE-11
diff --git a/bundles/org.eclipse.rap.tools.templates/.classpath b/bundles/org.eclipse.rap.tools.templates/.classpath
index eca7bdb..e801ebf 100644
--- a/bundles/org.eclipse.rap.tools.templates/.classpath
+++ b/bundles/org.eclipse.rap.tools.templates/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/bundles/org.eclipse.rap.tools.templates/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.tools.templates/META-INF/MANIFEST.MF
index e427f2f..84d0804 100644
--- a/bundles/org.eclipse.rap.tools.templates/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.tools.templates/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
Bundle-Vendor: %bundleProvider
Bundle-Localization: plugin
Bundle-Activator: org.eclipse.rap.tools.templates.internal.Activator
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
Require-Bundle: org.eclipse.core.resources,
org.eclipse.core.runtime,
@@ -15,3 +15,4 @@
org.eclipse.ui
Export-Package: org.eclipse.rap.tools.templates.internal;x-internal:=true,
org.eclipse.rap.tools.templates.internal.rap;x-internal:=true
+Automatic-Module-Name: org.eclipse.rap.tools.templates
diff --git a/bundles/org.eclipse.rap.tools.templates/src/org/eclipse/rap/tools/templates/internal/rap/basic_launch.template b/bundles/org.eclipse.rap.tools.templates/src/org/eclipse/rap/tools/templates/internal/rap/basic_launch.template
index a5a46e4..fde692f 100644
--- a/bundles/org.eclipse.rap.tools.templates/src/org/eclipse/rap/tools/templates/internal/rap/basic_launch.template
+++ b/bundles/org.eclipse.rap.tools.templates/src/org/eclipse/rap/tools/templates/internal/rap/basic_launch.template
@@ -14,7 +14,7 @@
<intAttribute key="default_start_level" value="4"/>
<booleanAttribute key="includeOptional" value="false"/>
<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console -consolelog"/>
<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info"/>
diff --git a/features/org.eclipse.rap.tools.feature/.forceQualifierUpdate b/features/org.eclipse.rap.tools.feature/.forceQualifierUpdate
index 6ddf6f8..a6e65ba 100644
--- a/features/org.eclipse.rap.tools.feature/.forceQualifierUpdate
+++ b/features/org.eclipse.rap.tools.feature/.forceQualifierUpdate
@@ -1 +1 @@
-2021-05-05T12:00:00+00:00
+2021-05-26T12:00:00+00:00
diff --git a/features/org.eclipse.rap.tools.feature/feature.xml b/features/org.eclipse.rap.tools.feature/feature.xml
index 895014f..e9bf05b 100644
--- a/features/org.eclipse.rap.tools.feature/feature.xml
+++ b/features/org.eclipse.rap.tools.feature/feature.xml
@@ -98,80 +98,80 @@
unpack="false"/>
<plugin
- id="org.eclipse.jetty.continuation"
- download-size="0"
- install-size="0"
- version="9.4.37.v20210219"
- unpack="false"/>
-
- <plugin
id="org.eclipse.jetty.http"
download-size="0"
install-size="0"
- version="9.4.37.v20210219"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.io"
download-size="0"
install-size="0"
- version="9.4.37.v20210219"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.security"
download-size="0"
install-size="0"
- version="9.4.37.v20210219"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.server"
download-size="0"
install-size="0"
- version="9.4.37.v20210219"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.servlet"
download-size="0"
install-size="0"
- version="9.4.37.v20210219"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.jetty.servlet-api"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.util"
download-size="0"
install-size="0"
- version="9.4.37.v20210219"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.util.ajax"
download-size="0"
install-size="0"
- version="9.4.37.v20210219"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.webapp"
download-size="0"
install-size="0"
- version="9.4.37.v20210219"
+ version="0.0.0"
unpack="false"/>
<plugin
id="org.eclipse.jetty.xml"
download-size="0"
install-size="0"
- version="9.4.37.v20210219"
+ version="0.0.0"
unpack="false"/>
<plugin
- id="javax.servlet"
+ id="jakarta.servlet-api"
download-size="0"
install-size="0"
- version="3.1.0.v201410161800"
+ version="0.0.0"
unpack="false"/>
</feature>
diff --git a/releng/org.eclipse.rap.tools.build/target.definition/org.eclipse.rap.tools.target.definition.target b/releng/org.eclipse.rap.tools.build/target.definition/org.eclipse.rap.tools.target.definition.target
index 4518df8..71ec1db 100644
--- a/releng/org.eclipse.rap.tools.build/target.definition/org.eclipse.rap.tools.target.definition.target
+++ b/releng/org.eclipse.rap.tools.build/target.definition/org.eclipse.rap.tools.target.definition.target
@@ -1,41 +1,68 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.8"?>
-<target name="RAP Tools target platform" sequenceNumber="77">
- <locations>
- <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <unit id="org.eclipse.jetty.bundles.f.feature.group" version="9.4.37.v20210219"/>
- <repository location="https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.37.v20210219/"/>
- </location>
- <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <unit id="org.eclipse.core.runtime.feature.feature.group" version="1.2.1300.v20210429-1243"/>
- <unit id="org.eclipse.e4.rcp.feature.group" version="4.20.0.v20210429-1609"/>
- <unit id="org.eclipse.e4.rcp.source.feature.group" version="4.20.0.v20210429-1609"/>
- <unit id="org.eclipse.ecf.core.feature.feature.group" version="1.5.701.v20210326-0550"/>
- <unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.500.v20210320-0209"/>
- <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.1702.v20210326-0343"/>
- <unit id="org.eclipse.ecf.filetransfer.httpclient45.feature.feature.group" version="1.0.702.v20210326-0550"/>
- <unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.400.v20210320-0251"/>
- <unit id="org.eclipse.emf.common.feature.group" version="2.22.0.v20210319-0732"/>
- <unit id="org.eclipse.emf.ecore.feature.group" version="2.24.0.v20210405-0628"/>
- <unit id="org.eclipse.jdt.feature.group" version="3.18.800.v20210429-2046"/>
- <unit id="org.eclipse.jdt.source.feature.group" version="3.18.800.v20210429-2046"/>
- <unit id="org.eclipse.pde.feature.group" version="3.14.800.v20210429-1800"/>
- <unit id="org.eclipse.pde.source.feature.group" version="3.14.800.v20210429-1800"/>
- <unit id="org.eclipse.platform.feature.group" version="4.20.0.v20210429-1800"/>
- <unit id="org.eclipse.platform.source.feature.group" version="4.20.0.v20210429-1800"/>
- <unit id="org.eclipse.rcp.feature.group" version="4.20.0.v20210429-1800"/>
- <unit id="org.eclipse.rcp.source.feature.group" version="4.20.0.v20210429-1800"/>
- <repository location="https://download.eclipse.org/eclipse/updates/4.20-I-builds/I20210429-1800/"/>
- </location>
- <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
- <repository location="https://download.eclipse.org/cbi/updates/license/"/>
- </location>
- <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
- <repository location="https://download.eclipse.org/tools/orbit/downloads/2021-06/"/>
- <unit id="javax.servlet" version="3.1.0.v201410161800"/>
- <unit id="javax.servlet.source" version="3.1.0.v201410161800"/>
- </location>
- </locations>
- <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+<target includeMode="feature" name="RAP Tools target platform">
+ <locations>
+ <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+ <repository location="https://download.eclipse.org/cbi/updates/license/"/>
+ <unit id="org.eclipse.license.feature.group" version="2.0.2.v20181016-2210"/>
+ </location>
+ <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+ <repository location="https://download.eclipse.org/eclipse/updates/4.20-I-builds/I20210519-1800/"/>
+ <unit id="org.eclipse.core.runtime.feature.feature.group" version="1.2.1300.v20210518-0604"/>
+ <unit id="org.eclipse.e4.rcp.feature.group" version="4.20.0.v20210519-1005"/>
+ <unit id="org.eclipse.ecf.core.feature.feature.group" version="1.5.701.v20210326-0550"/>
+ <unit id="org.eclipse.ecf.core.ssl.feature.feature.group" version="1.1.500.v20210320-0209"/>
+ <unit id="org.eclipse.ecf.filetransfer.feature.feature.group" version="3.14.1702.v20210326-0343"/>
+ <unit id="org.eclipse.ecf.filetransfer.httpclient45.feature.feature.group" version="1.0.702.v20210326-0550"/>
+ <unit id="org.eclipse.ecf.filetransfer.ssl.feature.feature.group" version="1.1.400.v20210320-0251"/>
+ <unit id="org.eclipse.emf.common.feature.group" version="2.22.0.v20210319-0732"/>
+ <unit id="org.eclipse.emf.ecore.feature.group" version="2.24.0.v20210405-0628"/>
+ <unit id="org.eclipse.equinox.compendium.sdk.feature.group" version="3.22.0.v20210308-1626"/>
+ <unit id="org.eclipse.equinox.core.feature.feature.group" version="1.13.200.v20210518-0604"/>
+ <unit id="org.eclipse.equinox.core.sdk.feature.group" version="3.23.0.v20210518-0604"/>
+ <unit id="org.eclipse.jdt.feature.group" version="3.18.800.v20210519-1800"/>
+ <unit id="org.eclipse.jdt.source.feature.group" version="3.18.800.v20210519-1800"/>
+ <unit id="org.eclipse.pde.feature.group" version="3.14.800.v20210519-1800"/>
+ <unit id="org.eclipse.pde.source.feature.group" version="3.14.800.v20210519-1800"/>
+ <unit id="org.eclipse.platform.feature.group" version="4.20.0.v20210519-1800"/>
+ <unit id="org.eclipse.platform.source.feature.group" version="4.20.0.v20210519-1800"/>
+ <unit id="org.eclipse.rcp.feature.group" version="4.20.0.v20210519-1800"/>
+ </location>
+ <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="slicer" includeSource="true" type="InstallableUnit">
+ <repository location="https://download.eclipse.org/webtools/jetty/10.0.3/repository/"/>
+ <unit id="jakarta.annotation-api" version="1.3.5"/>
+ <unit id="jakarta.ejb-api" version="3.2.6"/>
+ <unit id="jakarta.enterprise.cdi-api" version="2.0.2"/>
+ <unit id="jakarta.interceptor-api" version="1.2.5"/>
+ <unit id="jakarta.transaction-api" version="1.3.2"/>
+ <unit id="javax.el-api" version="3.0.3"/>
+ <unit id="org.eclipse.jetty.http" version="10.0.3"/>
+ <unit id="org.eclipse.jetty.http.source" version="10.0.3"/>
+ <unit id="org.eclipse.jetty.io" version="10.0.3"/>
+ <unit id="org.eclipse.jetty.io.source" version="10.0.3"/>
+ <unit id="org.eclipse.jetty.jndi" version="10.0.3"/>
+ <unit id="org.eclipse.jetty.jndi.source" version="10.0.3"/>
+ <unit id="org.eclipse.jetty.plus" version="10.0.3"/>
+ <unit id="org.eclipse.jetty.plus.source" version="10.0.3"/>
+ <unit id="org.eclipse.jetty.security" version="10.0.3"/>
+ <unit id="org.eclipse.jetty.security.source" version="10.0.3"/>
+ <unit id="org.eclipse.jetty.server" version="10.0.3"/>
+ <unit id="org.eclipse.jetty.server.source" version="10.0.3"/>
+ <unit id="org.eclipse.jetty.servlet" version="10.0.3"/>
+ <unit id="org.eclipse.jetty.servlet-api" version="4.0.6"/>
+ <unit id="org.eclipse.jetty.servlet-api.source" version="4.0.6"/>
+ <unit id="org.eclipse.jetty.servlet.source" version="10.0.3"/>
+ <unit id="org.eclipse.jetty.util" version="10.0.3"/>
+ <unit id="org.eclipse.jetty.util.ajax" version="10.0.3"/>
+ <unit id="org.eclipse.jetty.util.ajax.source" version="10.0.3"/>
+ <unit id="org.eclipse.jetty.util.source" version="10.0.3"/>
+ <unit id="org.eclipse.jetty.webapp" version="10.0.3"/>
+ <unit id="org.eclipse.jetty.webapp.source" version="10.0.3"/>
+ <unit id="org.eclipse.jetty.xml" version="10.0.3"/>
+ <unit id="org.eclipse.jetty.xml.source" version="10.0.3"/>
+ <unit id="slf4j.api" version="2.0.0.alpha1"/>
+ <unit id="slf4j.api.source" version="2.0.0.alpha1"/>
+ </location>
+ </locations>
+ <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
</target>
\ No newline at end of file
diff --git a/tests/org.eclipse.rap.tools.launch.rwt.test/.classpath b/tests/org.eclipse.rap.tools.launch.rwt.test/.classpath
index eca7bdb..e801ebf 100644
--- a/tests/org.eclipse.rap.tools.launch.rwt.test/.classpath
+++ b/tests/org.eclipse.rap.tools.launch.rwt.test/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/tests/org.eclipse.rap.tools.launch.rwt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.rap.tools.launch.rwt.test/META-INF/MANIFEST.MF
index 0edfa0b..45e301b 100644
--- a/tests/org.eclipse.rap.tools.launch.rwt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rap.tools.launch.rwt.test/META-INF/MANIFEST.MF
@@ -5,5 +5,6 @@
Bundle-Version: 3.17.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Fragment-Host: org.eclipse.rap.tools.launch.rwt;bundle-version="[3.17.0,4.0.0)"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.junit;bundle-version="4.8.2"
+Automatic-Module-Name: org.eclipse.rap.tools.launch.rwt.test
diff --git a/tests/org.eclipse.rap.tools.launch.rwt.test/build.properties b/tests/org.eclipse.rap.tools.launch.rwt.test/build.properties
index 0b6844b..8ee7965 100644
--- a/tests/org.eclipse.rap.tools.launch.rwt.test/build.properties
+++ b/tests/org.eclipse.rap.tools.launch.rwt.test/build.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2011, 2019 Ruediger Herrmann and others.
+# Copyright (c) 2011, 2021 Ruediger Herrmann and others.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -16,6 +16,4 @@
about.html
src.includes = about.html
javacDefaultEncoding.. = UTF-8
-jre.compilation.profile = JavaSE-1.8
-javacSource = 1.8
-javacTarget = 1.8
+jre.compilation.profile = JavaSE-11
diff --git a/tests/org.eclipse.rap.tools.launch.rwt.test/src/org/eclipse/rap/tools/launch/rwt/internal/delegate/RWTLaunchDelegate_Test.java b/tests/org.eclipse.rap.tools.launch.rwt.test/src/org/eclipse/rap/tools/launch/rwt/internal/delegate/RWTLaunchDelegate_Test.java
index 6686603..10569c2 100644
--- a/tests/org.eclipse.rap.tools.launch.rwt.test/src/org/eclipse/rap/tools/launch/rwt/internal/delegate/RWTLaunchDelegate_Test.java
+++ b/tests/org.eclipse.rap.tools.launch.rwt.test/src/org/eclipse/rap/tools/launch/rwt/internal/delegate/RWTLaunchDelegate_Test.java
@@ -112,7 +112,6 @@
String[] classpath = launchDelegate.getClasspath( launchConfig );
String[] bundles = {
"org.eclipse.rap.tools.launch.rwt",
- "org.eclipse.jetty.continuation",
"org.eclipse.jetty.http",
"org.eclipse.jetty.io",
"org.eclipse.jetty.security",
@@ -121,7 +120,8 @@
"org.eclipse.jetty.util",
"org.eclipse.jetty.util.ajax",
"org.eclipse.jetty.webapp",
- "org.eclipse.jetty.xml"
+ "org.eclipse.jetty.xml",
+ "slf4j.api",
};
for( String bundle : bundles ) {
boolean found = false;
diff --git a/tests/org.eclipse.rap.tools.tests/.classpath b/tests/org.eclipse.rap.tools.tests/.classpath
index eca7bdb..e801ebf 100644
--- a/tests/org.eclipse.rap.tools.tests/.classpath
+++ b/tests/org.eclipse.rap.tools.tests/.classpath
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src"/>
<classpathentry kind="output" path="bin"/>
diff --git a/tests/org.eclipse.rap.tools.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.rap.tools.tests/META-INF/MANIFEST.MF
index 44dedb7..6d1c33f 100644
--- a/tests/org.eclipse.rap.tools.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rap.tools.tests/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@
Bundle-Localization: plugin
Bundle-SymbolicName: org.eclipse.rap.tools.tests
Bundle-Version: 3.17.0.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
@@ -26,3 +26,4 @@
org.eclipse.equinox.p2.repository;bundle-version="2.0.0",
org.eclipse.equinox.p2.core;bundle-version="2.0.0",
org.eclipse.equinox.p2.metadata;bundle-version="2.0.0"
+Automatic-Module-Name: org.eclipse.rap.tools.tests
diff --git a/tests/org.eclipse.rap.tools.tests/build.properties b/tests/org.eclipse.rap.tools.tests/build.properties
index 67dda19..4f3661e 100644
--- a/tests/org.eclipse.rap.tools.tests/build.properties
+++ b/tests/org.eclipse.rap.tools.tests/build.properties
@@ -1,5 +1,5 @@
################################################################################
-# Copyright (c) 2007, 2019 Innoopract Informationssysteme GmbH.
+# Copyright (c) 2007, 2021 Innoopract Informationssysteme GmbH.
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Eclipse Public License v1.0
# which accompanies this distribution, and is available at
@@ -16,7 +16,5 @@
plugin.properties,\
about.html
javacDefaultEncoding.. = UTF-8
-jre.compilation.profile = JavaSE-1.8
-javacSource = 1.8
-javacTarget = 1.8
+jre.compilation.profile = JavaSE-11
src.includes = about.html
