Google Git
Sign in
eclipse/rap/org.eclipse.rap/refs/heads/master^!/.
commit
dc872b3692f92ba7b0c931a684b473079fef68b2
[log] [tgz]
author
Markus Knauer <mknauer@eclipsesource.com>
Thu Apr 14 12:00:00 2022 +0000
committer
Markus Knauer <mknauer@eclipsesource.com>
Fri Apr 15 12:00:00 2022 +0000
tree
abf71be405456f38ede917d3527be5bf55fe014e
parent
ac93a44c1c6d11d5c51dec534cabbb8895e4c93e [diff]
Update build configuration for RAP Runtime 3.21.0 M1

- Use Eclipse Platform 4.24 I20220407-0240 (M1)
- Use Eclipse Jetty 10.0.9
- Use Eclipse Orbit 2022-06

Also remove all javax.xml dependencies from the Equinox features and the
launch configurations. The javax.xml bundle has been removed from Orbit,
and the Java package it used to provide should be part of recent JRE
versions.

Change-Id: I59136fba7f414ee4d71d24f8b21e7ed20b5688c5
Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>

diff --git a/examples/org.eclipse.rap.demo.controls/launch/RAP Controls Demo.launch b/examples/org.eclipse.rap.demo.controls/launch/RAP Controls Demo.launch
index ed9158f..7d00211 100644
--- a/examples/org.eclipse.rap.demo.controls/launch/RAP Controls Demo.launch
+++ b/examples/org.eclipse.rap.demo.controls/launch/RAP Controls Demo.launch

@@ -39,7 +39,6 @@
     <stringAttribute key="pde.version" value="3.3"/>

     <setAttribute key="selected_target_bundles">

         <setEntry value="com.ibm.icu@default:default"/>

-        <setEntry value="javax.xml@default:default"/>

         <setEntry value="org.apache.commons.fileupload@default:default"/>

         <setEntry value="org.apache.commons.io@default:default"/>

         <setEntry value="org.apache.felix.gogo.command@default:default"/>


diff --git a/examples/org.eclipse.rap.e4.demo/launch/RAP e4 Demo.launch b/examples/org.eclipse.rap.e4.demo/launch/RAP e4 Demo.launch
index 6fa57ae..b570110 100644
--- a/examples/org.eclipse.rap.e4.demo/launch/RAP e4 Demo.launch
+++ b/examples/org.eclipse.rap.e4.demo/launch/RAP e4 Demo.launch

@@ -39,7 +39,6 @@
         <setEntry value="javax.annotation@default:default"/>

         <setEntry value="javax.inject@default:default"/>

         <setEntry value="javax.servlet@default:default"/>

-        <setEntry value="javax.xml@default:default"/>

         <setEntry value="org.apache.commons.jxpath@default:default"/>

         <setEntry value="org.apache.felix.gogo.command@default:default"/>

         <setEntry value="org.apache.felix.gogo.runtime@default:default"/>


diff --git a/examples/org.eclipse.rap.examples/launch/RAP Examples Demo.launch b/examples/org.eclipse.rap.examples/launch/RAP Examples Demo.launch
index 7eb9cd8..0716bf8 100644
--- a/examples/org.eclipse.rap.examples/launch/RAP Examples Demo.launch
+++ b/examples/org.eclipse.rap.examples/launch/RAP Examples Demo.launch

@@ -39,7 +39,6 @@
     <stringAttribute key="pde.version" value="3.3"/>

     <setAttribute key="selected_target_bundles">

         <setEntry value="com.ibm.icu@default:default"/>

-        <setEntry value="javax.xml@default:default"/>

         <setEntry value="org.apache.commons.fileupload@default:default"/>

         <setEntry value="org.apache.commons.io@default:default"/>

         <setEntry value="org.apache.felix.gogo.command@default:default"/>


diff --git a/features/org.eclipse.rap.e4.equinox.target.feature/.forceQualifierUpdate b/features/org.eclipse.rap.e4.equinox.target.feature/.forceQualifierUpdate
index e777db7..20f49fd 100644
--- a/features/org.eclipse.rap.e4.equinox.target.feature/.forceQualifierUpdate
+++ b/features/org.eclipse.rap.e4.equinox.target.feature/.forceQualifierUpdate

@@ -1 +1 @@
-2022-03-09T12:00:00+00:00
+2022-04-14T12:00:00+00:00

diff --git a/features/org.eclipse.rap.e4.equinox.target.feature/feature.xml b/features/org.eclipse.rap.e4.equinox.target.feature/feature.xml
index 2648b01..77952fd 100644
--- a/features/org.eclipse.rap.e4.equinox.target.feature/feature.xml
+++ b/features/org.eclipse.rap.e4.equinox.target.feature/feature.xml

@@ -569,13 +569,6 @@
          unpack="false"/>
 
    <plugin
