Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Knauer2020-07-31 08:00:00 -0400
committerMarkus Knauer2020-08-05 08:40:33 -0400
commitd6e176c71e5b6b3c7400bc80d491bbfc34c3d064 (patch)
tree4b679025193acafd09a9f0ee46514e00aa853552
parent52523328c4d7baf922fca938d21a25e3ada7dc35 (diff)
downloadorg.eclipse.rap-3.14.0-M2.tar.gz
org.eclipse.rap-3.14.0-M2.tar.xz
org.eclipse.rap-3.14.0-M2.zip
Update build configuration for RAP Runtime 3.14.0 M23.14.0-M2
- Use Eclipse Platform build 4.17-I-builds/I20200729-1800 - Update package imports to follow platform changes Change-Id: If95384811336d60915bc716a6cc2148479e8c8af Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>
-rw-r--r--bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributionRecord.java2
-rw-r--r--bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/MenuItemRenderer.java2
-rw-r--r--bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ContributionsAnalyzer.java2
-rw-r--r--features/org.eclipse.rap.e4.equinox.target.feature/.forceQualifierUpdate2
-rw-r--r--features/org.eclipse.rap.equinox.target.feature/.forceQualifierUpdate2
-rw-r--r--releng/org.eclipse.rap.build/pom.xml2
6 files changed, 6 insertions, 6 deletions
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributionRecord.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributionRecord.java
index 5fd1eb0754..c24e41c4a1 100644
--- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributionRecord.java
+++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/ContributionRecord.java
@@ -19,7 +19,7 @@ import java.util.Iterator;
import java.util.List;
import org.eclipse.core.expressions.Expression;
import org.eclipse.core.expressions.ExpressionInfo;
-import org.eclipse.core.internal.expressions.OrExpression;
+import org.eclipse.core.expressions.OrExpression;
import org.eclipse.e4.core.commands.ExpressionContext;
import org.eclipse.e4.core.contexts.EclipseContextFactory;
import org.eclipse.e4.core.contexts.IContextFunction;
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/MenuItemRenderer.java b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/MenuItemRenderer.java
index ab28d411af..1bd0416019 100644
--- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/MenuItemRenderer.java
+++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/src/org/eclipse/e4/ui/workbench/renderers/swt/MenuItemRenderer.java
@@ -16,7 +16,7 @@ import javax.annotation.PreDestroy;
import javax.inject.Inject;
import org.eclipse.core.expressions.EvaluationResult;
import org.eclipse.core.expressions.Expression;
-import org.eclipse.core.internal.expressions.ReferenceExpression;
+import org.eclipse.core.expressions.ReferenceExpression;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.e4.core.commands.ExpressionContext;
import org.eclipse.e4.core.contexts.IEclipseContext;
diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ContributionsAnalyzer.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ContributionsAnalyzer.java
index bfdc3b2e20..7af717df0c 100644
--- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ContributionsAnalyzer.java
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ContributionsAnalyzer.java
@@ -20,7 +20,7 @@ import java.util.List;
import org.eclipse.core.expressions.EvaluationResult;
import org.eclipse.core.expressions.Expression;
import org.eclipse.core.expressions.ExpressionInfo;
-import org.eclipse.core.internal.expressions.ReferenceExpression;
+import org.eclipse.core.expressions.ReferenceExpression;
import org.eclipse.e4.core.commands.ExpressionContext;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.ui.model.application.MApplication;
diff --git a/features/org.eclipse.rap.e4.equinox.target.feature/.forceQualifierUpdate b/features/org.eclipse.rap.e4.equinox.target.feature/.forceQualifierUpdate
index c23b086d7c..1f424a573b 100644
--- a/features/org.eclipse.rap.e4.equinox.target.feature/.forceQualifierUpdate
+++ b/features/org.eclipse.rap.e4.equinox.target.feature/.forceQualifierUpdate
@@ -1 +1 @@
-2020-07-16T12:00:00+00:00
+2020-07-31T12: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 c23b086d7c..1f424a573b 100644
--- a/features/org.eclipse.rap.equinox.target.feature/.forceQualifierUpdate
+++ b/features/org.eclipse.rap.equinox.target.feature/.forceQualifierUpdate
@@ -1 +1 @@
-2020-07-16T12:00:00+00:00
+2020-07-31T12:00:00+00:00
diff --git a/releng/org.eclipse.rap.build/pom.xml b/releng/org.eclipse.rap.build/pom.xml
index fd3990707e..8c35f01dea 100644
--- a/releng/org.eclipse.rap.build/pom.xml
+++ b/releng/org.eclipse.rap.build/pom.xml
@@ -31,7 +31,7 @@
<cbi-plugins.version>1.1.2</cbi-plugins.version>
<jetty-repo.url>https://download.eclipse.org/jetty/updates/jetty-bundles-9.x/9.4.30.v20200611/</jetty-repo.url>
<orbit-repo.url>https://download.eclipse.org/tools/orbit/downloads/2020-09/</orbit-repo.url>
- <platform-repo.url>https://download.eclipse.org/eclipse/updates/4.17milestones/S-4.17M1-202007081800/</platform-repo.url>
+ <platform-repo.url>https://download.eclipse.org/eclipse/updates/4.17-I-builds/I20200729-1800/</platform-repo.url>
<rap-extra-repo.url>https://build.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. -->

Back to the top