From effb95f1a718feaad9af948f631edb9171ee8d35 Mon Sep 17 00:00:00 2001 From: Martin Lippert Date: Thu, 16 Nov 2023 15:37:20 +0100 Subject: [PATCH] clean up dependencies on apache commons libs and move those dependencies to impoort-package where necessary to be prepared for bundle symbolic name changes coming up --- .../META-INF/MANIFEST.MF | 2 +- .../ide/eclipse/beans/ui/live/model/LiveBean.java | 2 +- .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 3 --- .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 2 -- .../META-INF/MANIFEST.MF | 2 -- .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 9 ++++----- .../META-INF/MANIFEST.MF | 3 --- .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 6 +++--- .../META-INF/MANIFEST.MF | 4 ++-- .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 1 - .../META-INF/MANIFEST.MF | 9 +++++---- .../META-INF/MANIFEST.MF | 6 +++--- .../META-INF/MANIFEST.MF | 4 ++-- 19 files changed, 21 insertions(+), 38 deletions(-) diff --git a/eclipse-extensions/org.springframework.ide.eclipse.beans.ui.live/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.beans.ui.live/META-INF/MANIFEST.MF index 04f7d0d5c..093b68c70 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.beans.ui.live/META-INF/MANIFEST.MF +++ b/eclipse-extensions/org.springframework.ide.eclipse.beans.ui.live/META-INF/MANIFEST.MF @@ -13,7 +13,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui.views, org.json, org.eclipse.core.resources, - org.apache.commons.lang, org.eclipse.jface, org.eclipse.ui.workbench, org.eclipse.jdt.core, @@ -22,6 +21,7 @@ Require-Bundle: org.eclipse.core.runtime, com.google.guava, org.springsource.ide.eclipse.commons.livexp, org.springsource.ide.eclipse.commons.frameworks.core +Import-Package: org.apache.commons.lang3 Bundle-ActivationPolicy: lazy Bundle-Vendor: Spring IDE Developers Bundle-Activator: org.springframework.ide.eclipse.beans.ui.live.LiveBeansUiPlugin diff --git a/eclipse-extensions/org.springframework.ide.eclipse.beans.ui.live/src/org/springframework/ide/eclipse/beans/ui/live/model/LiveBean.java b/eclipse-extensions/org.springframework.ide.eclipse.beans.ui.live/src/org/springframework/ide/eclipse/beans/ui/live/model/LiveBean.java index 54d92e4be..b7ca0ab99 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.beans.ui.live/src/org/springframework/ide/eclipse/beans/ui/live/model/LiveBean.java +++ b/eclipse-extensions/org.springframework.ide.eclipse.beans.ui.live/src/org/springframework/ide/eclipse/beans/ui/live/model/LiveBean.java @@ -13,7 +13,7 @@ package org.springframework.ide.eclipse.beans.ui.live.model; import java.util.LinkedHashSet; import java.util.Set; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; /** * @author Leo Dos Santos diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.docker/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.docker/META-INF/MANIFEST.MF index b380b344d..5660e5b38 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.docker/META-INF/MANIFEST.MF +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.docker/META-INF/MANIFEST.MF @@ -21,7 +21,6 @@ Require-Bundle: org.springframework.ide.eclipse.boot.dash, org.springframework.ide.eclipse.editor.support, org.eclipse.jdt.launching, org.eclipse.jdt.core, - org.apache.commons.io, org.springframework.ide.eclipse.docker.client;bundle-version="3.9.14", org.eclipse.linuxtools.docker.ui;resolution:=optional, org.eclipse.linuxtools.docker.core;resolution:=optional diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.test/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.test/META-INF/MANIFEST.MF index 99f067d0c..2135735d6 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.test/META-INF/MANIFEST.MF +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash.test/META-INF/MANIFEST.MF @@ -7,7 +7,6 @@ Bundle-Vendor: VMware, Inc Require-Bundle: org.junit, org.eclipse.core.resources, org.springsource.ide.eclipse.commons.tests.util, - org.apache.commons.io, org.eclipse.debug.core, org.eclipse.jdt.core, org.springsource.ide.eclipse.commons.livexp, @@ -25,14 +24,12 @@ Require-Bundle: org.junit, org.eclipse.equinox.security, org.reactivestreams.reactive-streams;bundle-version="1.0.0", io.projectreactor.reactor-core;bundle-version="[3.3.1,3.3.2)", - org.apache.commons.lang, org.eclipse.lsp4e, org.eclipse.lsp4j, org.springframework.ide.eclipse.boot.dash;bundle-version="3.9.12", org.springframework.ide.eclipse.beans.ui.live, org.eclipse.jface.text, org.eclipse.ui.editors, - org.apache.commons.lang3, org.springframework.ide.eclipse.editor.support, org.eclipse.ui.ide, org.springsource.ide.eclipse.commons.core, diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/META-INF/MANIFEST.MF index 95e2f4e3d..6e21cf01d 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/META-INF/MANIFEST.MF +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.dash/META-INF/MANIFEST.MF @@ -38,7 +38,6 @@ Require-Bundle: org.eclipse.ui, org.apache.httpcomponents.httpclient, org.apache.httpcomponents.httpcore, org.springsource.ide.eclipse.commons.core, - org.apache.commons.lang3, org.springframework.ide.eclipse.editor.support, org.springframework.ide.eclipse.beans.ui.live, org.eclipse.core.commands, diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.launch.test/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot.launch.test/META-INF/MANIFEST.MF index 92dbbb065..c54d2d06e 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.launch.test/META-INF/MANIFEST.MF +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.launch.test/META-INF/MANIFEST.MF @@ -18,8 +18,6 @@ Require-Bundle: org.eclipse.ui, org.springsource.ide.eclipse.commons.frameworks.core, org.springframework.ide.eclipse.boot.test, org.springsource.ide.eclipse.commons.frameworks.test.util, - org.apache.commons.io, - org.apache.commons.lang3, org.springframework.ide.eclipse.buildship30 Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.refactoring.test/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot.refactoring.test/META-INF/MANIFEST.MF index 1c8e03a6b..1a391f3ca 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.refactoring.test/META-INF/MANIFEST.MF +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.refactoring.test/META-INF/MANIFEST.MF @@ -9,7 +9,6 @@ Require-Bundle: org.eclipse.core.runtime, org.junit, org.eclipse.core.resources, org.springsource.ide.eclipse.commons.tests.util, - org.apache.commons.io, org.eclipse.debug.core, org.eclipse.jdt.core, org.springsource.ide.eclipse.commons.livexp, @@ -27,7 +26,6 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.equinox.security, org.reactivestreams.reactive-streams;bundle-version="1.0.2", io.projectreactor.reactor-core;bundle-version="[3.3.1,3.3.2)", - org.apache.commons.lang, javax.ws.rs;bundle-version="2.0.1", org.eclipse.osgi, org.hamcrest.library diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.test/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot.test/META-INF/MANIFEST.MF index a3b623479..0f303ad4c 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.test/META-INF/MANIFEST.MF +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.test/META-INF/MANIFEST.MF @@ -28,7 +28,6 @@ Require-Bundle: org.eclipse.ui, org.glassfish.jersey.core.jersey-common;bundle-version="2.22.1", org.springframework.ide.eclipse.boot.validation, org.springframework.ide.eclipse.boot.launch, - org.apache.commons.lang3, com.google.guava, org.hamcrest.library;bundle-version="1.3.0", org.eclipse.m2e.core diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot.wizard/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot.wizard/META-INF/MANIFEST.MF index f4d1abd0c..6ba813791 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot.wizard/META-INF/MANIFEST.MF +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot.wizard/META-INF/MANIFEST.MF @@ -14,11 +14,6 @@ Require-Bundle: org.eclipse.ui, org.springsource.ide.eclipse.commons.frameworks.core, org.springsource.ide.eclipse.commons.core, org.springframework.ide.eclipse.boot, - org.apache.commons.codec, - org.apache.commons.compress, - org.apache.commons.io, - org.apache.commons.logging, - org.apache.commons.lang3, org.springsource.ide.eclipse.commons.ui, org.eclipse.m2e.core, org.eclipse.m2e.maven.runtime, @@ -49,6 +44,10 @@ Export-Package: org.springframework.ide.eclipse.boot.wizard, Bundle-Vendor: VMware, Inc. Import-Package: org.eclipse.core.runtime, org.eclipse.core.runtime.jobs, + org.apache.commons.compress.archivers.zip, + org.apache.commons.io, + org.apache.commons.codec.binary, + org.apache.commons.lang3, org.eclipse.osgi.util, org.osgi.framework Automatic-Module-Name: org.springframework.ide.eclipse.boot.wizard diff --git a/eclipse-extensions/org.springframework.ide.eclipse.boot/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.boot/META-INF/MANIFEST.MF index d41fe83a4..481be184e 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.boot/META-INF/MANIFEST.MF +++ b/eclipse-extensions/org.springframework.ide.eclipse.boot/META-INF/MANIFEST.MF @@ -20,9 +20,7 @@ Require-Bundle: org.eclipse.core.resources, org.eclipse.jdt.core, org.eclipse.jdt.debug.ui, org.eclipse.jdt.launching, - org.apache.commons.collections, org.springsource.ide.eclipse.commons.frameworks.core, - org.apache.commons.io, org.eclipse.jdt.ui, org.springsource.ide.eclipse.commons.ui, org.eclipse.ui.ide, @@ -34,7 +32,6 @@ Require-Bundle: org.eclipse.core.resources, org.eclipse.ltk.core.refactoring, org.json, org.eclipse.m2e.launching, - org.apache.commons.lang3, io.projectreactor.reactor-core;bundle-version="[3.3.1,3.3.2)", org.reactivestreams.reactive-streams, com.google.guava, diff --git a/eclipse-extensions/org.springframework.ide.eclipse.buildship30/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.buildship30/META-INF/MANIFEST.MF index 8faf8e239..23b9a93dd 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.buildship30/META-INF/MANIFEST.MF +++ b/eclipse-extensions/org.springframework.ide.eclipse.buildship30/META-INF/MANIFEST.MF @@ -14,7 +14,6 @@ Require-Bundle: org.eclipse.core.runtime, org.springsource.ide.eclipse.commons.frameworks.core, org.springframework.ide.eclipse.boot.wizard, org.eclipse.jface, - org.apache.commons.io, org.eclipse.buildship.core;bundle-version="[3.0.0,4.0.0)";resolution:=optional, org.eclipse.ui.workbench, com.google.guava, diff --git a/eclipse-extensions/org.springframework.ide.eclipse.xml.namespaces/META-INF/MANIFEST.MF b/eclipse-extensions/org.springframework.ide.eclipse.xml.namespaces/META-INF/MANIFEST.MF index 919cb192a..d59ce1eda 100644 --- a/eclipse-extensions/org.springframework.ide.eclipse.xml.namespaces/META-INF/MANIFEST.MF +++ b/eclipse-extensions/org.springframework.ide.eclipse.xml.namespaces/META-INF/MANIFEST.MF @@ -28,7 +28,8 @@ Import-Package: org.eclipse.core.commands.common, org.springsource.ide.eclipse.commons.core, org.springsource.ide.eclipse.commons.core.util, org.springsource.ide.eclipse.commons.frameworks.core.util, - org.springsource.ide.eclipse.commons.ui + org.springsource.ide.eclipse.commons.ui, + org.apache.commons.io Bundle-Activator: org.springframework.ide.eclipse.xml.namespaces.SpringXmlNamespacesPlugin Bundle-Version: 4.21.0.qualifier Export-Package: org.springframework.ide.eclipse.xml.namespaces, @@ -40,5 +41,4 @@ Export-Package: org.springframework.ide.eclipse.xml.namespaces, Bundle-ActivationPolicy: lazy Require-Bundle: com.google.guava, io.projectreactor.reactor-core;bundle-version="3.1.9", - org.reactivestreams.reactive-streams;bundle-version="1.0.2", - org.apache.commons.io;bundle-version="2.8.0" + org.reactivestreams.reactive-streams;bundle-version="1.0.2" diff --git a/eclipse-language-servers/org.springframework.ide.eclipse.editor.support/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.ide.eclipse.editor.support/META-INF/MANIFEST.MF index 50bf3210c..0e1163d38 100644 --- a/eclipse-language-servers/org.springframework.ide.eclipse.editor.support/META-INF/MANIFEST.MF +++ b/eclipse-language-servers/org.springframework.ide.eclipse.editor.support/META-INF/MANIFEST.MF @@ -21,7 +21,6 @@ Require-Bundle: org.eclipse.ui, org.springsource.ide.eclipse.commons.core, io.projectreactor.reactor-core;bundle-version="[3.3.1,3.3.2)", org.reactivestreams.reactive-streams;bundle-version="1.0.0", - org.apache.commons.lang3, org.springsource.ide.eclipse.commons.ui, javax.inject Bundle-ActivationPolicy: lazy @@ -50,4 +49,5 @@ Import-Package: org.eclipse.core.runtime, com.google.gson, com.google.gson.annotations, com.google.gson.reflect, - com.google.gson.stream + com.google.gson.stream, + org.apache.commons.lang3 diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF index 5707e397b..96522c993 100644 --- a/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF +++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF @@ -24,7 +24,6 @@ Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0", org.eclipse.jdt.core, org.eclipse.ui.editors;bundle-version="3.11.100", org.springsource.ide.eclipse.commons.livexp, - org.apache.commons.lang3, org.eclipse.wst.sse.ui;bundle-version="1.5.0";resolution:=optional, org.eclipse.jdt.annotation, org.eclipse.mylyn.wikitext.markdown, diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons.test/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons.test/META-INF/MANIFEST.MF index 3cb3e6e79..a6402453d 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons.test/META-INF/MANIFEST.MF +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons.test/META-INF/MANIFEST.MF @@ -10,7 +10,6 @@ Require-Bundle: org.junit, org.eclipse.core.resources, org.springframework.tooling.ls.eclipse.commons, org.eclipse.jdt.core, - org.apache.commons.io, org.springframework.tooling.jdt.ls.commons, org.eclipse.lsp4j, org.eclipse.m2e.core, diff --git a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF index 5b4a914cd..f7ffd6887 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF +++ b/eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF @@ -19,7 +19,6 @@ Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.8.0", org.eclipse.ui.ide, org.eclipse.jdt.core, org.eclipse.jdt.ui, - org.apache.commons.lang3, org.eclipse.ui.genericeditor, org.eclipse.ui.editors, org.springsource.ide.eclipse.commons.core, diff --git a/eclipse-language-servers/org.springsource.ide.eclipse.commons.core/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springsource.ide.eclipse.commons.core/META-INF/MANIFEST.MF index 41cb957f0..de7721b59 100644 --- a/eclipse-language-servers/org.springsource.ide.eclipse.commons.core/META-INF/MANIFEST.MF +++ b/eclipse-language-servers/org.springsource.ide.eclipse.commons.core/META-INF/MANIFEST.MF @@ -11,15 +11,13 @@ Require-Bundle: org.eclipse.core.resources, org.eclipse.jdt.core, org.eclipse.jdt.launching, org.eclipse.wst.common.project.facet.core, - org.apache.commons.collections, org.eclipse.platform, org.springsource.ide.eclipse.commons.frameworks.core;bundle-version="3.5.0", org.springsource.ide.eclipse.commons.jdk_tools;resolution:=optional, org.eclipse.text, org.springsource.ide.eclipse.commons.livexp, org.eclipse.debug.core, - org.eclipse.jface, - org.apache.commons.lang3 + org.eclipse.jface Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.springsource.ide.eclipse.commons.core, @@ -35,5 +33,8 @@ Import-Package: org.eclipse.core.runtime, org.eclipse.core.runtime.preferences, org.eclipse.osgi.util, org.osgi.framework, - org.osgi.service.prefs + org.osgi.service.prefs, + org.apache.commons.lang3, + org.apache.commons.collections, + org.apache.commons.collections.iterators Automatic-Module-Name: org.springsource.ide.eclipse.commons.core diff --git a/eclipse-language-servers/org.springsource.ide.eclipse.commons.frameworks.core/META-INF/MANIFEST.MF b/eclipse-language-servers/org.springsource.ide.eclipse.commons.frameworks.core/META-INF/MANIFEST.MF index 2b2fa267a..fe9f4a630 100644 --- a/eclipse-language-servers/org.springsource.ide.eclipse.commons.frameworks.core/META-INF/MANIFEST.MF +++ b/eclipse-language-servers/org.springsource.ide.eclipse.commons.frameworks.core/META-INF/MANIFEST.MF @@ -9,8 +9,6 @@ Require-Bundle: org.eclipse.ui, org.eclipse.jdt.core, org.eclipse.core.resources, org.eclipse.jdt.debug.ui, - org.apache.commons.io, - org.apache.commons.codec, org.springsource.ide.eclipse.commons.livexp, io.projectreactor.reactor-core;bundle-version="[3.3.1,3.3.2)", org.reactivestreams.reactive-streams, @@ -35,4 +33,6 @@ Import-Package: org.eclipse.core.internal.runtime, org.eclipse.core.runtime.preferences, org.osgi.framework, org.osgi.framework.wiring, - org.osgi.service.prefs + org.osgi.service.prefs, + org.apache.commons.codec.binary, + org.apache.commons.io diff --git a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/META-INF/MANIFEST.MF b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/META-INF/MANIFEST.MF index cc6a32413..81828a1e0 100644 --- a/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/META-INF/MANIFEST.MF +++ b/headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/META-INF/MANIFEST.MF @@ -9,9 +9,9 @@ Require-Bundle: org.springframework.tooling.jdt.ls.commons, org.eclipse.core.runtime, org.eclipse.jdt.core, org.eclipse.core.resources, - org.apache.commons.lang3, org.junit, - org.apache.commons.io, com.google.guava;bundle-version="21.0.0", org.eclipse.jdt.ui +Import-Package: org.apache.commons.io, + org.apache.commons.lang3