Update to Guava 32.1, avoid re-export and add some uses constraints

Workaround for:
  eclipse-equinox/equinox#304

Other issue:
  eclipse-pde/eclipse.pde#729

bundles/com.salesforce.bazel.eclipse.core/META-INF/MANIFEST.MF

@@ -21,7 +21,7 @@ Export-Package: com.salesforce.bazel.eclipse.core,
  com.salesforce.bazel.eclipse.core.setup,
  com.salesforce.bazel.eclipse.preferences
 Import-Package: com.github.benmanes.caffeine.cache;version="3.1.4",
- com.google.common.collect;version="31.1.0",
+ com.google.common.collect;version="31.2.0",
  com.google.gson;version="2.10.1",
  com.google.protobuf;version="3.22.0",
  org.slf4j;version="1.7.30",
@@ -36,6 +36,7 @@ Require-Bundle: org.eclipse.core.jobs;bundle-version="3.12.0",
  org.eclipse.jdt.launching;bundle-version="3.19.300",
  org.eclipse.text;bundle-version="3.12.0",
  org.eclipse.core.expressions;bundle-version="3.8.0",
+ com.salesforce.bazel.importedsource,
  com.salesforce.bazel.sdk,
  org.eclipse.ltk.core.refactoring;bundle-version="3.12.0",
  org.eclipse.jdt.junit.core;bundle-version="3.11.0",

bundles/com.salesforce.bazel.eclipse.core/build.properties

@@ -5,6 +5,5 @@ jars.compile.order = .
 source.. = src/
 src.includes = README.md
 output.. = bin/
-additional.bundles = javax.inject,\
-                     com.github.ben-manes.caffeine,\
+additional.bundles = com.github.ben-manes.caffeine,\
                      com.google.gson

bundles/com.salesforce.bazel.eclipse.jdtls/META-INF/MANIFEST.MF

@@ -12,10 +12,11 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.debug.core,
  org.eclipse.jdt.launching,
- com.google.gson;bundle-version="2.8.2",
- com.google.guava;bundle-version="27.1.0",
+ com.google.gson,
+ com.google.guava,
  org.eclipse.jdt.ls.core,
- org.apache.commons.lang3;bundle-version="3.1.0",
+ org.apache.commons.lang3,
+ com.salesforce.bazel.importedsource,
  com.salesforce.bazel.sdk,
  com.salesforce.bazel.eclipse.core
 Export-Package: com.salesforce.bazel.eclipse.jdtls.managers

bundles/com.salesforce.bazel.eclipse.ui/META-INF/MANIFEST.MF

@@ -12,7 +12,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.ui.console,
  org.eclipse.core.jobs,
  org.eclipse.jface,
- javax.inject,
  org.eclipse.ui.ide,
  org.eclipse.jdt.core,
  org.eclipse.jdt,
@@ -26,6 +25,7 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jface.text,
  org.eclipse.jdt.junit,
  org.eclipse.core.expressions,
+ com.salesforce.bazel.importedsource,
  com.salesforce.bazel.sdk,
  com.salesforce.bazel.eclipse.core,
  org.eclipse.ltk.core.refactoring,

bundles/com.salesforce.bazel.importedsource/META-INF/MANIFEST.MF

@@ -3,52 +3,66 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Imported Dependencies
 Bundle-SymbolicName: com.salesforce.bazel.importedsource
 Bundle-Version: 2.0.0.qualifier
-Import-Package: com.github.benmanes.caffeine;version="3.1.6",
- com.github.benmanes.caffeine.cache;version="3.1.6",
- com.github.benmanes.caffeine.guava;version="3.1.6",
+Import-Package: com.github.benmanes.caffeine;version="3.1.8",
+ com.github.benmanes.caffeine.cache;version="3.1.8",
+ com.github.benmanes.caffeine.guava;version="3.1.8",
  com.google.auto.value;resolution:=optional,
