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

switch gson usage to import-package instead of require-bundle in order to prepare for upcoming platform changes

Browse Source
This commit is contained in:
Martin Lippert
2023-01-27 18:04:06 +01:00
parent 13536a725b
commit 5200872627
9 changed files with 42 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,8 +15,11 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.debug.core,
org.eclipse.jdt.core,
com.google.guava,
com.google.gson,
org.springframework.ide.eclipse.beans.ui.live
Import-Package: com.google.gson;version="[2.9.1,2.10)",
com.google.gson.annotations;version="[2.9.1,2.10)",
com.google.gson.reflect;version="[2.9.1,2.10)",
com.google.gson.stream;version="[2.9.1,2.10)"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Activator: org.springframework.ide.eclipse.boot.dash.azure.BootDashAzurePlugin
Bundle-ActivationPolicy: lazy

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

@@ -23,7 +23,6 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.debug.ui,
org.eclipse.jdt.debug.ui,
org.springsource.ide.eclipse.commons.core,
com.google.gson,
org.eclipse.ui.console,
javax.ws.rs;bundle-version="2.0.1",
org.springframework.ide.eclipse.beans.ui.live,
@@ -73,4 +72,8 @@ Import-Package: org.eclipse.core.runtime,
org.eclipse.core.runtime.jobs,
org.eclipse.core.runtime.preferences,
org.eclipse.osgi.util,
org.osgi.framework
org.osgi.framework,
com.google.gson;version="[2.9.1,2.10)",
com.google.gson.annotations;version="[2.9.1,2.10)",
com.google.gson.reflect;version="[2.9.1,2.10)",
com.google.gson.stream;version="[2.9.1,2.10)"

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

@@ -38,7 +38,6 @@ Require-Bundle: org.junit,
org.eclipse.ui.ide,
org.springsource.ide.eclipse.commons.core,
org.yaml.snakeyaml,
com.google.gson,
org.springsource.ide.eclipse.commons.cloudfoundry.client.v2,
org.springframework.tooling.cloudfoundry.manifest.ls,
org.springframework.tooling.ls.eclipse.commons,
@@ -54,5 +53,9 @@ Import-Package: org.eclipse.core.runtime,
org.eclipse.core.runtime.jobs,
org.eclipse.core.runtime.preferences,
org.osgi.framework,
org.osgi.service.prefs;version="1.1.1"
org.osgi.service.prefs;version="1.1.1",
com.google.gson;version="[2.9.1,2.10)",
com.google.gson.annotations;version="[2.9.1,2.10)",
com.google.gson.reflect;version="[2.9.1,2.10)",
com.google.gson.stream;version="[2.9.1,2.10)"
Automatic-Module-Name: org.springframework.ide.eclipse.boot.dash.test

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

@@ -48,7 +48,6 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.e4.ui.css.swt.theme,
org.eclipse.lsp4e,
org.eclipse.lsp4j,
com.google.gson,
org.eclipse.jdt.debug,
org.springsource.ide.eclipse.commons.boot.ls
Bundle-RequiredExecutionEnvironment: JavaSE-11
@@ -84,5 +83,9 @@ Import-Package: org.eclipse.core.runtime,
org.eclipse.core.runtime.preferences,
org.osgi.framework,
org.osgi.service.prefs,
org.yaml.snakeyaml
org.yaml.snakeyaml,
com.google.gson;version="[2.9.1,2.10)",
com.google.gson.annotations;version="[2.9.1,2.10)",
com.google.gson.reflect;version="[2.9.1,2.10)",
com.google.gson.stream;version="[2.9.1,2.10)"
Automatic-Module-Name: org.springframework.ide.eclipse.boot.dash

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