-         id="javax.xml"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.hamcrest.core"
          download-size="0"
          install-size="0"

diff --git a/features/org.eclipse.rap.e4.examples.feature/.forceQualifierUpdate b/features/org.eclipse.rap.e4.examples.feature/.forceQualifierUpdate
index e777db7..20f49fd 100644
--- a/features/org.eclipse.rap.e4.examples.feature/.forceQualifierUpdate
+++ b/features/org.eclipse.rap.e4.examples.feature/.forceQualifierUpdate

@@ -1 +1 @@
-2022-03-09T12:00:00+00:00
+2022-04-14T12:00:00+00:00

diff --git a/features/org.eclipse.rap.e4.feature/.forceQualifierUpdate b/features/org.eclipse.rap.e4.feature/.forceQualifierUpdate
index e777db7..20f49fd 100644
--- a/features/org.eclipse.rap.e4.feature/.forceQualifierUpdate
+++ b/features/org.eclipse.rap.e4.feature/.forceQualifierUpdate

@@ -1 +1 @@
-2022-03-09T12:00:00+00:00
+2022-04-14T12:00:00+00:00

diff --git a/features/org.eclipse.rap.e4.sdk.feature/.forceQualifierUpdate b/features/org.eclipse.rap.e4.sdk.feature/.forceQualifierUpdate
index e777db7..20f49fd 100644
--- a/features/org.eclipse.rap.e4.sdk.feature/.forceQualifierUpdate
+++ b/features/org.eclipse.rap.e4.sdk.feature/.forceQualifierUpdate

@@ -1 +1 @@
-2022-03-09T12:00:00+00:00
+2022-04-14T12:00:00+00:00

diff --git a/features/org.eclipse.rap.equinox.target.feature/.forceQualifierUpdate b/features/org.eclipse.rap.equinox.target.feature/.forceQualifierUpdate
index e777db7..20f49fd 100644
--- a/features/org.eclipse.rap.equinox.target.feature/.forceQualifierUpdate
+++ b/features/org.eclipse.rap.equinox.target.feature/.forceQualifierUpdate

@@ -1 +1 @@
-2022-03-09T12:00:00+00:00
+2022-04-14T12:00:00+00:00

diff --git a/features/org.eclipse.rap.equinox.target.feature/feature.xml b/features/org.eclipse.rap.equinox.target.feature/feature.xml
index 50903bf..7009599 100644
--- a/features/org.eclipse.rap.equinox.target.feature/feature.xml
+++ b/features/org.eclipse.rap.equinox.target.feature/feature.xml

@@ -569,13 +569,6 @@
          unpack="false"/>
 
    <plugin
-         id="javax.xml"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
          id="org.hamcrest.core"
          download-size="0"
          install-size="0"

diff --git a/features/org.eclipse.rap.examples.feature/.forceQualifierUpdate b/features/org.eclipse.rap.examples.feature/.forceQualifierUpdate
index e777db7..20f49fd 100644
--- a/features/org.eclipse.rap.examples.feature/.forceQualifierUpdate
+++ b/features/org.eclipse.rap.examples.feature/.forceQualifierUpdate

@@ -1 +1 @@
-2022-03-09T12:00:00+00:00
+2022-04-14T12:00:00+00:00

diff --git a/features/org.eclipse.rap.feature/.forceQualifierUpdate b/features/org.eclipse.rap.feature/.forceQualifierUpdate
index e777db7..20f49fd 100644
--- a/features/org.eclipse.rap.feature/.forceQualifierUpdate
+++ b/features/org.eclipse.rap.feature/.forceQualifierUpdate

@@ -1 +1 @@
-2022-03-09T12:00:00+00:00
+2022-04-14T12:00:00+00:00

diff --git a/features/org.eclipse.rap.sdk.feature/.forceQualifierUpdate b/features/org.eclipse.rap.sdk.feature/.forceQualifierUpdate
index e777db7..20f49fd 100644
--- a/features/org.eclipse.rap.sdk.feature/.forceQualifierUpdate
+++ b/features/org.eclipse.rap.sdk.feature/.forceQualifierUpdate

@@ -1 +1 @@
-2022-03-09T12:00:00+00:00
+2022-04-14T12:00:00+00:00

diff --git a/releng/org.eclipse.rap.build/pom.xml b/releng/org.eclipse.rap.build/pom.xml
index eaa56ad..a93a5cc 100644
--- a/releng/org.eclipse.rap.build/pom.xml
+++ b/releng/org.eclipse.rap.build/pom.xml

@@ -27,9 +27,9 @@
     <!-- disabled due to bug 393977
     <tycho-baseline-repo.url>http://download.eclipse.org/rt/rap/3.2/</tycho-baseline-repo.url>
      -->
