[Git][java-team/eclipse-platform-runtime][master] 3 commits: New upstream version 4.18
Emmanuel Bourg
gitlab at salsa.debian.org
Sat Dec 26 22:38:19 GMT 2020
Emmanuel Bourg pushed to branch master at Debian Java Maintainers / eclipse-platform-runtime
Commits:
1cf9ded3 by Emmanuel Bourg at 2020-12-26T23:35:44+01:00
New upstream version 4.18
- - - - -
3d4d811c by Emmanuel Bourg at 2020-12-26T23:35:46+01:00
Update upstream source from tag 'upstream/4.18'
Update to upstream version '4.18'
with Debian dir dae1f6b9eb5212526f5c8024109f93058dd268dc
- - - - -
6aaeb654 by Emmanuel Bourg at 2020-12-26T23:37:58+01:00
New upstream release (4.18)
- - - - -
29 changed files:
- bundles/org.eclipse.core.contenttype/pom.xml
- bundles/org.eclipse.core.expressions/pom.xml
- bundles/org.eclipse.core.jobs/META-INF/MANIFEST.MF
- bundles/org.eclipse.core.jobs/pom.xml
- bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobManager.java
- bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/Job.java
- bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF
- bundles/org.eclipse.core.runtime/pom.xml
- bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
- bundles/org.eclipse.core.tools/pom.xml
- bundles/org.eclipse.e4.core.contexts/pom.xml
- bundles/org.eclipse.e4.core.di.annotations/pom.xml
- bundles/org.eclipse.e4.core.di.extensions.supplier/pom.xml
- bundles/org.eclipse.e4.core.di.extensions/pom.xml
- bundles/org.eclipse.e4.core.di/pom.xml
- bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF
- bundles/org.eclipse.e4.core.services/pom.xml
- bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/about/InstalledBundles.java
- debian/changelog
- features/org.eclipse.core.runtime.feature/feature.xml
- features/org.eclipse.core.runtime.feature/pom.xml
- features/org.eclipse.core.tools-feature/pom.xml
- pom.xml
- tests/org.eclipse.core.contenttype.tests/pom.xml
- tests/org.eclipse.core.expressions.tests/pom.xml
- tests/org.eclipse.core.tests.harness/pom.xml
- tests/org.eclipse.core.tests.runtime/pom.xml
- tests/org.eclipse.e4.core.tests/pom.xml
- tests/pom.xml
Changes:
=====================================
bundles/org.eclipse.core.contenttype/pom.xml
=====================================
@@ -14,7 +14,7 @@
<parent>
<artifactId>eclipse.platform.runtime</artifactId>
<groupId>eclipse.platform.runtime</groupId>
- <version>4.17.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.core</groupId>
=====================================
bundles/org.eclipse.core.expressions/pom.xml
=====================================
@@ -14,7 +14,7 @@
<parent>
<artifactId>eclipse.platform.runtime</artifactId>
<groupId>eclipse.platform.runtime</groupId>
- <version>4.17.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.core</groupId>
=====================================
bundles/org.eclipse.core.jobs/META-INF/MANIFEST.MF
=====================================
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.core.jobs; singleton:=true
-Bundle-Version: 3.10.800.qualifier
+Bundle-Version: 3.10.1000.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package: org.eclipse.core.internal.jobs;x-internal:=true,
=====================================
bundles/org.eclipse.core.jobs/pom.xml
=====================================
@@ -15,12 +15,12 @@
<parent>
<artifactId>eclipse.platform.runtime</artifactId>
<groupId>eclipse.platform.runtime</groupId>
- <version>4.17.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.jobs</artifactId>
- <version>3.10.800-SNAPSHOT</version>
+ <version>3.10.1000-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
<properties>
<code.ignoredWarnings>-warn:-deprecation,raw,unchecked</code.ignoredWarnings>
=====================================
bundles/org.eclipse.core.jobs/src/org/eclipse/core/internal/jobs/JobManager.java
=====================================
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2019 IBM Corporation and others.
+ * Copyright (c) 2003, 2020 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -20,6 +20,7 @@
* Jan Koehnlein - Fix for bug 60964 (454698)
* Terry Parker - Bug 457504, Publish a job group's final status to IJobChangeListeners
* Xored Software Inc - Fix for bug 550738
+ * Christoph Laeubrich - remove deprecated API
*******************************************************************************/
package org.eclipse.core.internal.jobs;
@@ -1167,8 +1168,6 @@ public class JobManager implements IJobManager, DebugOptionsListener {
* @see #reportUnblocked
*/
final void reportBlocked(IProgressMonitor monitor, InternalJob blockingJob) {
- if (!(monitor instanceof IProgressMonitorWithBlocking))
- return;
IStatus reason;
if (blockingJob == null || blockingJob instanceof ThreadJob || blockingJob.isSystem()) {
reason = new Status(IStatus.INFO, JobManager.PI_JOBS, 1, JobMessages.jobs_blocked0, null);
@@ -1176,7 +1175,7 @@ public class JobManager implements IJobManager, DebugOptionsListener {
String msg = NLS.bind(JobMessages.jobs_blocked1, blockingJob.getName());
reason = new JobStatus(IStatus.INFO, (Job) blockingJob, msg);
}
- ((IProgressMonitorWithBlocking) monitor).setBlocked(reason);
+ monitor.setBlocked(reason);
}
/**
@@ -1186,8 +1185,7 @@ public class JobManager implements IJobManager, DebugOptionsListener {
* @see #reportBlocked
*/
final void reportUnblocked(IProgressMonitor monitor) {
- if (monitor instanceof IProgressMonitorWithBlocking)
- ((IProgressMonitorWithBlocking) monitor).clearBlocked();
+ monitor.clearBlocked();
}
@Override
=====================================
bundles/org.eclipse.core.jobs/src/org/eclipse/core/runtime/jobs/Job.java
=====================================
@@ -148,10 +148,12 @@ public abstract class Job extends InternalJob {
}
/**
- * Creates a new Job that will execute the provided function
- * when it runs.
+ * Creates a new Job that will execute the provided function when it runs.
+ *
+ * Prefer using {@link Job#create(String, ICoreRunnable)} as this does not
+ * require to call done on the monitor and relies on OperationCanceledException
*
- * @param name The name of the job
+ * @param name The name of the job
* @param function The function to execute
* @return A job that encapsulates the provided function
* @see IJobFunction
@@ -196,10 +198,11 @@ public abstract class Job extends InternalJob {
* Creates a new system {@link Job} with the given name that will execute the
* provided function when it runs.
*
- * @param name
- * the name of the job
- * @param function
- * The function to execute
+ * Prefer using {@link Job#createSystem(String, ICoreRunnable)} as this does not
+ * require to call done on the monitor and relies on OperationCanceledException
+ *
+ * @param name the name of the job
+ * @param function The function to execute
* @return a job that encapsulates the provided function
* @see IJobFunction
* @see Job#setSystem(boolean)
=====================================
bundles/org.eclipse.core.runtime/META-INF/MANIFEST.MF
=====================================
@@ -1,18 +1,18 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
-Bundle-Version: 3.19.0.qualifier
+Bundle-Version: 3.20.0.qualifier
Bundle-SymbolicName: org.eclipse.core.runtime; singleton:=true
Bundle-Vendor: %providerName
Bundle-Activator: org.eclipse.core.internal.runtime.PlatformActivator
Bundle-Localization: plugin
Export-Package: org.eclipse.core.internal.preferences.legacy;x-internal:=true,
org.eclipse.core.internal.runtime;x-internal:=true,
- org.eclipse.core.runtime;version="3.6.0"
+ org.eclipse.core.runtime;version="3.7.0"
Require-Bundle: org.eclipse.osgi;bundle-version="[3.13.0,4.0.0)";visibility:=reexport,
- org.eclipse.equinox.common;bundle-version="[3.13.0,4.0.0)";visibility:=reexport,
+ org.eclipse.equinox.common;bundle-version="[3.14.0,4.0.0)";visibility:=reexport,
org.eclipse.core.jobs;bundle-version="[3.10.0,4.0.0)";visibility:=reexport,
- org.eclipse.equinox.registry;bundle-version="[3.9.0,4.0.0)";visibility:=reexport,
+ org.eclipse.equinox.registry;bundle-version="[3.10.0,4.0.0)";visibility:=reexport,
org.eclipse.equinox.preferences;bundle-version="[3.7.0,4.0.0)";visibility:=reexport,
org.eclipse.core.contenttype;bundle-version="[3.7.0,4.0.0)";visibility:=reexport,
org.eclipse.equinox.app;bundle-version="1.3.0";visibility:=reexport
=====================================
bundles/org.eclipse.core.runtime/pom.xml
=====================================
@@ -14,11 +14,11 @@
<parent>
<artifactId>eclipse.platform.runtime</artifactId>
<groupId>eclipse.platform.runtime</groupId>
- <version>4.17.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.runtime</artifactId>
- <version>3.19.0-SNAPSHOT</version>
+ <version>3.20.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
=====================================
bundles/org.eclipse.core.runtime/src/org/eclipse/core/runtime/Platform.java
=====================================
@@ -1424,6 +1424,17 @@ public final class Platform {
* highest version. Note that clients may want to filter the results based on
* the state of the bundles.
* </p>
+ * <p>
+ * Note that looking up a Bundle by its symbolic name is less efficient than
+ * looking up a Bundle by a class loaded by that bundle. Callers should consider
+ * whether or not it is more appropriate to use
+ * {@link FrameworkUtil#getBundle(Class)} instead.
+ * </p>
+ * <p>
+ * Note also that if the purpose of looking up the Bundle in order to log a
+ * message, then it would be more appropriate to use the direct
+ * {@link #getLog(Class)} instead
+ * </p>
*
* @param symbolicName the symbolic name of the bundle to be returned.
* @return the bundle that has the specified symbolic name with the highest
=====================================
bundles/org.eclipse.core.tools/pom.xml
=====================================
@@ -14,7 +14,7 @@
<parent>
<artifactId>eclipse.platform.runtime</artifactId>
<groupId>eclipse.platform.runtime</groupId>
- <version>4.17.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.core</groupId>
=====================================
bundles/org.eclipse.e4.core.contexts/pom.xml
=====================================
@@ -14,7 +14,7 @@
<parent>
<artifactId>eclipse.platform.runtime</artifactId>
<groupId>eclipse.platform.runtime</groupId>
- <version>4.17.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.e4</groupId>
=====================================
bundles/org.eclipse.e4.core.di.annotations/pom.xml
=====================================
@@ -14,7 +14,7 @@
<parent>
<artifactId>eclipse.platform.runtime</artifactId>
<groupId>eclipse.platform.runtime</groupId>
- <version>4.17.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.e4</groupId>
=====================================
bundles/org.eclipse.e4.core.di.extensions.supplier/pom.xml
=====================================
@@ -14,7 +14,7 @@
<parent>
<artifactId>eclipse.platform.runtime</artifactId>
<groupId>eclipse.platform.runtime</groupId>
- <version>4.17.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.e4</groupId>
=====================================
bundles/org.eclipse.e4.core.di.extensions/pom.xml
=====================================
@@ -14,7 +14,7 @@
<parent>
<artifactId>eclipse.platform.runtime</artifactId>
<groupId>eclipse.platform.runtime</groupId>
- <version>4.17.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.e4</groupId>
=====================================
bundles/org.eclipse.e4.core.di/pom.xml
=====================================
@@ -14,7 +14,7 @@
<parent>
<artifactId>eclipse.platform.runtime</artifactId>
<groupId>eclipse.platform.runtime</groupId>
- <version>4.17.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.e4</groupId>
=====================================
bundles/org.eclipse.e4.core.services/META-INF/MANIFEST.MF
=====================================
@@ -4,7 +4,7 @@ Bundle-SymbolicName: org.eclipse.e4.core.services;singleton:=true
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
-Bundle-Version: 2.2.400.qualifier
+Bundle-Version: 2.2.500.qualifier
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Import-Package: javax.annotation,
@@ -38,7 +38,8 @@ Export-Package: org.eclipse.e4.core.internal.services;x-friends:="org.eclipse.e4
org.eclipse.e4.ui.workbench,
org.eclipse.e4.ui.workbench.renderers.swt,
org.eclipse.e4.ui.workbench.swt,
- org.eclipse.ui.workbench",
+ org.eclipse.ui.workbench,
+ org.eclipse.e4.core.commands",
org.eclipse.e4.core.services.nls,
org.eclipse.e4.core.services.statusreporter;x-friends:="org.eclipse.e4.ui.workbench.swt,org.eclipse.e4.ui.progress,org.eclipse.ui.ide",
org.eclipse.e4.core.services.translation
=====================================
bundles/org.eclipse.e4.core.services/pom.xml
=====================================
@@ -14,11 +14,11 @@
<parent>
<artifactId>eclipse.platform.runtime</artifactId>
<groupId>eclipse.platform.runtime</groupId>
- <version>4.17.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.e4</groupId>
<artifactId>org.eclipse.e4.core.services</artifactId>
- <version>2.2.400-SNAPSHOT</version>
+ <version>2.2.500-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
=====================================
bundles/org.eclipse.e4.core.services/src/org/eclipse/e4/core/internal/services/about/InstalledBundles.java
=====================================
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2019 ArSysOp and others.
+ * Copyright (c) 2019, 2020 ArSysOp and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -43,7 +43,11 @@ public class InstalledBundles implements ISystemInformation {
}
private String name(Bundle bundle) {
- return bundle.getHeaders(null).get(Constants.BUNDLE_NAME);
+ String name = bundle.getHeaders(null).get(Constants.BUNDLE_NAME);
+ // Bug 567113: do not return null names because the used Collectors.toMap does
+ // not accept null values for whatever reason.
+ // And empty string is better for the used purpose anyway.
+ return name != null ? name : ""; //$NON-NLS-1$
}
private void writeBundleInfo(PrintWriter writer, Bundle bundle) {
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+eclipse-platform-runtime (4.18-1) unstable; urgency=medium
+
+ * New upstream release
+
+ -- Emmanuel Bourg <ebourg at apache.org> Sat, 26 Dec 2020 23:37:43 +0100
+
eclipse-platform-runtime (4.17-1) unstable; urgency=medium
* New upstream release
=====================================
features/org.eclipse.core.runtime.feature/feature.xml
=====================================
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.core.runtime.feature"
label="%featureName"
- version="1.2.1000.qualifier"
+ version="1.2.1100.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
=====================================
features/org.eclipse.core.runtime.feature/pom.xml
=====================================
@@ -14,11 +14,11 @@
<parent>
<artifactId>eclipse.platform.runtime</artifactId>
<groupId>eclipse.platform.runtime</groupId>
- <version>4.17.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.core.feature</groupId>
<artifactId>org.eclipse.core.runtime.feature</artifactId>
- <version>1.2.1000-SNAPSHOT</version>
+ <version>1.2.1100-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
=====================================
features/org.eclipse.core.tools-feature/pom.xml
=====================================
@@ -14,7 +14,7 @@
<parent>
<artifactId>eclipse.platform.runtime</artifactId>
<groupId>eclipse.platform.runtime</groupId>
- <version>4.17.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
<relativePath>../../</relativePath>
</parent>
<groupId>org.eclipse.core.feature</groupId>
=====================================
pom.xml
=====================================
@@ -16,13 +16,12 @@
<parent>
<groupId>org.eclipse</groupId>
<artifactId>eclipse-platform-parent</artifactId>
- <version>4.17.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
<relativePath>../eclipse-platform-parent</relativePath>
</parent>
<groupId>eclipse.platform.runtime</groupId>
<artifactId>eclipse.platform.runtime</artifactId>
- <version>4.17.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
=====================================
tests/org.eclipse.core.contenttype.tests/pom.xml
=====================================
@@ -15,7 +15,7 @@
<parent>
<artifactId>eclipse.platform.runtime.tests</artifactId>
<groupId>eclipse.platform.runtime</groupId>
- <version>4.17.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.contenttype.tests</artifactId>
=====================================
tests/org.eclipse.core.expressions.tests/pom.xml
=====================================
@@ -15,7 +15,7 @@
<parent>
<artifactId>eclipse.platform.runtime.tests</artifactId>
<groupId>eclipse.platform.runtime</groupId>
- <version>4.17.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.expressions.tests</artifactId>
=====================================
tests/org.eclipse.core.tests.harness/pom.xml
=====================================
@@ -15,7 +15,7 @@
<parent>
<artifactId>eclipse.platform.runtime.tests</artifactId>
<groupId>eclipse.platform.runtime</groupId>
- <version>4.17.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.tests.harness</artifactId>
=====================================
tests/org.eclipse.core.tests.runtime/pom.xml
=====================================
@@ -16,7 +16,7 @@
<parent>
<artifactId>eclipse.platform.runtime.tests</artifactId>
<groupId>eclipse.platform.runtime</groupId>
- <version>4.17.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.core</groupId>
<artifactId>org.eclipse.core.tests.runtime</artifactId>
=====================================
tests/org.eclipse.e4.core.tests/pom.xml
=====================================
@@ -15,7 +15,7 @@
<parent>
<artifactId>eclipse.platform.runtime.tests</artifactId>
<groupId>eclipse.platform.runtime</groupId>
- <version>4.17.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
</parent>
<groupId>org.eclipse.e4</groupId>
<artifactId>org.eclipse.e4.core.tests</artifactId>
=====================================
tests/pom.xml
=====================================
@@ -15,10 +15,9 @@
<parent>
<groupId>eclipse.platform.runtime</groupId>
<artifactId>eclipse.platform.runtime</artifactId>
- <version>4.17.0-SNAPSHOT</version>
+ <version>4.18.0-SNAPSHOT</version>
</parent>
<artifactId>eclipse.platform.runtime.tests</artifactId>
- <version>4.17.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<code.ignoredWarnings>${tests.ignoredWarnings}</code.ignoredWarnings>
View it on GitLab: https://salsa.debian.org/java-team/eclipse-platform-runtime/-/compare/4d0859d3da05a2052867fb56f2f67f4fe09aa66a...6aaeb6547442ee2cecf32ea7d8b5b8b7c75e1549
--
View it on GitLab: https://salsa.debian.org/java-team/eclipse-platform-runtime/-/compare/4d0859d3da05a2052867fb56f2f67f4fe09aa66a...6aaeb6547442ee2cecf32ea7d8b5b8b7c75e1549
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20201226/f56801f0/attachment.html>
More information about the pkg-java-commits
mailing list