- com.google.common.annotations;version="31.1.0",
- com.google.common.base;version="31.1.0",
- com.google.common.cache;version="31.1.0",
- com.google.common.collect;version="31.1.0",
- com.google.common.io;version="31.1.0",
- com.google.common.primitives;version="31.1.0",
- com.google.common.util.concurrent;version="31.1.0",
+ com.google.common.annotations;version="31.2.0",
+ com.google.common.base;version="31.2.0",
+ com.google.common.cache;version="31.2.0",
+ com.google.common.collect;version="31.2.0",
+ com.google.common.io;version="31.2.0",
+ com.google.common.primitives;version="31.2.0",
+ com.google.common.util.concurrent;version="31.2.0",
  com.google.errorprone.annotations;resolution:=optional,
  com.google.protobuf;version="3.22.0",
  javax.annotation;version="3.0.2";resolution:=optional,
  javax.annotation.concurrent;version="3.0.2";resolution:=optional
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.27.0"
-Export-Package: com.google.devtools.build.buildjar.proto,
+Export-Package: com.google.devtools.build.buildjar.proto;uses:="com.google.protobuf",
  com.google.devtools.build.lib.buildeventstream,
  com.google.devtools.build.lib.collect.compacthashset,
- com.google.devtools.build.lib.collect.nestedset,
- com.google.devtools.build.lib.concurrent,
+ com.google.devtools.build.lib.collect.nestedset;uses:="com.google.common.util.concurrent,com.google.common.collect",
+ com.google.devtools.build.lib.concurrent;uses:="com.google.common.util.concurrent",
  com.google.devtools.build.lib.query2.proto.proto2api,
  com.google.devtools.build.lib.runtime.proto,
  com.google.devtools.build.lib.server,
  com.google.devtools.build.lib.view.proto,
  com.google.devtools.common.options.proto,
- com.google.devtools.intellij.aspect,
+ com.google.devtools.intellij.aspect;uses:="com.google.protobuf",
  com.google.devtools.intellij.ideinfo,
- com.google.idea.blaze.base.bazel,
- com.google.idea.blaze.base.command.buildresult,
- com.google.idea.blaze.base.command.info,
- com.google.idea.blaze.base.dependencies,
- com.google.idea.blaze.base.ideinfo,
- com.google.idea.blaze.base.model.primitives,
- com.google.idea.blaze.base.sync.workspace,
- com.google.idea.blaze.base.util,
- com.google.idea.blaze.java,
- com.google.idea.blaze.java.sync.importer,
- com.google.idea.blaze.java.sync.model,
+ com.google.idea.blaze.base.bazel;uses:="com.google.common.collect,com.google.idea.blaze.base.model.primitives",
+ com.google.idea.blaze.base.command.buildresult;
+  uses:="com.google.devtools.build.lib.buildeventstream,
+   com.google.protobuf,
+   com.google.common.collect,
+   com.google.idea.blaze.base.model.primitives",
+ com.google.idea.blaze.base.command.info;uses:="com.google.idea.blaze.base.model.primitives",
+ com.google.idea.blaze.base.dependencies;uses:="com.google.idea.blaze.base.ideinfo,com.google.common.collect,com.google.idea.blaze.base.model.primitives",
+ com.google.idea.blaze.base.ideinfo;
+  uses:="com.google.devtools.intellij.ideinfo,
+   com.google.common.collect,
+   com.google.devtools.intellij.aspect,
+   com.google.idea.blaze.base.dependencies,
+   com.google.idea.blaze.base.model.primitives",
+ com.google.idea.blaze.base.model.primitives;uses:="com.google.idea.blaze.base.ideinfo,com.google.devtools.intellij.ideinfo,com.google.common.collect",
+ com.google.idea.blaze.base.sync.workspace;
+  uses:="com.google.idea.blaze.base.ideinfo,
+   com.google.idea.blaze.base.command.buildresult,
+   com.google.idea.blaze.base.command.info,
+   com.google.common.collect,
+   com.google.idea.blaze.base.model.primitives",
+ com.google.idea.blaze.base.util;uses:="com.google.common.collect,com.google.idea.blaze.base.model.primitives",
+ com.google.idea.blaze.java;uses:="com.google.common.collect,com.google.idea.blaze.base.model.primitives",
+ com.google.idea.blaze.java.sync.importer;uses:="com.google.idea.blaze.base.ideinfo,com.google.idea.blaze.base.bazel,com.google.idea.blaze.base.model.primitives",
+ com.google.idea.blaze.java.sync.model;uses:="com.google.idea.blaze.base.ideinfo",
  com.intellij.openapi.util.io;x-internal:=true,
  com.intellij.openapi.util.text;x-internal:=true,
  net.starlark.java.annot,
