Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Martin Lippert
2023-11-16 15:37:20 +01:00
parent 741df4ee03
commit effb95f1a7
19 changed files with 21 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eclipse-extensions/org.springframework.ide.eclipse.beans.ui.live/META-INF/MANIFEST.MF
View File

@@ -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

2
eclipse-extensions/org.springframework.ide.eclipse.beans.ui.live/src/org/springframework/ide/eclipse/beans/ui/live/model/LiveBean.java
View File

@@ -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

1
eclipse-extensions/org.springframework.ide.eclipse.boot.dash.docker/META-INF/MANIFEST.MF
View File

@@ -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

3
eclipse-extensions/org.springframework.ide.eclipse.boot.dash.test/META-INF/MANIFEST.MF
View File

@@ -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,

1
eclipse-extensions/org.springframework.ide.eclipse.boot.dash/META-INF/MANIFEST.MF
View File

@@ -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,

2
eclipse-extensions/org.springframework.ide.eclipse.boot.launch.test/META-INF/MANIFEST.MF
View File

@@ -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

2
eclipse-extensions/org.springframework.ide.eclipse.boot.refactoring.test/META-INF/MANIFEST.MF
View File

@@ -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

1
eclipse-extensions/org.springframework.ide.eclipse.boot.test/META-INF/MANIFEST.MF
View File

@@ -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

9
eclipse-extensions/org.springframework.ide.eclipse.boot.wizard/META-INF/MANIFEST.MF
View File

@@ -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

3
eclipse-extensions/org.springframework.ide.eclipse.boot/META-INF/MANIFEST.MF
View File

@@ -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,

1
eclipse-extensions/org.springframework.ide.eclipse.buildship30/META-INF/MANIFEST.MF
View File

@@ -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,

6
eclipse-extensions/org.springframework.ide.eclipse.xml.namespaces/META-INF/MANIFEST.MF
View File

@@ -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"

4
eclipse-language-servers/org.springframework.ide.eclipse.editor.support/META-INF/MANIFEST.MF
View File

@@ -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

1
eclipse-language-servers/org.springframework.tooling.boot.ls/META-INF/MANIFEST.MF
View File

@@ -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,

1
eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons.test/META-INF/MANIFEST.MF
View File

@@ -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,

1
eclipse-language-servers/org.springframework.tooling.ls.eclipse.commons/META-INF/MANIFEST.MF
View File

@@ -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,

9
eclipse-language-servers/org.springsource.ide.eclipse.commons.core/META-INF/MANIFEST.MF
View File

@@ -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

6
eclipse-language-servers/org.springsource.ide.eclipse.commons.frameworks.core/META-INF/MANIFEST.MF
View File

@@ -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

4
headless-services/jdt-ls-extension/org.springframework.tooling.jdt.ls.commons.test/META-INF/MANIFEST.MF
View File

@@ -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