Provide guava to satisfy Strings reference after Jena bump

Bumping Jena from 4.8.0 to 4.9.0 removed jena-shaded-guava.jar, so we need to get Strings from the guava bundle now. tools/rack/rack.plugin/META-INF/MANIFEST.MF: Require the guava bundle. Remove jena-shaded-guava.jar which Jena no longer provides. tools/rack/rack.plugin/build.properties: Remove jena-shaded-guava.jar which Jena no longer provides. UploadIngestionPackageHandler.java: Import Strings from guava instead of jena-shaded-guava. tools/rack/rack.targetplatform/rack.targetplatform.target: Add the guava bundle.
ge-high-assurance · Aug 8, 2023 · 86ce558 · 86ce558
1 parent 579dd6d
commit 86ce558
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/tools/rack/rack.plugin/META-INF/MANIFEST.MF b/tools/rack/rack.plugin/META-INF/MANIFEST.MF
@@ -23,6 +23,7 @@ Require-Bundle: com.ge.research.jena,
  com.ge.research.sadl.ui,
  com.ge.research.sadl.xtextgenerator,
  com.google.gson,
+ com.google.guava,
  com.google.inject,
  de.jcup.yamleditor,
  org.apache.commons.collections,
@@ -83,7 +84,6 @@ Bundle-ClassPath: .,
  lib/jena-iri.jar,
  lib/jena-rdfconnection.jar,
  lib/jena-shacl.jar,
- lib/jena-shaded-guava.jar,
  lib/jena-shex.jar,
  lib/json-schema-validator.jar,
  lib/json-simple.jar,

diff --git a/tools/rack/rack.plugin/build.properties b/tools/rack/rack.plugin/build.properties
@@ -44,7 +44,6 @@ bin.includes = .,\
                lib/jena-iri.jar,\
                lib/jena-rdfconnection.jar,\
                lib/jena-shacl.jar,\
-               lib/jena-shaded-guava.jar,\
                lib/jena-shex.jar,\
                lib/json-schema-validator.jar,\
                lib/json-simple.jar,\

diff --git a/tools/rack/rack.plugin/src/com/ge/research/rack/UploadIngestionPackageHandler.java b/tools/rack/rack.plugin/src/com/ge/research/rack/UploadIngestionPackageHandler.java
@@ -38,9 +38,9 @@
 import com.ge.research.rack.views.RackPreferencePage;
 import com.ge.research.semtk.services.client.RestClientConfig;
 import com.ge.research.semtk.services.client.UtilityClient;
+import com.google.common.base.Strings;
 
 import org.apache.commons.io.FilenameUtils;
-import org.apache.jena.ext.com.google.common.base.Strings;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;

diff --git a/tools/rack/rack.plugin/src/com/ge/research/rack/views/NodegroupsView.java b/tools/rack/rack.plugin/src/com/ge/research/rack/views/NodegroupsView.java
@@ -122,7 +122,7 @@ public void createPartControl(Composite parent) {
         final ScrolledComposite sc = new ScrolledComposite(parent, SWT.H_SCROLL | SWT.V_SCROLL);
         final Composite composite = new Composite(sc, SWT.NONE);
         sc.setContent(composite);
-        
+
         GridLayout layout = new GridLayout();
         layout.numColumns = 1;
         layout.verticalSpacing = 10;

diff --git a/tools/rack/rack.targetplatform/rack.targetplatform.target b/tools/rack/rack.targetplatform/rack.targetplatform.target
@@ -35,6 +35,7 @@
     </location>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="false" type="InstallableUnit">
       <unit id="com.google.gson" version="0.0.0"/>
+      <unit id="com.google.guava" version="0.0.0"/>
       <unit id="com.google.inject" version="0.0.0"/>
       <unit id="org.apache.commons.collections" version="0.0.0"/>
       <unit id="org.apache.commons.csv" version="0.0.0"/>