- net.starlark.java.annot.processor,
+ net.starlark.java.annot.processor;uses:="javax.annotation.processing,javax.lang.model",
  net.starlark.java.cmd,
- net.starlark.java.eval,
- net.starlark.java.lib.json,
+ net.starlark.java.eval;uses:="net.starlark.java.syntax,net.starlark.java.annot,com.google.common.collect",
+ net.starlark.java.lib.json;uses:="net.starlark.java.eval",
  net.starlark.java.spelling,
  net.starlark.java.syntax
 Bundle-Vendor: Bazel Eclipse Feature

bundles/com.salesforce.bazel.logback/META-INF/MANIFEST.MF

@@ -4,7 +4,7 @@ Bundle-Name: Logback Configuration for Bazel Eclipse Feature
 Bundle-SymbolicName: com.salesforce.bazel.logback
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: Bazel Eclipse Feature
-Fragment-Host: ch.qos.logback.classic;bundle-version="1.2.11"
+Fragment-Host: ch.qos.logback.classic;bundle-version="1.4.11"
 Automatic-Module-Name: com.salesforce.bazel.logback
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Require-Bundle: org.eclipse.core.runtime

bundles/com.salesforce.bazel.sdk/META-INF/MANIFEST.MF

@@ -9,17 +9,26 @@ Automatic-Module-Name: com.salesforce.bazel.eclipse.model
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: com.salesforce.bazel.sdk.BazelJavaSdkPlugin
 Eclipse-BundleShape: dir
-Export-Package: com.salesforce.bazel.sdk,
- com.salesforce.bazel.sdk.aspects.intellij,
- com.salesforce.bazel.sdk.command,
- com.salesforce.bazel.sdk.command.shell,
+Export-Package: com.salesforce.bazel.sdk;uses:="org.osgi.framework,org.eclipse.core.runtime",
+ com.salesforce.bazel.sdk.aspects.intellij;
+  uses:="com.google.idea.blaze.base.command.buildresult,
+   com.google.devtools.intellij.ideinfo,
+   com.salesforce.bazel.sdk,
+   com.google.idea.blaze.base.model.primitives",
+ com.salesforce.bazel.sdk.command;
+  uses:="com.google.idea.blaze.base.command.buildresult,
+   com.salesforce.bazel.sdk,
+   com.salesforce.bazel.sdk.command.shell,
+   com.salesforce.bazel.sdk.aspects.intellij,
+   com.salesforce.bazel.sdk.util",
+ com.salesforce.bazel.sdk.command.shell;uses:="com.salesforce.bazel.sdk.util",
  com.salesforce.bazel.sdk.init,
- com.salesforce.bazel.sdk.model,
- com.salesforce.bazel.sdk.projectview,
+ com.salesforce.bazel.sdk.model;uses:="com.google.idea.blaze.base.model.primitives",
+ com.salesforce.bazel.sdk.projectview;uses:="com.google.common.collect,com.google.idea.blaze.base.model.primitives",
  com.salesforce.bazel.sdk.util
-Import-Package: com.google.common.annotations;version="31.1.0",
- com.google.common.collect;version="31.1.0",
+Import-Package: com.google.common.annotations;version="31.2.0",
+ com.google.common.collect;version="31.2.0",
  com.google.protobuf;version="3.22.0",
  org.slf4j;version="1.7.30"
-Require-Bundle: com.salesforce.bazel.importedsource;bundle-version="2.0.0";visibility:=reexport,
+Require-Bundle: com.salesforce.bazel.importedsource;bundle-version="2.0.0",
  org.eclipse.core.runtime;bundle-version="3.27.0"

releng/target-platform/target-platform-dev.target

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="bazel-eclipse-feature-target-platform-for-development" sequenceNumber="1692715958">
+<target name="bazel-eclipse-feature-target-platform-for-development" sequenceNumber="1693485142">
   <locations>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.e4.rcp.feature.group" version="4.28.0.v20230525-0648"/>
@@ -33,7 +33,6 @@
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="com.google.gson" version="2.10.1.v20230109-0753"/>
-      <unit id="com.google.guava" version="30.1.0.v20221112-0806"/>
       <unit id="com.google.javascript" version="0.0.20160315.v20161124-1903"/>
       <unit id="com.google.protobuf" version="2.4.1.v20220404-1934"/>
       <unit id="javax.annotation" version="1.3.5.v20230504-0748"/>
