Rename common-sbom module to common-maven.

tecarter94 · tecarter94 · commit 2c6ae28adb77 · 2024-10-01T15:15:59.000+10:00
diff --git a/java-components/build-recipes-database/pom.xml b/java-components/build-recipes-database/pom.xml
@@ -19,7 +19,7 @@
         </dependency>
         <dependency>
             <groupId>io.github.redhat-appstudio.jvmbuild</groupId>
-            <artifactId>common-sbom</artifactId>
+            <artifactId>common-maven</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
diff --git a/java-components/build-recipes-database/src/main/java/com/redhat/hacbs/recipes/location/RecipeGroupManager.java b/java-components/build-recipes-database/src/main/java/com/redhat/hacbs/recipes/location/RecipeGroupManager.java
@@ -9,7 +9,7 @@
 
 import org.jboss.logging.Logger;
 
-import com.redhat.hacbs.common.sbom.GAV;
+import com.redhat.hacbs.common.maven.GAV;
 import com.redhat.hacbs.recipes.BuildRecipe;
 
 /**
diff --git a/java-components/build-recipes-database/src/main/java/com/redhat/hacbs/recipes/scm/AbstractPomScmLocator.java b/java-components/build-recipes-database/src/main/java/com/redhat/hacbs/recipes/scm/AbstractPomScmLocator.java
@@ -12,7 +12,7 @@
 import org.apache.maven.model.Scm;
 import org.jboss.logging.Logger;
 
-import com.redhat.hacbs.common.sbom.GAV;
+import com.redhat.hacbs.common.maven.GAV;
 
 public abstract class AbstractPomScmLocator implements ScmLocator {
 
diff --git a/java-components/build-recipes-database/src/main/java/com/redhat/hacbs/recipes/scm/GitScmLocator.java b/java-components/build-recipes-database/src/main/java/com/redhat/hacbs/recipes/scm/GitScmLocator.java
@@ -21,7 +21,7 @@
 import org.eclipse.jgit.lib.Ref;
 import org.jboss.logging.Logger;
 
-import com.redhat.hacbs.common.sbom.GAV;
+import com.redhat.hacbs.common.maven.GAV;
 import com.redhat.hacbs.recipes.BuildRecipe;
 import com.redhat.hacbs.recipes.location.RecipeDirectory;
 import com.redhat.hacbs.recipes.location.RecipeGroupManager;
diff --git a/java-components/build-recipes-database/src/main/java/com/redhat/hacbs/recipes/scm/ScmLocator.java b/java-components/build-recipes-database/src/main/java/com/redhat/hacbs/recipes/scm/ScmLocator.java
@@ -1,6 +1,6 @@
 package com.redhat.hacbs.recipes.scm;
 
-import com.redhat.hacbs.common.sbom.GAV;
+import com.redhat.hacbs.common.maven.GAV;
 
 public interface ScmLocator {
 
diff --git a/java-components/build-recipes-database/src/test/java/com/redhat/hacbs/recipes/location/RecipeGroupManagerAddTest.java b/java-components/build-recipes-database/src/test/java/com/redhat/hacbs/recipes/location/RecipeGroupManagerAddTest.java
@@ -10,7 +10,7 @@
 import org.junit.jupiter.api.Test;
 import org.yaml.snakeyaml.Yaml;
 
-import com.redhat.hacbs.common.sbom.GAV;
+import com.redhat.hacbs.common.maven.GAV;
 import com.redhat.hacbs.recipes.BuildRecipe;
 import com.redhat.hacbs.recipes.scm.ScmInfo;
 
diff --git a/java-components/build-recipes-database/src/test/java/com/redhat/hacbs/recipes/location/RecipeGroupManagerMultipleTest.java b/java-components/build-recipes-database/src/test/java/com/redhat/hacbs/recipes/location/RecipeGroupManagerMultipleTest.java
@@ -9,7 +9,7 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import com.redhat.hacbs.common.sbom.GAV;
+import com.redhat.hacbs.common.maven.GAV;
 import com.redhat.hacbs.recipes.BuildRecipe;
 import com.redhat.hacbs.recipes.scm.ScmInfo;
 
diff --git a/java-components/build-recipes-database/src/test/java/com/redhat/hacbs/recipes/location/RecipeGroupManagerSingleTest.java b/java-components/build-recipes-database/src/test/java/com/redhat/hacbs/recipes/location/RecipeGroupManagerSingleTest.java
@@ -11,7 +11,7 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import com.redhat.hacbs.common.sbom.GAV;
+import com.redhat.hacbs.common.maven.GAV;
 import com.redhat.hacbs.recipes.BuildRecipe;
 import com.redhat.hacbs.recipes.build.BuildRecipeInfo;
 import com.redhat.hacbs.recipes.scm.ScmInfo;
diff --git a/java-components/build-recipes-database/src/test/java/com/redhat/hacbs/recipes/scm/GitScmLocatorTest.java b/java-components/build-recipes-database/src/test/java/com/redhat/hacbs/recipes/scm/GitScmLocatorTest.java
@@ -7,7 +7,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
-import com.redhat.hacbs.common.sbom.GAV;
+import com.redhat.hacbs.common.maven.GAV;
 
 class GitScmLocatorTest {
 
diff --git a/java-components/build-request-processor/pom.xml b/java-components/build-request-processor/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.github.redhat-appstudio.jvmbuild</groupId>
-            <artifactId>common-sbom</artifactId>
+            <artifactId>common-maven</artifactId>
         </dependency>
 
         <dependency>
diff --git a/java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/analyser/location/CacheScmLocator.java b/java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/analyser/location/CacheScmLocator.java
@@ -8,7 +8,7 @@
 
 import org.eclipse.microprofile.rest.client.inject.RegisterRestClient;
 
-import com.redhat.hacbs.common.sbom.GAV;
+import com.redhat.hacbs.common.maven.GAV;
 import com.redhat.hacbs.recipes.scm.ScmLocator;
 import com.redhat.hacbs.recipes.scm.TagInfo;
 
diff --git a/java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/analyser/location/LookupScmLocationCommand.java b/java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/analyser/location/LookupScmLocationCommand.java
@@ -8,7 +8,7 @@
 
 import org.eclipse.microprofile.rest.client.RestClientBuilder;
 
-import com.redhat.hacbs.common.sbom.GAV;
+import com.redhat.hacbs.common.maven.GAV;
 import com.redhat.hacbs.recipes.scm.ScmLocator;
 
 import io.quarkus.logging.Log;
diff --git a/java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/deploy/BuildVerifyCommand.java b/java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/deploy/BuildVerifyCommand.java
@@ -25,7 +25,7 @@
 
 import com.redhat.hacbs.classfile.tracker.ClassFileTracker;
 import com.redhat.hacbs.classfile.tracker.TrackingData;
-import com.redhat.hacbs.common.sbom.GAV;
+import com.redhat.hacbs.common.maven.GAV;
 import com.redhat.hacbs.container.results.ResultsUpdater;
 import com.redhat.hacbs.recipes.util.FileUtil;
 import com.redhat.hacbs.resources.model.v1alpha1.dependencybuildstatus.Contaminates;
diff --git a/java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/deploy/DeployData.java b/java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/deploy/DeployData.java
@@ -5,7 +5,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import com.redhat.hacbs.common.sbom.GAV;
+import com.redhat.hacbs.common.maven.GAV;
 
 @Deprecated
 public final class DeployData {
diff --git a/java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/deploy/containerregistry/ContainerRegistryDeployer.java b/java-components/build-request-processor/src/main/java/com/redhat/hacbs/container/deploy/containerregistry/ContainerRegistryDeployer.java
@@ -29,7 +29,7 @@
 import com.google.cloud.tools.jib.api.buildplan.FilePermissions;
 import com.google.cloud.tools.jib.api.buildplan.FilePermissionsProvider;
 import com.google.cloud.tools.jib.api.buildplan.ImageFormat;
-import com.redhat.hacbs.common.sbom.GAV;
+import com.redhat.hacbs.common.maven.GAV;
 import com.redhat.hacbs.container.deploy.DeployData;
 
 import io.quarkus.logging.Log;
diff --git a/java-components/cache/pom.xml b/java-components/cache/pom.xml
@@ -27,7 +27,7 @@
         </dependency>
         <dependency>
             <groupId>io.github.redhat-appstudio.jvmbuild</groupId>
-            <artifactId>common-sbom</artifactId>
+            <artifactId>common-maven</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
diff --git a/java-components/cache/src/main/java/com/redhat/hacbs/artifactcache/artifactwatch/ScmLookup.java b/java-components/cache/src/main/java/com/redhat/hacbs/artifactcache/artifactwatch/ScmLookup.java
@@ -15,7 +15,7 @@
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 
 import com.redhat.hacbs.artifactcache.services.RecipeManager;
-import com.redhat.hacbs.common.sbom.GAV;
+import com.redhat.hacbs.common.maven.GAV;
 import com.redhat.hacbs.resources.model.v1alpha1.ArtifactBuild;
 import com.redhat.hacbs.resources.model.v1alpha1.ArtifactBuildStatus;
 import com.redhat.hacbs.resources.model.v1alpha1.DependencyBuild;
diff --git a/java-components/cache/src/main/java/com/redhat/hacbs/artifactcache/resources/V2RecipeLookupResource.java b/java-components/cache/src/main/java/com/redhat/hacbs/artifactcache/resources/V2RecipeLookupResource.java
@@ -15,7 +15,7 @@
 import jakarta.ws.rs.core.Response;
 
 import com.redhat.hacbs.artifactcache.services.RecipeManager;
-import com.redhat.hacbs.common.sbom.GAV;
+import com.redhat.hacbs.common.maven.GAV;
 
 import io.quarkus.logging.Log;
 import io.smallrye.common.annotation.Blocking;
diff --git a/java-components/cache/src/main/java/com/redhat/hacbs/artifactcache/services/RepositoryCache.java b/java-components/cache/src/main/java/com/redhat/hacbs/artifactcache/services/RepositoryCache.java
@@ -27,7 +27,7 @@
 import com.redhat.hacbs.classfile.tracker.ClassFileTracker;
 import com.redhat.hacbs.classfile.tracker.HashingOutputStream;
 import com.redhat.hacbs.classfile.tracker.TrackingData;
-import com.redhat.hacbs.common.sbom.GAV;
+import com.redhat.hacbs.common.maven.GAV;
 
 import io.quarkus.logging.Log;
 
diff --git a/java-components/common-maven/pom.xml b/java-components/common-maven/pom.xml
@@ -8,7 +8,7 @@
         <artifactId>jvm-build-service-parent</artifactId>
         <version>999-SNAPSHOT</version>
     </parent>
-    <artifactId>common-sbom</artifactId>
+    <artifactId>common-maven</artifactId>
     <description>Shared code for SBOM generation</description>
     <dependencies>
         <dependency>
diff --git a/java-components/common-maven/src/main/java/com/redhat/hacbs/common/maven/GAV.java b/java-components/common-maven/src/main/java/com/redhat/hacbs/common/maven/GAV.java
@@ -1,4 +1,4 @@
-package com.redhat.hacbs.common.sbom;
+package com.redhat.hacbs.common.maven;
 
 import java.util.Comparator;
 import java.util.Objects;
diff --git a/java-components/common-tools/src/main/java/com/redhat/hacbs/common/tools/recipes/ModifyScmRepoCommand.java b/java-components/common-tools/src/main/java/com/redhat/hacbs/common/tools/recipes/ModifyScmRepoCommand.java
@@ -10,7 +10,7 @@
 import java.util.ArrayList;
 import java.util.Map;
 
-import com.redhat.hacbs.common.sbom.GAV;
+import com.redhat.hacbs.common.maven.GAV;
 import com.redhat.hacbs.common.tools.repo.RepositoryChange;
 import com.redhat.hacbs.recipes.BuildRecipe;
 import com.redhat.hacbs.recipes.scm.RepositoryInfo;
diff --git a/java-components/common-tools/src/main/java/com/redhat/hacbs/common/tools/repo/ScmInfoService.java b/java-components/common-tools/src/main/java/com/redhat/hacbs/common/tools/repo/ScmInfoService.java
@@ -12,7 +12,7 @@
 
 import org.eclipse.microprofile.openapi.annotations.media.Schema;
 
-import com.redhat.hacbs.common.sbom.GAV;
+import com.redhat.hacbs.common.maven.GAV;
 import com.redhat.hacbs.recipes.scm.ScmInfo;
 import com.redhat.hacbs.recipes.scm.ScmInfoManager;
 
diff --git a/java-components/domainproxy/server/pom.xml b/java-components/domainproxy/server/pom.xml
@@ -30,7 +30,7 @@
         </dependency>
         <dependency>
             <groupId>io.github.redhat-appstudio.jvmbuild</groupId>
-            <artifactId>common-sbom</artifactId>
+            <artifactId>common-maven</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/java-components/domainproxy/server/src/main/java/com/redhat/hacbs/domainproxy/Dependency.java b/java-components/domainproxy/server/src/main/java/com/redhat/hacbs/domainproxy/Dependency.java
@@ -2,7 +2,7 @@
 
 import java.util.Comparator;
 
-import com.redhat.hacbs.common.sbom.GAV;
+import com.redhat.hacbs.common.maven.GAV;
 
 public record Dependency(GAV GAV, String classifier) implements Comparable<Dependency> {
     @Override
diff --git a/java-components/pom.xml b/java-components/pom.xml
@@ -82,7 +82,7 @@
         <module>cli</module>
         <module>common-tools</module>
         <module>common-images</module>
-        <module>common-sbom</module>
+        <module>common-maven</module>
         <module>domainproxy</module>
     </modules>
 
@@ -150,7 +150,7 @@
             </dependency>
             <dependency>
                 <groupId>io.github.redhat-appstudio.jvmbuild</groupId>
-                <artifactId>common-sbom</artifactId>
+                <artifactId>common-maven</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
