diff --git a/tools/rack/rack.plugin/META-INF/MANIFEST.MF b/tools/rack/rack.plugin/META-INF/MANIFEST.MF index 9f6460fa..e4942173 100644 --- 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 index 9752bcd4..b081e412 100644 --- 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 index 87e0f35d..bf35f93f 100644 --- 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 index 99238361..99832cf6 100644 --- 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 index 127d1e91..1ba42a61 100644 --- a/tools/rack/rack.targetplatform/rack.targetplatform.target +++ b/tools/rack/rack.targetplatform/rack.targetplatform.target @@ -35,6 +35,7 @@ +