-    <jetty-repo.url>https://download.eclipse.org/webtools/jetty/10.0.6/repository/</jetty-repo.url>
-    <orbit-repo.url>https://download.eclipse.org/tools/orbit/downloads/2022-03/</orbit-repo.url>
-    <platform-repo.url>https://download.eclipse.org/eclipse/updates/4.23/R-4.23-202203080310/</platform-repo.url>
+    <jetty-repo.url>https://download.eclipse.org/webtools/jetty/10.0.9/repository/</jetty-repo.url>
+    <orbit-repo.url>https://download.eclipse.org/tools/orbit/downloads/2022-06/</orbit-repo.url>
+    <platform-repo.url>https://download.eclipse.org/eclipse/updates/4.24-I-builds/I20220407-0240/</platform-repo.url>
     <rap-extra-repo.url>https://download.eclipse.org/rt/rap/base-platforms/3.14/extra-dependencies/</rap-extra-repo.url>
     <license-repo.url>https://download.eclipse.org/cbi/updates/license/</license-repo.url>
     <!-- The build type, N for nighty builds, S for stable builds. S-builds will be signed. -->

diff --git a/releng/org.eclipse.rap.build/scripts/deploy-rap.sh b/releng/org.eclipse.rap.build/scripts/deploy-rap.sh
index 12fcf7a..d8ce1c5 100755
--- a/releng/org.eclipse.rap.build/scripts/deploy-rap.sh
+++ b/releng/org.eclipse.rap.build/scripts/deploy-rap.sh

@@ -10,7 +10,7 @@
 
 RAP_UID="${RAP_UID:-genie.rap@projects-storage.eclipse.org}"
 RAP_BASE_DIRECTORY="${RAP_BASE_DIRECTORY:-/home/data/httpd/download.eclipse.org/rt/rap}"
-RAP_RELEASE="${RAP_RELEASE:-3.17}"
+RAP_RELEASE="${RAP_RELEASE:-3.21}"
 RAP_VERSION="${RAP_VERSION:-${RAP_RELEASE}.0}"
 RAP_MILESTONE="${RAP_MILESTONE:-M0}"
 RAP_RUNTIME_BUILD_NUMBER="${RAP_RUNTIME_BUILD_NUMBER:-0}"

diff --git a/tests/org.eclipse.rap.ui.tests/RAP IAD Tests.launch b/tests/org.eclipse.rap.ui.tests/RAP IAD Tests.launch
index 476831a..d9abe9d 100644
--- a/tests/org.eclipse.rap.ui.tests/RAP IAD Tests.launch
+++ b/tests/org.eclipse.rap.ui.tests/RAP IAD Tests.launch

@@ -57,7 +57,7 @@
 <stringAttribute key="pde.version" value="3.3"/>

 <stringAttribute key="product" value="org.eclipse.sdk.ide"/>

 <booleanAttribute key="show_selected_only" value="true"/>

-<stringAttribute key="target_bundles" value="com.ibm.icu@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@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.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@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.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.help@default:default,org.eclipse.jdt.junit.runtime@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.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.update.configurator@3:true,org.hamcrest.core@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default"/>

+<stringAttribute key="target_bundles" value="com.ibm.icu@default:default,javax.servlet@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@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.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@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.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.help@default:default,org.eclipse.jdt.junit.runtime@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.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.update.configurator@3:true,org.hamcrest.core@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default"/>

 <booleanAttribute key="tracing" value="false"/>

 <booleanAttribute key="useCustomFeatures" value="false"/>

 <booleanAttribute key="useDefaultConfig" value="true"/>


diff --git a/tests/org.eclipse.rap.ui.tests/RAP UI Tests.launch b/tests/org.eclipse.rap.ui.tests/RAP UI Tests.launch
index f2950a9..263fddc 100644
--- a/tests/org.eclipse.rap.ui.tests/RAP UI Tests.launch
+++ b/tests/org.eclipse.rap.ui.tests/RAP UI Tests.launch

@@ -57,7 +57,7 @@
 <stringAttribute key="pde.version" value="3.3"/>

 <stringAttribute key="product" value="org.eclipse.sdk.ide"/>

 <booleanAttribute key="show_selected_only" value="true"/>

-<stringAttribute key="target_bundles" value="com.ibm.icu@default:default,javax.servlet@default:default,javax.xml@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@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.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@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.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.help@default:default,org.eclipse.jdt.junit.runtime@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.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.update.configurator@3:true,org.hamcrest.core@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default"/>

+<stringAttribute key="target_bundles" value="com.ibm.icu@default:default,javax.servlet@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@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.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@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.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.help@default:default,org.eclipse.jdt.junit.runtime@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.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.update.configurator@3:true,org.hamcrest.core@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default"/>

 <booleanAttribute key="tracing" value="false"/>

 <booleanAttribute key="useCustomFeatures" value="false"/>

 <booleanAttribute key="useDefaultConfig" value="true"/>