From 03f131d08a121e082b101b853c89f8c96fa18f39 Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Mon, 4 Jul 2022 21:24:08 +0200 Subject: [PATCH] Bump remaining Plug-ins to version 2.0.0 and apply version ranges But for tests remove all dependency versions. For tests it is not crucial to have a version specified on a dependency since the available versions are usually controlled by the workspace TP. So specifying no version simplifies dependency updates. --- m2e-core-tests | 2 +- .../META-INF/MANIFEST.MF | 14 +++++------ .../META-INF/MANIFEST.MF | 20 ++++++++-------- .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 8 +++---- .../META-INF/MANIFEST.MF | 10 ++++---- org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 24 +++++++++---------- .../META-INF/MANIFEST.MF | 2 +- org.eclipse.m2e.editor.lemminx/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 12 +++++----- org.eclipse.m2e.editor/META-INF/MANIFEST.MF | 6 ++--- .../META-INF/MANIFEST.MF | 14 +++++------ org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF | 8 +++---- org.eclipse.m2e.jdt/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 6 ++--- org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 8 +++---- .../META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 8 +++---- org.eclipse.m2e.scm/META-INF/MANIFEST.MF | 2 +- .../META-INF/MANIFEST.MF | 8 +++---- .../META-INF/MANIFEST.MF | 6 ++--- .../META-INF/MANIFEST.MF | 6 ++--- 29 files changed, 97 insertions(+), 97 deletions(-) diff --git a/m2e-core-tests b/m2e-core-tests index 4e4fa1242c..180b77bb4d 160000 --- a/m2e-core-tests +++ b/m2e-core-tests @@ -1 +1 @@ -Subproject commit 4e4fa1242c41d0a6acc16ef2fe2bc77fcfe8b4bd +Subproject commit 180b77bb4da7fa1709417c75e609c032269da91e diff --git a/org.eclipse.m2e.apt.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.apt.tests/META-INF/MANIFEST.MF index ade434471c..a6086b96f5 100644 --- a/org.eclipse.m2e.apt.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.apt.tests/META-INF/MANIFEST.MF @@ -4,14 +4,14 @@ Bundle-Name: m2e-apt Tests Plug-in Bundle-SymbolicName: org.eclipse.m2e.apt.tests Bundle-Version: 2.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.eclipse.m2e.tests.common;bundle-version="[1.0.0,2.0)", - org.junit;bundle-version="3.8.2", - org.eclipse.jdt.core;bundle-version="3.7.0", - org.eclipse.jdt.apt.core;bundle-version="3.3.500", +Require-Bundle: org.eclipse.m2e.tests.common, + org.junit, + org.eclipse.jdt.core, + org.eclipse.jdt.apt.core, org.eclipse.m2e.core, - org.eclipse.core.resources;bundle-version="3.6.0", - org.eclipse.core.runtime;bundle-version="3.7.0", - org.eclipse.jdt.apt.pluggable.core;bundle-version="1.0.400" + org.eclipse.core.resources, + org.eclipse.core.runtime, + org.eclipse.jdt.apt.pluggable.core Bundle-Vendor: Eclipse.org - m2e Export-Package: org.eclipse.m2e.apt.tests;x-internal:=true Automatic-Module-Name: org.eclipse.m2e.apt.tests diff --git a/org.eclipse.m2e.binaryproject.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.binaryproject.tests/META-INF/MANIFEST.MF index 3fcf7b8a54..8259aabb86 100644 --- a/org.eclipse.m2e.binaryproject.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.binaryproject.tests/META-INF/MANIFEST.MF @@ -2,18 +2,18 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: M2E Binary Project Core Tests Bundle-SymbolicName: org.eclipse.m2e.binaryproject.tests;singleton:=true -Bundle-Version: 1.16.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Vendor: Eclipse.org - m2e -Require-Bundle: org.eclipse.m2e.core;bundle-version="1.16.0", +Require-Bundle: org.eclipse.m2e.core, org.eclipse.m2e.maven.runtime, - org.eclipse.m2e.binaryproject;bundle-version="1.16.0", - org.eclipse.m2e.tests.common;bundle-version="1.16.0", - org.junit;bundle-version="4.0.0", - org.eclipse.equinox.common;bundle-version="3.6.100", - org.eclipse.core.resources;bundle-version="3.8.0", - org.eclipse.m2e.jdt;bundle-version="1.16.0", - org.eclipse.jdt.core;bundle-version="3.8.1", - org.eclipse.core.runtime;bundle-version="3.8.0" + org.eclipse.m2e.binaryproject, + org.eclipse.m2e.tests.common, + org.junit, + org.eclipse.equinox.common, + org.eclipse.core.resources, + org.eclipse.m2e.jdt, + org.eclipse.jdt.core, + org.eclipse.core.runtime Import-Package: org.slf4j;version="[1.6.2,2.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 Automatic-Module-Name: org.eclipse.m2e.binaryproject.tests diff --git a/org.eclipse.m2e.binaryproject.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.binaryproject.ui/META-INF/MANIFEST.MF index f0091c12e3..21ea7022c5 100644 --- a/org.eclipse.m2e.binaryproject.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.binaryproject.ui/META-INF/MANIFEST.MF @@ -1,13 +1,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.binaryproject.ui;singleton:=true -Bundle-Version: 1.19.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Vendor: Eclipse.org - m2e Bundle-Name: M2E Binary Project UI Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.m2e.core.ui;bundle-version="[2.0.0,3.0.0)", - org.eclipse.m2e.binaryproject;bundle-version="[1.16.0,2.0.0)", + org.eclipse.m2e.binaryproject;bundle-version="[2.0.0,3.0.0)", org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)" Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.m2e.binaryproject/META-INF/MANIFEST.MF b/org.eclipse.m2e.binaryproject/META-INF/MANIFEST.MF index 70d1e6b841..805b8be289 100644 --- a/org.eclipse.m2e.binaryproject/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.binaryproject/META-INF/MANIFEST.MF @@ -1,12 +1,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.binaryproject;singleton:=true -Bundle-Version: 1.18.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Vendor: Eclipse.org - m2e Bundle-Name: M2E Binary Project Core Require-Bundle: org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)", - org.eclipse.m2e.sourcelookup;bundle-version="[1.16.0,2.0.0)", + org.eclipse.m2e.sourcelookup;bundle-version="[2.0.0,3.0.0)", org.eclipse.m2e.jdt;bundle-version="[2.0.0,3.0.0)", org.eclipse.equinox.common;bundle-version="3.6.0", org.eclipse.core.resources;bundle-version="3.7.0", diff --git a/org.eclipse.m2e.core.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.tests/META-INF/MANIFEST.MF index 1c7341773f..d256b2bd5c 100644 --- a/org.eclipse.m2e.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core.tests/META-INF/MANIFEST.MF @@ -1,13 +1,13 @@ Manifest-Version: 1.0 -Fragment-Host: org.eclipse.m2e.core;bundle-version="1.16.0" +Fragment-Host: org.eclipse.m2e.core Bundle-ManifestVersion: 2 Bundle-Name: M2E Maven Integration for Eclipse Core Tests Bundle-SymbolicName: org.eclipse.m2e.core.tests -Bundle-Version: 1.16.1.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: Eclipse.org - m2e -Require-Bundle: org.eclipse.m2e.tests.common;bundle-version="1.16.0", - org.junit;bundle-version="4.12.0", +Require-Bundle: org.eclipse.m2e.tests.common, + org.junit, org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.m2e.maven.runtime diff --git a/org.eclipse.m2e.core.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.ui.tests/META-INF/MANIFEST.MF index 7baf567d35..e3ec02a5ff 100644 --- a/org.eclipse.m2e.core.ui.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core.ui.tests/META-INF/MANIFEST.MF @@ -1,15 +1,15 @@ Manifest-Version: 1.0 -Fragment-Host: org.eclipse.m2e.core.ui;bundle-version="1.16.0" +Fragment-Host: org.eclipse.m2e.core.ui Bundle-ManifestVersion: 2 Bundle-Name: M2E Maven Integration for Eclipse UI Tests Bundle-SymbolicName: org.eclipse.m2e.core.ui.tests -Bundle-Version: 1.19.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: Eclipse.org - m2e -Require-Bundle: org.eclipse.m2e.tests.common;bundle-version="1.16.0", - org.junit;bundle-version="4.12.0", +Require-Bundle: org.eclipse.m2e.tests.common, + org.junit, org.eclipse.core.runtime, - org.eclipse.m2e.launching;bundle-version="1.17.2", + org.eclipse.m2e.launching, org.eclipse.debug.core, org.eclipse.ui.console, org.eclipse.jdt.launching, diff --git a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF index f6d16ec429..110e1e409f 100644 --- a/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.core.ui/META-INF/MANIFEST.MF @@ -28,10 +28,10 @@ Export-Package: org.eclipse.m2e.core.ui.internal;x-friends:="org.eclipse.m2e.edi org.eclipse.m2e.core.ui.internal.wizards;x-friends:="org.eclipse.m2e.editor,org.eclipse.m2e.scm" Bundle-Activator: org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.m2e.core;bundle-version="1.16.0", +Require-Bundle: org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", org.eclipse.core.resources;bundle-version="3.5.2", org.eclipse.core.runtime;bundle-version="3.5.0", - org.eclipse.m2e.model.edit;bundle-version="1.16.0";visibility:=reexport, + org.eclipse.m2e.model.edit;bundle-version="[2.0.0,3.0.0)";visibility:=reexport, org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)", org.eclipse.m2e.archetype.common;bundle-version="[3.2.1,4.0.0)", org.eclipse.ui.console;bundle-version="3.4.0", diff --git a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF index 196f983667..67ebebad72 100644 --- a/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.discovery/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.m2e.discovery;singleton:=true -Bundle-Version: 1.19.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin diff --git a/org.eclipse.m2e.editor.lemminx.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor.lemminx.tests/META-INF/MANIFEST.MF index ad3f17dea3..7df8f7b72d 100644 --- a/org.eclipse.m2e.editor.lemminx.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.editor.lemminx.tests/META-INF/MANIFEST.MF @@ -2,23 +2,23 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: M2E Maven POM File Editor using Wild Web Developer, Lemminx and Maven LS extension Tests Bundle-SymbolicName: org.eclipse.m2e.editor.lemminx.tests -Bundle-Version: 1.17.0.qualifier +Bundle-Version: 2.0.0.qualifier Automatic-Module-Name: org.eclipse.m2e.xmlls.extension.tests Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: Eclipse.org - m2e -Require-Bundle: org.junit;bundle-version="4.12.0", - org.eclipse.ui.genericeditor;bundle-version="1.1.0", - org.eclipse.ui;bundle-version="3.115.0", - org.eclipse.ui.ide;bundle-version="3.16.0", - org.eclipse.core.resources;bundle-version="3.13.0", - org.eclipse.ui.workbench.texteditor;bundle-version="3.14.0", - org.eclipse.core.runtime;bundle-version="3.16.0", +Require-Bundle: org.junit, + org.eclipse.ui.genericeditor, + org.eclipse.ui, + org.eclipse.ui.ide, + org.eclipse.core.resources, + org.eclipse.ui.workbench.texteditor, + org.eclipse.core.runtime, org.eclipse.ui.tests.harness, - org.eclipse.jface.text;bundle-version="3.16.0", + org.eclipse.jface.text, org.eclipse.m2e.editor.lemminx, org.eclipse.m2e.core.ui, org.eclipse.m2e.core, org.eclipse.m2e.editor, - org.eclipse.ui.forms;bundle-version="3.0", - org.eclipse.search;bundle-version="3.11.0", - org.eclipse.m2e.tests.common;bundle-version="1.17.0" + org.eclipse.ui.forms, + org.eclipse.search, + org.eclipse.m2e.tests.common diff --git a/org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF index eec9747009..c29a53883c 100644 --- a/org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.editor.lemminx/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: M2E Maven POM File Editor using Wild Web Developer, Lemminx and Maven LS extension (requires Incubating components) Bundle-SymbolicName: org.eclipse.m2e.editor.lemminx;singleton:=true -Bundle-Version: 1.18.5.qualifier +Bundle-Version: 2.0.0.qualifier Automatic-Module-Name: org.eclipse.m2e.xmlls.extension Import-Package: org.eclipse.core.runtime;version="3.5.0", org.osgi.framework;version="1.10.0", diff --git a/org.eclipse.m2e.editor.lemminx/pom.xml b/org.eclipse.m2e.editor.lemminx/pom.xml index 3ec8f0ca6f..ca26e98b74 100644 --- a/org.eclipse.m2e.editor.lemminx/pom.xml +++ b/org.eclipse.m2e.editor.lemminx/pom.xml @@ -23,7 +23,7 @@ org.eclipse.m2e.editor.lemminx eclipse-plugin - 1.18.5-SNAPSHOT + 2.0.0-SNAPSHOT diff --git a/org.eclipse.m2e.editor.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor.tests/META-INF/MANIFEST.MF index f3377f689b..3b5bd780a4 100644 --- a/org.eclipse.m2e.editor.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.editor.tests/META-INF/MANIFEST.MF @@ -2,24 +2,24 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Tests for m2e multi-page editor Bundle-SymbolicName: org.eclipse.m2e.editor.tests -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Vendor: Eclipse.org - m2e Automatic-Module-Name: org.eclipse.m2e.editor.tests Bundle-RequiredExecutionEnvironment: JavaSE-17 -Require-Bundle: org.eclipse.m2e.editor;bundle-version="1.18.2", - org.eclipse.m2e.tests.common;bundle-version="1.17.4", +Require-Bundle: org.eclipse.m2e.editor, + org.eclipse.m2e.tests.common, org.junit, org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.ui.workbench, org.eclipse.ui.ide, org.eclipse.ui.forms, - org.eclipse.m2e.core;bundle-version="1.18.2", + org.eclipse.m2e.core, org.eclipse.ui, org.eclipse.search, org.eclipse.ui.workbench.texteditor, - org.eclipse.ui.tests.harness;bundle-version="1.8.0", + org.eclipse.ui.tests.harness, org.eclipse.jface.text, org.eclipse.m2e.maven.runtime, - org.eclipse.m2e.core.ui;bundle-version="1.18.2", + org.eclipse.m2e.core.ui, org.eclipse.ui.editors diff --git a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF index 93e3e53f5d..50379c0801 100644 --- a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.wst.sse.core, org.eclipse.wst.xml.core, org.eclipse.ui.workbench, - org.eclipse.m2e.core;bundle-version="1.16.0", + org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)", org.eclipse.m2e.core.ui;bundle-version="[2.0.0,3.0.0)", org.eclipse.wst.sse.core, @@ -29,8 +29,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui.views, org.eclipse.ui.genericeditor;bundle-version="1.1.500", org.eclipse.core.filesystem;bundle-version="1.7.500", - org.eclipse.m2e.discovery;bundle-version="1.16.0", - org.eclipse.m2e.model.edit;bundle-version="1.16.0", + org.eclipse.m2e.discovery;bundle-version="[2.0.0,3.0.0)", + org.eclipse.m2e.model.edit;bundle-version="[2.0.0,3.0.0)", com.google.guava;bundle-version="30.1.0" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.m2e.jdt.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.jdt.tests/META-INF/MANIFEST.MF index 9aef289977..a5821224ce 100644 --- a/org.eclipse.m2e.jdt.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.jdt.tests/META-INF/MANIFEST.MF @@ -1,20 +1,20 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.jdt.tests;singleton:=true -Bundle-Version: 1.16.3.qualifier +Bundle-Version: 2.0.0.qualifier Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.jobs, org.eclipse.jdt.core, org.eclipse.ui.ide, org.eclipse.core.resources, - org.apache.commons.io;bundle-version="2.2.0", - org.junit;bundle-version="4.12.0", - org.eclipse.m2e.tests.common;bundle-version="1.16.0", - org.eclipse.m2e.core;bundle-version="1.16.0", - org.eclipse.m2e.core.ui;bundle-version="1.16.0", + org.apache.commons.io, + org.junit, + org.eclipse.m2e.tests.common, + org.eclipse.m2e.core, + org.eclipse.m2e.core.ui, org.eclipse.jdt.launching, org.eclipse.debug.core, - org.eclipse.ui.tests.harness;bundle-version="1.8.0", + org.eclipse.ui.tests.harness, org.eclipse.ui Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: Eclipse.org - m2e diff --git a/org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF index e964cb562d..7dca58ecfa 100644 --- a/org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.jdt.ui/META-INF/MANIFEST.MF @@ -2,12 +2,12 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.m2e.jdt.ui;singleton:=true -Bundle-Version: 1.19.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Localization: plugin Export-Package: org.eclipse.m2e.jdt.ui.internal;x-internal:=true, org.eclipse.m2e.jdt.ui.internal.actions;x-internal:=true, org.eclipse.m2e.jdt.ui.internal.filter;x-internal:=true -Require-Bundle: org.eclipse.m2e.jdt;bundle-version="[1.18.4,3.0.0)", +Require-Bundle: org.eclipse.m2e.jdt;bundle-version="[2.0.0,3.0.0)", org.eclipse.core.runtime, org.eclipse.core.jobs, org.eclipse.jface, @@ -18,8 +18,8 @@ Require-Bundle: org.eclipse.m2e.jdt;bundle-version="[1.18.4,3.0.0)", org.eclipse.ui.workbench, org.eclipse.core.resources, org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)", - org.eclipse.m2e.core;bundle-version="1.16.0", - org.eclipse.m2e.core.ui;bundle-version="1.16.0", + org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", + org.eclipse.m2e.core.ui;bundle-version="[2.0.0,3.0.0)", org.eclipse.ui Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.m2e.jdt.ui.internal.MavenJdtUiPlugin diff --git a/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF b/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF index 252c413afb..1a1a50b61b 100644 --- a/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.jdt/META-INF/MANIFEST.MF @@ -14,7 +14,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.jdt.launching, org.eclipse.core.resources, org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)", - org.eclipse.m2e.core;bundle-version="2.0.0" + org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.m2e.jdt.MavenJdtPlugin Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.m2e.launching/META-INF/MANIFEST.MF b/org.eclipse.m2e.launching/META-INF/MANIFEST.MF index 503b3e96d6..fbc4a78f3a 100644 --- a/org.eclipse.m2e.launching/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.launching/META-INF/MANIFEST.MF @@ -16,8 +16,8 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.jdt.launching, org.eclipse.jdt.debug.ui, org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)", - org.eclipse.m2e.core;bundle-version="2.0.0", - org.eclipse.m2e.core.ui;bundle-version="2.0.0", + org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", + org.eclipse.m2e.core.ui;bundle-version="[2.0.0,3.0.0)", org.eclipse.jdt.debug, org.eclipse.core.resources, org.eclipse.debug.core, diff --git a/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF b/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF index 0ce5871560..f6b36a4db9 100644 --- a/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.logback.appender/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.logback.appender;singleton:=true -Bundle-Version: 1.18.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Name: M2E Logback Appender Bundle-Vendor: Eclipse.org - m2e Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF b/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF index 891856ed81..d99ffa6221 100644 --- a/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.logback.configuration/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: M2E Logback Configuration Bundle-Vendor: Eclipse.org - m2e Bundle-SymbolicName: org.eclipse.m2e.logback.configuration;singleton:=true -Bundle-Version: 1.18.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Activator: org.eclipse.m2e.logback.configuration.LogPlugin Require-Bundle: org.eclipse.core.runtime;bundle-version="3.5.0", ch.qos.logback.classic;bundle-version="1.0.0", diff --git a/org.eclipse.m2e.pde.connector/META-INF/MANIFEST.MF b/org.eclipse.m2e.pde.connector/META-INF/MANIFEST.MF index f8c0d4eccf..49c21dcd69 100644 --- a/org.eclipse.m2e.pde.connector/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.pde.connector/META-INF/MANIFEST.MF @@ -2,13 +2,13 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: M2E PDE Connector Bundle-SymbolicName: org.eclipse.m2e.pde.connector;singleton:=true -Bundle-Version: 1.20.100.qualifier +Bundle-Version: 2.0.0.qualifier Automatic-Module-Name: org.eclipse.m2e.pde.connector Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: Eclipse.org - m2e Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.m2e.core;bundle-version="1.18.4", - org.eclipse.m2e.jdt;bundle-version="1.18.3", +Require-Bundle: org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", + org.eclipse.m2e.jdt;bundle-version="[2.0.0,3.0.0)", org.eclipse.core.runtime;bundle-version="3.24.0", org.eclipse.core.resources;bundle-version="3.16.0", org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)", diff --git a/org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF index 6aa597fec9..f9fbf26f10 100644 --- a/org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.pde.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: M2E PDE Integration UI Bundle-SymbolicName: org.eclipse.m2e.pde.ui;singleton:=true -Bundle-Version: 1.21.0.qualifier +Bundle-Version: 2.0.0.qualifier Automatic-Module-Name: org.eclipse.m2e.pde.ui Bundle-RequiredExecutionEnvironment: JavaSE-17 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.19.0", diff --git a/org.eclipse.m2e.profiles.core.tests/META-INF/MANIFEST.MF b/org.eclipse.m2e.profiles.core.tests/META-INF/MANIFEST.MF index bfbbdcb25a..5c66942517 100644 --- a/org.eclipse.m2e.profiles.core.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.profiles.core.tests/META-INF/MANIFEST.MF @@ -1,13 +1,13 @@ Manifest-Version: 1.0 -Fragment-Host: org.eclipse.m2e.profiles.core;bundle-version="1.16.0" +Fragment-Host: org.eclipse.m2e.profiles.core Bundle-ManifestVersion: 2 Bundle-Name: M2E Maven Integration for Eclipse Profiles Core Tests Bundle-SymbolicName: org.eclipse.m2e.profiles.core.tests -Bundle-Version: 1.17.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Vendor: Eclipse.org - m2e -Require-Bundle: org.eclipse.m2e.tests.common;bundle-version="1.16.0", - org.junit;bundle-version="4.12.0", +Require-Bundle: org.eclipse.m2e.tests.common, + org.junit, org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.m2e.maven.runtime diff --git a/org.eclipse.m2e.profiles.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.profiles.ui/META-INF/MANIFEST.MF index 40b7e45c59..c4f808d400 100644 --- a/org.eclipse.m2e.profiles.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.profiles.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.m2e.profiles.ui;singleton:=true -Bundle-Version: 1.18.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, diff --git a/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF b/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF index be9ac6d11a..b6584a1d34 100644 --- a/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.refactoring/META-INF/MANIFEST.MF @@ -3,10 +3,10 @@ Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor Bundle-SymbolicName: org.eclipse.m2e.refactoring;singleton:=true -Bundle-Version: 1.18.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Activator: org.eclipse.m2e.refactoring.internal.Activator -Require-Bundle: org.eclipse.m2e.core;bundle-version="2.0.0", - org.eclipse.m2e.model.edit;bundle-version="2.0.0", +Require-Bundle: org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", + org.eclipse.m2e.model.edit;bundle-version="[2.0.0,3.0.0)", org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)", org.eclipse.core.runtime, org.eclipse.core.resources, @@ -20,7 +20,7 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="2.0.0", org.eclipse.ui.ide, org.eclipse.ltk.core.refactoring, org.eclipse.ltk.ui.refactoring;visibility:=reexport, - org.eclipse.m2e.core.ui;bundle-version="2.0.0" + org.eclipse.m2e.core.ui;bundle-version="[2.0.0,3.0.0)" Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-17 Export-Package: org.eclipse.m2e.refactoring.exclude;x-internal:=true diff --git a/org.eclipse.m2e.scm/META-INF/MANIFEST.MF b/org.eclipse.m2e.scm/META-INF/MANIFEST.MF index 31cc998051..7c137e6f80 100644 --- a/org.eclipse.m2e.scm/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.scm/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.scm;singleton:=true -Bundle-Version: 1.18.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-Name: %Bundle-Name Bundle-Vendor: %Bundle-Vendor diff --git a/org.eclipse.m2e.sourcelookup.ui/META-INF/MANIFEST.MF b/org.eclipse.m2e.sourcelookup.ui/META-INF/MANIFEST.MF index 9661e97aaf..3f06185dce 100644 --- a/org.eclipse.m2e.sourcelookup.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.sourcelookup.ui/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.sourcelookup.ui;singleton:=true -Bundle-Version: 1.17.5.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Activator: org.eclipse.m2e.sourcelookup.ui.internal.SourceLookupUIActivator Bundle-Vendor: Eclipse.org - m2e Bundle-Name: M2E Source Lookup UI @@ -9,13 +9,13 @@ Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, org.eclipse.debug.ui;bundle-version="3.7.0", org.eclipse.jdt.debug.ui;bundle-version="3.6.0", - org.eclipse.m2e.core;bundle-version="1.16.0", + org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", org.eclipse.jdt.debug;bundle-version="3.7.0", - org.eclipse.m2e.sourcelookup;bundle-version="1.16.0", + org.eclipse.m2e.sourcelookup;bundle-version="[2.0.0,3.0.0)", org.eclipse.m2e.core.ui;bundle-version="[2.0.0,3.0.0)", org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)", org.eclipse.ui.ide;bundle-version="3.7.0", - org.eclipse.m2e.binaryproject;bundle-version="1.16.0", + org.eclipse.m2e.binaryproject;bundle-version="[2.0.0,3.0.0)", org.eclipse.core.expressions, org.eclipse.jdt.launching;bundle-version="3.10.0", org.eclipse.jdt.core;bundle-version="3.9.0", diff --git a/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF b/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF index c936260768..5acd596c3a 100644 --- a/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.sourcelookup/META-INF/MANIFEST.MF @@ -1,11 +1,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-SymbolicName: org.eclipse.m2e.sourcelookup;singleton:=true -Bundle-Version: 1.19.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Vendor: Eclipse.org - m2e Bundle-Name: M2E Source Lookup Core -Require-Bundle: org.eclipse.m2e.launching;bundle-version="2.0.0", - org.eclipse.m2e.core;bundle-version="2.0.0", +Require-Bundle: org.eclipse.m2e.launching;bundle-version="[2.0.0,3.0.0)", + org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)", org.eclipse.jdt.core;bundle-version="3.7.0", org.eclipse.jdt.debug;bundle-version="3.8.0", diff --git a/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF b/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF index 43df23d9ef..5fdeed3cdf 100644 --- a/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF +++ b/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF @@ -2,11 +2,11 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: M2E Testing Helpers Bundle-SymbolicName: org.eclipse.m2e.tests.common;singleton:=true -Bundle-Version: 1.17.6.qualifier +Bundle-Version: 2.0.0.qualifier Require-Bundle: org.junit;bundle-version="4.0.0", - org.eclipse.m2e.core;bundle-version="1.16.0", + org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)", org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)", - org.eclipse.m2e.jdt;bundle-version="1.16.0", + org.eclipse.m2e.jdt;bundle-version="[2.0.0,3.0.0)", org.eclipse.core.runtime, org.eclipse.jdt.core, org.eclipse.debug.core,