@@ -23,8 +23,7 @@ Require-Bundle: org.eclipse.ui,
org.reactivestreams.reactive-streams;bundle-version="1.0.0",
org.apache.commons.lang3,
org.springsource.ide.eclipse.commons.ui,
javax.inject,
com.google.gson
javax.inject
Bundle-ActivationPolicy: lazy
Export-Package: org.springframework.ide.eclipse.editor.support,
org.springframework.ide.eclipse.editor.support.completions,
@@ -47,4 +46,8 @@ Import-Package: org.eclipse.core.runtime,
org.eclipse.core.runtime.jobs,
org.eclipse.core.runtime.preferences,
org.osgi.service.prefs,
org.osgi.framework
org.osgi.framework,
com.google.gson;version="[2.9.1,2.10)",
com.google.gson.annotations;version="[2.9.1,2.10)",
com.google.gson.reflect;version="[2.9.1,2.10)",
com.google.gson.stream;version="[2.9.1,2.10)"

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

@@ -29,7 +29,6 @@ Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0",
org.eclipse.jdt.annotation,
org.eclipse.mylyn.wikitext.markdown,
org.eclipse.mylyn.wikitext,
com.google.gson,
org.eclipse.lsp4e.jdt;bundle-version="0.10.0",
org.springsource.ide.eclipse.commons.boot.ls,
org.springframework.ide.eclipse.editor.support,
@@ -40,7 +39,10 @@ Require-Bundle: org.eclipse.jdt.launching;bundle-version="3.9.0",
org.eclipse.jface.notifications
Import-Package: com.google.common.base,
com.google.common.collect,
com.google.gson;version="2.7.0",
com.google.gson;version="[2.9.1,2.10)",
com.google.gson.annotations;version="[2.9.1,2.10)",
com.google.gson.reflect;version="[2.9.1,2.10)",
com.google.gson.stream;version="[2.9.1,2.10)",
org.eclipse.jface.preference,
org.osgi.framework
Bundle-Activator: org.springframework.tooling.boot.ls.BootLanguageServerPlugin

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

@@ -16,5 +16,8 @@ Require-Bundle: org.junit,
org.eclipse.m2e.core,
org.eclipse.m2e.maven.runtime,
org.eclipse.m2e.core.ui,
com.google.gson,
org.eclipse.lsp4j.jsonrpc
Import-Package: com.google.gson;version="[2.9.1,2.10)",
com.google.gson.annotations;version="[2.9.1,2.10)",
com.google.gson.reflect;version="[2.9.1,2.10)",
com.google.gson.stream;version="[2.9.1,2.10)"

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

@@ -15,8 +15,7 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.lsp4j,
org.eclipse.lsp4j.jsonrpc,
io.projectreactor.reactor-core,
org.reactivestreams.reactive-streams,
com.google.gson
org.reactivestreams.reactive-streams
Export-Package: org.springframework.ide.vscode.commons.protocol,
org.springframework.ide.vscode.commons.protocol.java,
org.springframework.tooling.jdt.ls.commons,
@@ -24,5 +23,9 @@ Export-Package: org.springframework.ide.vscode.commons.protocol,
org.springframework.tooling.jdt.ls.commons.java,
org.springframework.tooling.jdt.ls.commons.javadoc,
org.springframework.tooling.jdt.ls.commons.resources
Import-Package: com.google.gson;version="[2.9.1,2.10)",
com.google.gson.annotations;version="[2.9.1,2.10)",
com.google.gson.reflect;version="[2.9.1,2.10)",
com.google.gson.stream;version="[2.9.1,2.10)"
Bundle-ClassPath: .,
lib/commons-lsp-extensions.jar

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

@@ -12,6 +12,9 @@ Require-Bundle: org.eclipse.jdt.ls.core,
org.eclipse.core.resources,
org.springframework.tooling.jdt.ls.commons,
com.google.guava,
com.google.gson,
org.eclipse.lsp4j,
org.eclipse.lsp4j.jsonrpc
Import-Package: com.google.gson;version="[2.9.1,2.10)",
com.google.gson.annotations;version="[2.9.1,2.10)",
com.google.gson.reflect;version="[2.9.1,2.10)",
com.google.gson.stream;version="[2.9.1,2.10)"