@@ -46,29 +45,33 @@
       <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20230531010532/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.jdt.ls.core" version="1.23.0.202304271346"/>
-      <repository location="https://download.eclipse.org/jdtls/milestones/1.23.0/repository/"/>
+      <unit id="org.eclipse.jdt.ls.core" version="1.26.0.202307271613"/>
+      <repository location="https://download.eclipse.org/jdtls/milestones/1.26.0/repository/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.mockito.mockito-all" version="1.9.5"/>
       <repository location="https://download.eclipse.org/scout/releases/4.0/testing"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.20.1.v20230228-1533"/>
-      <repository location="https://download.eclipse.org/lsp4j/updates/releases/0.20.1/"/>
+      <unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.21.1.v20230829-0014"/>
+      <repository location="https://download.eclipse.org/lsp4j/updates/releases/0.21.1/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <repository location="https://download.eclipse.org/lsp4j/updates/releases/0.19.1/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.m2e.feature.feature.group" version="2.3.0.20230523-2033"/>
-      <unit id="org.eclipse.m2e.logback.feature.feature.group" version="2.1.2.20230523-2106"/>
-      <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="2.3.0.20230523-2106"/>
-      <repository location="https://download.eclipse.org/technology/m2e/releases/2.3.0/"/>
+      <unit id="org.eclipse.m2e.feature.feature.group" version="2.4.100.20230827-1557"/>
+      <unit id="org.eclipse.m2e.logback.feature.feature.group" version="2.2.0.20230819-1220"/>
+      <unit id="org.eclipse.m2e.sdk.feature.feature.group" version="2.4.0.20230827-1557"/>
+      <repository location="https://download.eclipse.org/technology/m2e/releases/2.4.0/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
-      <unit id="org.eclipse.buildship.feature.group" version="3.1.6.v20220511-1359"/>
-      <repository location="https://download.eclipse.org/buildship/updates/e423/releases/3.x/3.1.6.v20220511-1359/"/>
+      <unit id="org.eclipse.wildwebdeveloper.xml.feature.feature.group" version="1.3.0.202308101707"/>
+      <repository location="https://download.eclipse.org/wildwebdeveloper/releases/1.3.0/"/>
+    </location>
+    <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
+      <unit id="org.eclipse.buildship.feature.group" version="3.1.7.v20230428-1420"/>
+      <repository location="https://download.eclipse.org/buildship/updates/e423/releases/3.x/3.1.7.v20230428-1420/"/>
     </location>
     <location includeMode="planner" includeAllPlatforms="false" includeSource="true" includeConfigurePhase="true" type="InstallableUnit">
       <unit id="org.eclipse.egit.feature.group" version="6.6.0.202305301015-r"/>
@@ -96,7 +99,7 @@
       <unit id="org.eclipse.mylyn.wikitext.markdown.ui" version="3.0.46.202301111837"/>
       <repository location="https://download.eclipse.org/mylyn/docs/releases/3.0.46/"/>
     </location>
-    <location includeDependencyDepth="infinite" includeDependencyScopes="compile,test" includeSource="true" missingManifest="generate" type="Maven" label="MavenDependencies">
+    <location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven" label="MavenDependencies">
     <feature id="com.salesforce.bazel.eclipse.dependencies.feature" label="Third-Party Dependencies used by the Bazel Eclipse Feature" provider-name="" version="2.0.0.qualifier">
     	<description url="http://www.example.com/description">
     		[Enter Feature Description here.]
@@ -112,13 +115,19 @@
     	<dependency>
     		<groupId>com.github.ben-manes.caffeine</groupId>
     		<artifactId>caffeine</artifactId>
-    		<version>3.1.6</version>
+    		<version>3.1.8</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>
     		<groupId>com.github.ben-manes.caffeine</groupId>
     		<artifactId>guava</artifactId>
-    		<version>3.1.6</version>
+    		<version>3.1.8</version>
+    		<type>jar</type>
+    	</dependency>
+    	<dependency>
+    		<groupId>com.google.guava</groupId>
+    		<artifactId>guava</artifactId>
+    		<version>32.1.2-jre</version>
     		<type>jar</type>
     	</dependency>
     	<dependency>