Updating package names

blackducksoftware · Aug 10, 2018 · 78f722d · 78f722d
1 parent ab20159
commit 78f722d
Show file tree

Hide file tree

Showing 52 changed files with 225 additions and 229 deletions.
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies { classpath "com.blackducksoftware.integration:common-gradle-plugin:0.0.+" }
 }
 
-version = '15.0.3-SNAPSHOT'
+version = '16.0.0-SNAPSHOT'
 
 apply plugin: 'com.blackducksoftware.integration.library'
 
@@ -17,7 +17,7 @@ versionFile.delete()
 versionFile << version
 
 dependencies {
-    compile 'com.blackducksoftware.integration:integration-common:11.3.1'
+    compile 'com.blackducksoftware.integration:integration-common:12.0.0'
 
     testCompile 'org.mockito:mockito-core:2.18.3'
     testCompile 'org.skyscreamer:jsonassert:1.5.0'

diff --git a/...integration/hub/bdio/BdioNodeFactory.java → ...integration/hub/bdio/BdioNodeFactory.java b/...integration/hub/bdio/BdioNodeFactory.java → ...integration/hub/bdio/BdioNodeFactory.java
@@ -21,7 +21,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.bdio;
+package com.synopsys.integration.hub.bdio;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -34,13 +34,13 @@
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 
-import com.blackducksoftware.integration.hub.bdio.model.BdioBillOfMaterials;
-import com.blackducksoftware.integration.hub.bdio.model.BdioComponent;
-import com.blackducksoftware.integration.hub.bdio.model.BdioCreationInfo;
-import com.blackducksoftware.integration.hub.bdio.model.BdioExternalIdentifier;
-import com.blackducksoftware.integration.hub.bdio.model.BdioProject;
-import com.blackducksoftware.integration.hub.bdio.model.SpdxCreator;
-import com.blackducksoftware.integration.hub.bdio.model.externalid.ExternalId;
+import com.synopsys.integration.hub.bdio.model.BdioBillOfMaterials;
+import com.synopsys.integration.hub.bdio.model.BdioComponent;
+import com.synopsys.integration.hub.bdio.model.BdioCreationInfo;
+import com.synopsys.integration.hub.bdio.model.BdioExternalIdentifier;
+import com.synopsys.integration.hub.bdio.model.BdioProject;
+import com.synopsys.integration.hub.bdio.model.SpdxCreator;
+import com.synopsys.integration.hub.bdio.model.externalid.ExternalId;
 
 public class BdioNodeFactory {
     private final BdioPropertyHelper bdioPropertyHelper;

diff --git a/...egration/hub/bdio/BdioPropertyHelper.java → ...egration/hub/bdio/BdioPropertyHelper.java b/...egration/hub/bdio/BdioPropertyHelper.java → ...egration/hub/bdio/BdioPropertyHelper.java
@@ -21,14 +21,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.bdio;
+package com.synopsys.integration.hub.bdio;
 
 import java.util.List;
 
-import com.blackducksoftware.integration.hub.bdio.model.BdioExternalIdentifier;
-import com.blackducksoftware.integration.hub.bdio.model.BdioNode;
-import com.blackducksoftware.integration.hub.bdio.model.BdioRelationship;
-import com.blackducksoftware.integration.hub.bdio.model.externalid.ExternalId;
+import com.synopsys.integration.hub.bdio.model.BdioExternalIdentifier;
+import com.synopsys.integration.hub.bdio.model.BdioNode;
+import com.synopsys.integration.hub.bdio.model.BdioRelationship;
+import com.synopsys.integration.hub.bdio.model.externalid.ExternalId;
 
 public class BdioPropertyHelper {
     public void addRelationships(final BdioNode node, final List<? extends BdioNode> children) {

diff --git a/...ware/integration/hub/bdio/BdioReader.java → ...psys/integration/hub/bdio/BdioReader.java b/...ware/integration/hub/bdio/BdioReader.java → ...psys/integration/hub/bdio/BdioReader.java
@@ -21,7 +21,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.bdio;
+package com.synopsys.integration.hub.bdio;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -30,12 +30,12 @@
 import java.io.Reader;
 import java.nio.charset.StandardCharsets;
 
-import com.blackducksoftware.integration.hub.bdio.model.BdioBillOfMaterials;
-import com.blackducksoftware.integration.hub.bdio.model.BdioComponent;
-import com.blackducksoftware.integration.hub.bdio.model.BdioProject;
-import com.blackducksoftware.integration.hub.bdio.model.SimpleBdioDocument;
 import com.google.gson.Gson;
 import com.google.gson.stream.JsonReader;
+import com.synopsys.integration.hub.bdio.model.BdioBillOfMaterials;
+import com.synopsys.integration.hub.bdio.model.BdioComponent;
+import com.synopsys.integration.hub.bdio.model.BdioProject;
+import com.synopsys.integration.hub.bdio.model.SimpleBdioDocument;
 
 public class BdioReader implements Closeable {
     private final Gson gson;

diff --git a/...integration/hub/bdio/BdioTransformer.java → ...integration/hub/bdio/BdioTransformer.java b/...integration/hub/bdio/BdioTransformer.java → ...integration/hub/bdio/BdioTransformer.java
@@ -21,22 +21,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.bdio;
+package com.synopsys.integration.hub.bdio;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 
-import com.blackducksoftware.integration.hub.bdio.graph.DependencyGraph;
-import com.blackducksoftware.integration.hub.bdio.graph.MutableMapDependencyGraph;
-import com.blackducksoftware.integration.hub.bdio.model.BdioComponent;
-import com.blackducksoftware.integration.hub.bdio.model.BdioProject;
-import com.blackducksoftware.integration.hub.bdio.model.BdioRelationship;
-import com.blackducksoftware.integration.hub.bdio.model.Forge;
-import com.blackducksoftware.integration.hub.bdio.model.dependency.Dependency;
-import com.blackducksoftware.integration.hub.bdio.model.externalid.ExternalId;
+import com.synopsys.integration.hub.bdio.graph.DependencyGraph;
+import com.synopsys.integration.hub.bdio.graph.MutableMapDependencyGraph;
+import com.synopsys.integration.hub.bdio.model.BdioComponent;
+import com.synopsys.integration.hub.bdio.model.BdioProject;
+import com.synopsys.integration.hub.bdio.model.BdioRelationship;
+import com.synopsys.integration.hub.bdio.model.Forge;
+import com.synopsys.integration.hub.bdio.model.dependency.Dependency;
+import com.synopsys.integration.hub.bdio.model.externalid.ExternalId;
 
 public class BdioTransformer {
     private final Map<String, Forge> forgeMap;

diff --git a/...ware/integration/hub/bdio/BdioWriter.java → ...psys/integration/hub/bdio/BdioWriter.java b/...ware/integration/hub/bdio/BdioWriter.java → ...psys/integration/hub/bdio/BdioWriter.java
@@ -21,7 +21,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.bdio;
+package com.synopsys.integration.hub.bdio;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -32,10 +32,10 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import com.blackducksoftware.integration.hub.bdio.model.BdioNode;
-import com.blackducksoftware.integration.hub.bdio.model.SimpleBdioDocument;
 import com.google.gson.Gson;
 import com.google.gson.stream.JsonWriter;
+import com.synopsys.integration.hub.bdio.model.BdioNode;
+import com.synopsys.integration.hub.bdio.model.SimpleBdioDocument;
 
 public class BdioWriter implements Closeable {
     private final Gson gson;

diff --git a/...tegration/hub/bdio/SimpleBdioFactory.java → ...tegration/hub/bdio/SimpleBdioFactory.java b/...tegration/hub/bdio/SimpleBdioFactory.java → ...tegration/hub/bdio/SimpleBdioFactory.java
@@ -21,7 +21,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.bdio;
+package com.synopsys.integration.hub.bdio;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -32,22 +32,22 @@
 import java.util.List;
 import java.util.Map;
 
-import com.blackducksoftware.integration.hub.bdio.graph.DependencyGraph;
-import com.blackducksoftware.integration.hub.bdio.graph.DependencyGraphTransformer;
-import com.blackducksoftware.integration.hub.bdio.graph.MutableDependencyGraph;
-import com.blackducksoftware.integration.hub.bdio.graph.MutableMapDependencyGraph;
-import com.blackducksoftware.integration.hub.bdio.model.BdioBillOfMaterials;
-import com.blackducksoftware.integration.hub.bdio.model.BdioComponent;
-import com.blackducksoftware.integration.hub.bdio.model.BdioExternalIdentifier;
-import com.blackducksoftware.integration.hub.bdio.model.BdioNode;
-import com.blackducksoftware.integration.hub.bdio.model.BdioProject;
-import com.blackducksoftware.integration.hub.bdio.model.Forge;
-import com.blackducksoftware.integration.hub.bdio.model.SimpleBdioDocument;
-import com.blackducksoftware.integration.hub.bdio.model.dependency.Dependency;
-import com.blackducksoftware.integration.hub.bdio.model.externalid.ExternalId;
-import com.blackducksoftware.integration.hub.bdio.model.externalid.ExternalIdFactory;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.synopsys.integration.hub.bdio.graph.DependencyGraph;
+import com.synopsys.integration.hub.bdio.graph.DependencyGraphTransformer;
+import com.synopsys.integration.hub.bdio.graph.MutableDependencyGraph;
+import com.synopsys.integration.hub.bdio.graph.MutableMapDependencyGraph;
+import com.synopsys.integration.hub.bdio.model.BdioBillOfMaterials;
+import com.synopsys.integration.hub.bdio.model.BdioComponent;
+import com.synopsys.integration.hub.bdio.model.BdioExternalIdentifier;
+import com.synopsys.integration.hub.bdio.model.BdioNode;
+import com.synopsys.integration.hub.bdio.model.BdioProject;
+import com.synopsys.integration.hub.bdio.model.Forge;
+import com.synopsys.integration.hub.bdio.model.SimpleBdioDocument;
+import com.synopsys.integration.hub.bdio.model.dependency.Dependency;
+import com.synopsys.integration.hub.bdio.model.externalid.ExternalId;
+import com.synopsys.integration.hub.bdio.model.externalid.ExternalIdFactory;
 
 public class SimpleBdioFactory {
     private final BdioPropertyHelper bdioPropertyHelper;

diff --git a/...ation/hub/bdio/graph/DependencyGraph.java → ...ation/hub/bdio/graph/DependencyGraph.java b/...ation/hub/bdio/graph/DependencyGraph.java → ...ation/hub/bdio/graph/DependencyGraph.java
@@ -21,12 +21,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.bdio.graph;
+package com.synopsys.integration.hub.bdio.graph;
 
 import java.util.Set;
 
-import com.blackducksoftware.integration.hub.bdio.model.dependency.Dependency;
-import com.blackducksoftware.integration.hub.bdio.model.externalid.ExternalId;
+import com.synopsys.integration.hub.bdio.model.dependency.Dependency;
+import com.synopsys.integration.hub.bdio.model.externalid.ExternalId;
 
 public interface DependencyGraph {
     public Set<Dependency> getRootDependencies();

diff --git a/...b/bdio/graph/DependencyGraphCombiner.java → ...b/bdio/graph/DependencyGraphCombiner.java b/...b/bdio/graph/DependencyGraphCombiner.java → ...b/bdio/graph/DependencyGraphCombiner.java
@@ -21,12 +21,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.bdio.graph;
+package com.synopsys.integration.hub.bdio.graph;
 
 import java.util.HashSet;
 import java.util.Set;
 
-import com.blackducksoftware.integration.hub.bdio.model.dependency.Dependency;
+import com.synopsys.integration.hub.bdio.model.dependency.Dependency;
 
 public class DependencyGraphCombiner {
     public void addGraphAsChildrenToRoot(final MutableDependencyGraph destinationGraph, final DependencyGraph sourceGraph) {

diff --git a/...dio/graph/DependencyGraphTransformer.java → ...dio/graph/DependencyGraphTransformer.java b/...dio/graph/DependencyGraphTransformer.java → ...dio/graph/DependencyGraphTransformer.java
@@ -21,20 +21,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.bdio.graph;
+package com.synopsys.integration.hub.bdio.graph;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.blackducksoftware.integration.hub.bdio.BdioNodeFactory;
-import com.blackducksoftware.integration.hub.bdio.BdioPropertyHelper;
-import com.blackducksoftware.integration.hub.bdio.model.BdioComponent;
-import com.blackducksoftware.integration.hub.bdio.model.BdioExternalIdentifier;
-import com.blackducksoftware.integration.hub.bdio.model.BdioNode;
-import com.blackducksoftware.integration.hub.bdio.model.dependency.Dependency;
-import com.blackducksoftware.integration.hub.bdio.model.externalid.ExternalId;
+import com.synopsys.integration.hub.bdio.BdioNodeFactory;
+import com.synopsys.integration.hub.bdio.BdioPropertyHelper;
+import com.synopsys.integration.hub.bdio.model.BdioComponent;
+import com.synopsys.integration.hub.bdio.model.BdioExternalIdentifier;
+import com.synopsys.integration.hub.bdio.model.BdioNode;
+import com.synopsys.integration.hub.bdio.model.dependency.Dependency;
+import com.synopsys.integration.hub.bdio.model.externalid.ExternalId;
 
 public class DependencyGraphTransformer {
     private final BdioPropertyHelper bdioPropertyHelper;

diff --git a/...ub/bdio/graph/MutableDependencyGraph.java → ...ub/bdio/graph/MutableDependencyGraph.java b/...ub/bdio/graph/MutableDependencyGraph.java → ...ub/bdio/graph/MutableDependencyGraph.java
@@ -21,12 +21,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.bdio.graph;
+package com.synopsys.integration.hub.bdio.graph;
 
 import java.util.List;
 import java.util.Set;
 
-import com.blackducksoftware.integration.hub.bdio.model.dependency.Dependency;
+import com.synopsys.integration.hub.bdio.model.dependency.Dependency;
 
 public interface MutableDependencyGraph extends DependencyGraph {
     public void addGraphAsChildrenToRoot(DependencyGraph sourceGraph);

diff --git a/...bdio/graph/MutableMapDependencyGraph.java → ...bdio/graph/MutableMapDependencyGraph.java b/...bdio/graph/MutableMapDependencyGraph.java → ...bdio/graph/MutableMapDependencyGraph.java
@@ -21,7 +21,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.bdio.graph;
+package com.synopsys.integration.hub.bdio.graph;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -30,8 +30,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import com.blackducksoftware.integration.hub.bdio.model.dependency.Dependency;
-import com.blackducksoftware.integration.hub.bdio.model.externalid.ExternalId;
+import com.synopsys.integration.hub.bdio.model.dependency.Dependency;
+import com.synopsys.integration.hub.bdio.model.externalid.ExternalId;
 
 public class MutableMapDependencyGraph implements MutableDependencyGraph {
     private final Set<ExternalId> rootDependencies = new HashSet<>();

diff --git a/...LazyExternalIdDependencyGraphBuilder.java → ...LazyExternalIdDependencyGraphBuilder.java b/...LazyExternalIdDependencyGraphBuilder.java → ...LazyExternalIdDependencyGraphBuilder.java
@@ -21,20 +21,20 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.bdio.graph.builder;
+package com.synopsys.integration.hub.bdio.graph.builder;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import com.blackducksoftware.integration.hub.bdio.graph.DependencyGraph;
-import com.blackducksoftware.integration.hub.bdio.graph.MutableDependencyGraph;
-import com.blackducksoftware.integration.hub.bdio.graph.MutableMapDependencyGraph;
-import com.blackducksoftware.integration.hub.bdio.model.dependency.Dependency;
-import com.blackducksoftware.integration.hub.bdio.model.dependencyid.DependencyId;
-import com.blackducksoftware.integration.hub.bdio.model.externalid.ExternalId;
+import com.synopsys.integration.hub.bdio.graph.DependencyGraph;
+import com.synopsys.integration.hub.bdio.graph.MutableDependencyGraph;
+import com.synopsys.integration.hub.bdio.graph.MutableMapDependencyGraph;
+import com.synopsys.integration.hub.bdio.model.dependency.Dependency;
+import com.synopsys.integration.hub.bdio.model.dependencyid.DependencyId;
+import com.synopsys.integration.hub.bdio.model.externalid.ExternalId;
 
 public class LazyExternalIdDependencyGraphBuilder {
     private class LazyDependencyInfo {

diff --git a/...ph/summary/DependencyGraphSummarizer.java → ...ph/summary/DependencyGraphSummarizer.java b/...ph/summary/DependencyGraphSummarizer.java → ...ph/summary/DependencyGraphSummarizer.java
@@ -21,18 +21,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.bdio.graph.summary;
+package com.synopsys.integration.hub.bdio.graph.summary;
 
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.Queue;
 import java.util.Set;
 
-import com.blackducksoftware.integration.hub.bdio.graph.DependencyGraph;
-import com.blackducksoftware.integration.hub.bdio.model.dependency.Dependency;
-import com.blackducksoftware.integration.hub.bdio.model.externalid.ExternalId;
-import com.blackducksoftware.integration.util.NameVersion;
 import com.google.gson.Gson;
+import com.synopsys.integration.hub.bdio.graph.DependencyGraph;
+import com.synopsys.integration.hub.bdio.model.dependency.Dependency;
+import com.synopsys.integration.hub.bdio.model.externalid.ExternalId;
+import com.synopsys.integration.util.NameVersion;
 
 public class DependencyGraphSummarizer {
     private final Gson gson;

diff --git a/.../hub/bdio/graph/summary/GraphSummary.java → .../hub/bdio/graph/summary/GraphSummary.java b/.../hub/bdio/graph/summary/GraphSummary.java → .../hub/bdio/graph/summary/GraphSummary.java
@@ -21,14 +21,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.bdio.graph.summary;
+package com.synopsys.integration.hub.bdio.graph.summary;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import com.blackducksoftware.integration.util.NameVersion;
+import com.synopsys.integration.util.NameVersion;
 
 public class GraphSummary {
     public Set<String> rootExternalDataIds = new HashSet<>();

diff --git a/...n/hub/bdio/model/BdioBillOfMaterials.java → ...n/hub/bdio/model/BdioBillOfMaterials.java b/...n/hub/bdio/model/BdioBillOfMaterials.java → ...n/hub/bdio/model/BdioBillOfMaterials.java
@@ -21,7 +21,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.bdio.model;
+package com.synopsys.integration.hub.bdio.model;
 
 import com.google.gson.annotations.SerializedName;
 

diff --git a/...gration/hub/bdio/model/BdioComponent.java → ...gration/hub/bdio/model/BdioComponent.java b/...gration/hub/bdio/model/BdioComponent.java → ...gration/hub/bdio/model/BdioComponent.java
@@ -21,7 +21,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.bdio.model;
+package com.synopsys.integration.hub.bdio.model;
 
 import com.google.gson.annotations.SerializedName;
 

diff --git a/...tion/hub/bdio/model/BdioCreationInfo.java → ...tion/hub/bdio/model/BdioCreationInfo.java b/...tion/hub/bdio/model/BdioCreationInfo.java → ...tion/hub/bdio/model/BdioCreationInfo.java
@@ -21,7 +21,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.bdio.model;
+package com.synopsys.integration.hub.bdio.model;
 
 import java.util.ArrayList;
 import java.util.Collections;

diff --git a/...ub/bdio/model/BdioExternalIdentifier.java → ...ub/bdio/model/BdioExternalIdentifier.java b/...ub/bdio/model/BdioExternalIdentifier.java → ...ub/bdio/model/BdioExternalIdentifier.java
@@ -21,10 +21,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackducksoftware.integration.hub.bdio.model;
+package com.synopsys.integration.hub.bdio.model;
 
-import com.blackducksoftware.integration.hub.bdio.model.externalid.ExternalId;
 import com.google.gson.annotations.SerializedName;
+import com.synopsys.integration.hub.bdio.model.externalid.ExternalId;
 
 public class BdioExternalIdentifier {
     @SerializedName("externalSystemTypeId")