BDRELENG-3718: com.blackducksoftware should be the group

sig-sandeshw · sig-sandeshw · commit cec13358df3b · 2025-02-21T00:22:16.000-05:00
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
@@ -20,7 +20,7 @@ Currently, Eclipse is the supported IDE for development. It is recommended to cr
 
 ### Custom Setup
 
-To run tests, the property `com.blackduck.method.analyzer.test.project.dir` must be set to the file path of the `method-analyzer-test-project` directory in the run/debug settings of TestNG. Executions of the tests from the command line via Gradle are configured with this value automatically.
+To run tests, the property `com.blackducksoftware.method.analyzer.test.project.dir` must be set to the file path of the `method-analyzer-test-project` directory in the run/debug settings of TestNG. Executions of the tests from the command line via Gradle are configured with this value automatically.
 
 
 ## General Standards
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 # General library settings
-group=com.blackduck
+group=com.blackducksoftware
 version=1.0.0-SNAPSHOT
 
 org.gradle.console=plain
diff --git a/method-analyzer-core/build.gradle b/method-analyzer-core/build.gradle
@@ -27,7 +27,7 @@ dependencies {
 // Configure tests with directory for test project
 // This requires setting up TestNG run/debug properties within IDE imports to execute tests
 test {
-    systemProperty 'com.blackduck.method.analyzer.test.project.dir', "${project(':method-analyzer-test-project').projectDir}"
+    systemProperty 'com.blackducksoftware.method.analyzer.test.project.dir', "${project(':method-analyzer-test-project').projectDir}"
 }
 
 publishing {
diff --git a/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/MethodUseAnalyzer.java b/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/MethodUseAnalyzer.java
@@ -20,7 +20,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackduck.method.analyzer.core;
+package com.blackducksoftware.method.analyzer.core;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -40,10 +40,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.blackduck.method.analyzer.core.bytecode.ClassMethodReferenceVisitor;
-import com.blackduck.method.analyzer.core.model.MethodUse;
-import com.blackduck.method.analyzer.core.model.ReferencedMethod;
-import com.blackduck.method.analyzer.core.report.ReportGenerator;
+import com.blackducksoftware.method.analyzer.core.bytecode.ClassMethodReferenceVisitor;
+import com.blackducksoftware.method.analyzer.core.model.MethodUse;
+import com.blackducksoftware.method.analyzer.core.model.ReferencedMethod;
+import com.blackducksoftware.method.analyzer.core.report.ReportGenerator;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.collect.Multimap;
diff --git a/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/bytecode/ClassMethodReferenceVisitor.java b/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/bytecode/ClassMethodReferenceVisitor.java
@@ -20,7 +20,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackduck.method.analyzer.core.bytecode;
+package com.blackducksoftware.method.analyzer.core.bytecode;
 
 import java.util.List;
 import java.util.Objects;
@@ -39,8 +39,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.blackduck.method.analyzer.core.model.MethodUse;
-import com.blackduck.method.analyzer.core.model.ReferencedMethod;
+import com.blackducksoftware.method.analyzer.core.model.MethodUse;
+import com.blackducksoftware.method.analyzer.core.model.ReferencedMethod;
 import com.google.common.collect.Multimap;
 
 /**
diff --git a/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/bytecode/MethodReferenceRegistry.java b/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/bytecode/MethodReferenceRegistry.java
@@ -20,7 +20,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackduck.method.analyzer.core.bytecode;
+package com.blackducksoftware.method.analyzer.core.bytecode;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -31,8 +31,8 @@
 
 import javax.annotation.Nullable;
 
-import com.blackduck.method.analyzer.core.model.MethodUse;
-import com.blackduck.method.analyzer.core.model.ReferencedMethod;
+import com.blackducksoftware.method.analyzer.core.model.MethodUse;
+import com.blackducksoftware.method.analyzer.core.model.ReferencedMethod;
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
diff --git a/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/bytecode/package-info.java b/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/bytecode/package-info.java
@@ -26,4 +26,4 @@
  *
  * @author romeara
  */
-package com.blackduck.method.analyzer.core.bytecode;
+package com.blackducksoftware.method.analyzer.core.bytecode;
diff --git a/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/model/MethodUse.java b/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/model/MethodUse.java
@@ -20,7 +20,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackduck.method.analyzer.core.model;
+package com.blackducksoftware.method.analyzer.core.model;
 
 import java.util.Objects;
 import java.util.Optional;
diff --git a/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/model/ReferencedMethod.java b/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/model/ReferencedMethod.java
@@ -20,7 +20,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackduck.method.analyzer.core.model;
+package com.blackducksoftware.method.analyzer.core.model;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/model/package-info.java b/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/model/package-info.java
@@ -26,4 +26,4 @@
  *
  * @author romeara
  */
-package com.blackduck.method.analyzer.core.model;
+package com.blackducksoftware.method.analyzer.core.model;
diff --git a/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/package-info.java b/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/package-info.java
@@ -26,4 +26,4 @@
  *
  * @author romeara
  */
-package com.blackduck.method.analyzer.core;
+package com.blackducksoftware.method.analyzer.core;
diff --git a/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/report/BrokenFileJson.java b/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/report/BrokenFileJson.java
@@ -20,7 +20,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackduck.method.analyzer.core.report;
+package com.blackducksoftware.method.analyzer.core.report;
 
 import java.util.Objects;
 
diff --git a/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/report/BrokenFilesReportJson.java b/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/report/BrokenFilesReportJson.java
@@ -20,7 +20,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackduck.method.analyzer.core.report;
+package com.blackducksoftware.method.analyzer.core.report;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/report/MetaDataReportJson.java b/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/report/MetaDataReportJson.java
@@ -20,7 +20,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackduck.method.analyzer.core.report;
+package com.blackducksoftware.method.analyzer.core.report;
 
 import java.util.Objects;
 
diff --git a/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/report/MethodIdJson.java b/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/report/MethodIdJson.java
@@ -20,7 +20,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackduck.method.analyzer.core.report;
+package com.blackducksoftware.method.analyzer.core.report;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
@@ -29,7 +29,7 @@
 
 import javax.annotation.Nullable;
 
-import com.blackduck.method.analyzer.core.model.ReferencedMethod;
+import com.blackducksoftware.method.analyzer.core.model.ReferencedMethod;
 import com.google.common.base.MoreObjects;
 import com.google.common.hash.HashCode;
 import com.google.common.hash.Hashing;
diff --git a/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/report/MethodIdsReportJson.java b/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/report/MethodIdsReportJson.java
@@ -20,7 +20,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackduck.method.analyzer.core.report;
+package com.blackducksoftware.method.analyzer.core.report;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/report/MethodReferencesReportJson.java b/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/report/MethodReferencesReportJson.java
@@ -20,7 +20,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackduck.method.analyzer.core.report;
+package com.blackducksoftware.method.analyzer.core.report;
 
 import java.util.List;
 import java.util.Objects;
diff --git a/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/report/ReferencedMethodUsesJson.java b/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/report/ReferencedMethodUsesJson.java
@@ -20,7 +20,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackduck.method.analyzer.core.report;
+package com.blackducksoftware.method.analyzer.core.report;
 
 import java.util.Collection;
 import java.util.List;
@@ -29,8 +29,8 @@
 
 import javax.annotation.Nullable;
 
-import com.blackduck.method.analyzer.core.model.MethodUse;
-import com.blackduck.method.analyzer.core.model.ReferencedMethod;
+import com.blackducksoftware.method.analyzer.core.model.MethodUse;
+import com.blackducksoftware.method.analyzer.core.model.ReferencedMethod;
 import com.google.common.base.MoreObjects;
 
 /**
diff --git a/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/report/ReportGenerator.java b/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/report/ReportGenerator.java
@@ -20,7 +20,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackduck.method.analyzer.core.report;
+package com.blackducksoftware.method.analyzer.core.report;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -49,8 +49,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.blackduck.method.analyzer.core.model.MethodUse;
-import com.blackduck.method.analyzer.core.model.ReferencedMethod;
+import com.blackducksoftware.method.analyzer.core.model.MethodUse;
+import com.blackducksoftware.method.analyzer.core.model.ReferencedMethod;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 import com.google.gson.Gson;
diff --git a/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/report/package-info.java b/method-analyzer-core/src/main/java/com/blackduck/method/analyzer/core/report/package-info.java
@@ -26,4 +26,4 @@
  *
  * @author romeara
  */
-package com.blackduck.method.analyzer.core.report;
+package com.blackducksoftware.method.analyzer.core.report;
diff --git a/method-analyzer-core/src/test/java/com/blackduck/method/analyzer/test/core/MethodUseAnalyzerTest.java b/method-analyzer-core/src/test/java/com/blackduck/method/analyzer/test/core/MethodUseAnalyzerTest.java
@@ -20,7 +20,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackduck.method.analyzer.test.core;
+package com.blackducksoftware.method.analyzer.test.core;
 
 import java.io.BufferedReader;
 import java.io.FileInputStream;
@@ -39,12 +39,12 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import com.blackduck.method.analyzer.core.MethodUseAnalyzer;
-import com.blackduck.method.analyzer.core.report.MethodIdJson;
-import com.blackduck.method.analyzer.core.report.MethodIdsReportJson;
-import com.blackduck.method.analyzer.core.report.MethodReferencesReportJson;
-import com.blackduck.method.analyzer.core.report.ReferencedMethodUsesJson;
-import com.blackduck.method.analyzer.core.report.ReferencedMethodUsesJson.MethodUseJson;
+import com.blackducksoftware.method.analyzer.core.MethodUseAnalyzer;
+import com.blackducksoftware.method.analyzer.core.report.MethodIdJson;
+import com.blackducksoftware.method.analyzer.core.report.MethodIdsReportJson;
+import com.blackducksoftware.method.analyzer.core.report.MethodReferencesReportJson;
+import com.blackducksoftware.method.analyzer.core.report.ReferencedMethodUsesJson;
+import com.blackducksoftware.method.analyzer.core.report.ReferencedMethodUsesJson.MethodUseJson;
 import com.google.common.base.Functions;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
@@ -60,9 +60,9 @@ public class MethodUseAnalyzerTest {
     private static final Multimap<String, MethodUseJson> EXPECTED_USES = HashMultimap.create();
 
     static {
-        EXPECTED_USES.put("java.lang.Object.<init>():void", new MethodUseJson("com.blackduck.method.analyzer.test.project.BasicTestClass.<init>", 28));
+        EXPECTED_USES.put("java.lang.Object.<init>():void", new MethodUseJson("com.blackducksoftware.method.analyzer.test.project.BasicTestClass.<init>", 28));
         EXPECTED_USES.put("java.lang.System.getProperty(java.lang.String):java.lang.String",
-                new MethodUseJson("com.blackduck.method.analyzer.test.project.BasicTestClass.<init>", 30));
+                new MethodUseJson("com.blackducksoftware.method.analyzer.test.project.BasicTestClass.<init>", 30));
     }
 
     @Test
diff --git a/method-analyzer-core/src/test/java/com/blackduck/method/analyzer/test/core/TestProperties.java b/method-analyzer-core/src/test/java/com/blackduck/method/analyzer/test/core/TestProperties.java
@@ -20,7 +20,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackduck.method.analyzer.test.core;
+package com.blackducksoftware.method.analyzer.test.core;
 
 /**
  * Represents property keys used within test procedures
@@ -32,6 +32,6 @@ public class TestProperties {
     /**
      * String property which contains a file path to the directory containing a known-quantity test project
      */
-    public static final String TEST_PROJECT_DIRECTORY = "com.blackduck.method.analyzer.test.project.dir";
+    public static final String TEST_PROJECT_DIRECTORY = "com.blackducksoftware.method.analyzer.test.project.dir";
 
 }
diff --git a/method-analyzer-core/src/test/java/com/blackduck/method/analyzer/test/core/bytecode/ClassMethodReferenceVisitorTest.java b/method-analyzer-core/src/test/java/com/blackduck/method/analyzer/test/core/bytecode/ClassMethodReferenceVisitorTest.java
@@ -20,7 +20,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackduck.method.analyzer.test.core.bytecode;
+package com.blackducksoftware.method.analyzer.test.core.bytecode;
 
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -38,10 +38,10 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import com.blackduck.method.analyzer.core.bytecode.ClassMethodReferenceVisitor;
-import com.blackduck.method.analyzer.core.model.MethodUse;
-import com.blackduck.method.analyzer.core.model.ReferencedMethod;
-import com.blackduck.method.analyzer.test.core.TestProperties;
+import com.blackducksoftware.method.analyzer.core.bytecode.ClassMethodReferenceVisitor;
+import com.blackducksoftware.method.analyzer.core.model.MethodUse;
+import com.blackducksoftware.method.analyzer.core.model.ReferencedMethod;
+import com.blackducksoftware.method.analyzer.test.core.TestProperties;
 import com.google.common.collect.Multimap;
 
 public class ClassMethodReferenceVisitorTest {
@@ -89,7 +89,7 @@ public void objectConstructorDetection() throws Exception {
 
         Collection<MethodUse> objectConstructorReferences = result.get(objectConstructorReference);
         Assert.assertEquals(objectConstructorReferences.size(), 1, "Found unexpected number of results: " + objectConstructorReferences);
-        Assert.assertTrue(objectConstructorReferences.contains(new MethodUse("com.blackduck.method.analyzer.test.project.BasicTestClass.<init>", 28)),
+        Assert.assertTrue(objectConstructorReferences.contains(new MethodUse("com.blackducksoftware.method.analyzer.test.project.BasicTestClass.<init>", 28)),
                 "Unexpected reference: " + objectConstructorReferences);
     }
 
@@ -101,7 +101,7 @@ public void fieldInitializationReference() throws Exception {
 
         Collection<MethodUse> systemPropertyReferences = result.get(systemPropertyReference);
         Assert.assertEquals(systemPropertyReferences.size(), 1, "Found unexpected number of results: " + systemPropertyReferences);
-        Assert.assertTrue(systemPropertyReferences.contains(new MethodUse("com.blackduck.method.analyzer.test.project.BasicTestClass.<init>", 30)),
+        Assert.assertTrue(systemPropertyReferences.contains(new MethodUse("com.blackducksoftware.method.analyzer.test.project.BasicTestClass.<init>", 30)),
                 "Unexpected reference: " + systemPropertyReferences);
     }
 
@@ -112,7 +112,7 @@ public void withinMethodReference() throws Exception {
                 "java.lang.String");
         Collection<MethodUse> stringFormatReferences = result.get(stringFormatReference);
         Assert.assertEquals(stringFormatReferences.size(), 1, "Found unexpected number of results: " + stringFormatReferences);
-        Assert.assertTrue(stringFormatReferences.contains(new MethodUse("com.blackduck.method.analyzer.test.project.BasicTestClass.getThing", 35)),
+        Assert.assertTrue(stringFormatReferences.contains(new MethodUse("com.blackducksoftware.method.analyzer.test.project.BasicTestClass.getThing", 35)),
                 "Unexpected reference: " + stringFormatReferences);
     }
 
@@ -129,7 +129,7 @@ public void withinLambdaReference() throws Exception {
         Assert.assertFalse(stringToUpperCaseReferences.isEmpty());
         Assert.assertTrue(
                 stringToUpperCaseReferences.stream()
-                        .allMatch(s -> s.getQualifiedMethodName().startsWith("com.blackduck.method.analyzer.test.project.BasicTestClass.getDynamic")),
+                        .allMatch(s -> s.getQualifiedMethodName().startsWith("com.blackducksoftware.method.analyzer.test.project.BasicTestClass.getDynamic")),
                 "Unexpected reference: " + stringToUpperCaseReferences);
     }
 
diff --git a/method-analyzer-core/src/test/java/com/blackduck/method/analyzer/test/core/bytecode/MethodReferenceRegistryTest.java b/method-analyzer-core/src/test/java/com/blackduck/method/analyzer/test/core/bytecode/MethodReferenceRegistryTest.java
@@ -20,17 +20,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package com.blackduck.method.analyzer.test.core.bytecode;
+package com.blackducksoftware.method.analyzer.test.core.bytecode;
 
 import java.util.Collection;
 import java.util.Collections;
 
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import com.blackduck.method.analyzer.core.bytecode.MethodReferenceRegistry;
-import com.blackduck.method.analyzer.core.model.MethodUse;
-import com.blackduck.method.analyzer.core.model.ReferencedMethod;
+import com.blackducksoftware.method.analyzer.core.bytecode.MethodReferenceRegistry;
+import com.blackducksoftware.method.analyzer.core.model.MethodUse;
+import com.blackducksoftware.method.analyzer.core.model.ReferencedMethod;
 import com.google.common.collect.Multimap;
 
 public class MethodReferenceRegistryTest {
diff --git a/method-analyzer-core/src/test/java/com/blackduck/method/analyzer/test/core/report/ReportGeneratorTest.java b/method-analyzer-core/src/test/java/com/blackduck/method/analyzer/test/core/report/ReportGeneratorTest.java
diff --git a/method-analyzer-test-project/src/main/java/com/blackduck/method/analyzer/test/project/BasicTestClass.java b/method-analyzer-test-project/src/main/java/com/blackduck/method/analyzer/test/project/BasicTestClass.java

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ dependencies {`
`27`	`27`	`// Configure tests with directory for test project`
`28`	`28`	`// This requires setting up TestNG run/debug properties within IDE imports to execute tests`
`29`	`29`	`test {`
`30`		`- systemProperty 'com.blackduck.method.analyzer.test.project.dir', "${project(':method-analyzer-test-project').projectDir}"`
	`30`	`+ systemProperty 'com.blackducksoftware.method.analyzer.test.project.dir', "${project(':method-analyzer-test-project').projectDir}"`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`publishing {`
Original file line number	Diff line number	Diff line change
`@@ -26,4 +26,4 @@`
`26`	`26`	`*`
`27`	`27`	`* @author romeara`
`28`	`28`	`*/`
`29`		`-package com.blackduck.method.analyzer.core.bytecode;`
	`29`	`+package com.blackducksoftware.method.analyzer.core.bytecode;`