Merge pull request #1866 from rnc/CLI

Refactor CLI to use same package structure as rest of repository
redhat-appstudio · Jun 24, 2024 · 31b36cb · 31b36cb
2 parents 7d3f4a5 + f36394a
commit 31b36cb
Show file tree

Hide file tree

Showing 40 changed files with 63 additions and 62 deletions.
diff --git a/...appstudio/jvmbuild/cli/CustomFactory.java → ...a/com/redhat/hacbs/cli/CustomFactory.java b/...appstudio/jvmbuild/cli/CustomFactory.java → ...a/com/redhat/hacbs/cli/CustomFactory.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli;
+package com.redhat.hacbs.cli;
 
 import java.util.Arrays;
 import java.util.List;

diff --git a/...tudio/jvmbuild/cli/DiagnosticCommand.java → ...m/redhat/hacbs/cli/DiagnosticCommand.java b/...tudio/jvmbuild/cli/DiagnosticCommand.java → ...m/redhat/hacbs/cli/DiagnosticCommand.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli;
+package com.redhat.hacbs.cli;
 
 import java.io.IOException;
 import java.nio.file.Files;

diff --git a/...ild/cli/InteractiveParameterConsumer.java → ...cbs/cli/InteractiveParameterConsumer.java b/...ild/cli/InteractiveParameterConsumer.java → ...cbs/cli/InteractiveParameterConsumer.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli;
+package com.redhat.hacbs.cli;
 
 import java.io.IOException;
 import java.util.Stack;

diff --git a/...ub/redhatappstudio/jvmbuild/cli/Main.java → .../main/java/com/redhat/hacbs/cli/Main.java b/...ub/redhatappstudio/jvmbuild/cli/Main.java → .../main/java/com/redhat/hacbs/cli/Main.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli;
+package com.redhat.hacbs.cli;
 
 import io.quarkus.arc.Arc;
 import io.quarkus.runtime.Quarkus;

diff --git a/...atappstudio/jvmbuild/cli/MainCommand.java → ...ava/com/redhat/hacbs/cli/MainCommand.java b/...atappstudio/jvmbuild/cli/MainCommand.java → ...ava/com/redhat/hacbs/cli/MainCommand.java
@@ -1,13 +1,14 @@
-package io.github.redhatappstudio.jvmbuild.cli;
+package com.redhat.hacbs.cli;
 
 import java.io.PrintWriter;
 
 import jakarta.enterprise.inject.Vetoed;
 
-import io.github.redhatappstudio.jvmbuild.cli.artifacts.ArtifactCommand;
-import io.github.redhatappstudio.jvmbuild.cli.builds.BuildCommand;
-import io.github.redhatappstudio.jvmbuild.cli.rebuilt.RebuiltCommand;
-import io.github.redhatappstudio.jvmbuild.cli.settings.SetupCommand;
+import com.redhat.hacbs.cli.artifacts.ArtifactCommand;
+import com.redhat.hacbs.cli.builds.BuildCommand;
+import com.redhat.hacbs.cli.rebuilt.RebuiltCommand;
+import com.redhat.hacbs.cli.settings.SetupCommand;
+
 import jline.console.ConsoleReader;
 import picocli.CommandLine;
 import picocli.CommandLine.Model.CommandSpec;

diff --git a/...atappstudio/jvmbuild/cli/QuitCommand.java → ...ava/com/redhat/hacbs/cli/QuitCommand.java b/...atappstudio/jvmbuild/cli/QuitCommand.java → ...ava/com/redhat/hacbs/cli/QuitCommand.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli;
+package com.redhat.hacbs.cli;
 
 import jakarta.inject.Inject;
 

diff --git a/...cli/artifacts/ArtifactBuildCompleter.java → ...cli/artifacts/ArtifactBuildCompleter.java b/...cli/artifacts/ArtifactBuildCompleter.java → ...cli/artifacts/ArtifactBuildCompleter.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.artifacts;
+package com.redhat.hacbs.cli.artifacts;
 
 import java.util.Map;
 import java.util.TreeMap;

diff --git a/...mbuild/cli/artifacts/ArtifactCommand.java → .../hacbs/cli/artifacts/ArtifactCommand.java b/...mbuild/cli/artifacts/ArtifactCommand.java → .../hacbs/cli/artifacts/ArtifactCommand.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.artifacts;
+package com.redhat.hacbs.cli.artifacts;
 
 import picocli.CommandLine;
 

diff --git a/.../cli/artifacts/ArtifactCreateCommand.java → .../cli/artifacts/ArtifactCreateCommand.java b/.../cli/artifacts/ArtifactCreateCommand.java → .../cli/artifacts/ArtifactCreateCommand.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.artifacts;
+package com.redhat.hacbs.cli.artifacts;
 
 import com.redhat.hacbs.resources.model.v1alpha1.ArtifactBuild;
 import com.redhat.hacbs.resources.model.v1alpha1.ArtifactBuildSpec;

diff --git a/.../artifacts/ArtifactFixMissingCommand.java → .../artifacts/ArtifactFixMissingCommand.java b/.../artifacts/ArtifactFixMissingCommand.java → .../artifacts/ArtifactFixMissingCommand.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.artifacts;
+package com.redhat.hacbs.cli.artifacts;
 
 import java.util.Map;
 

diff --git a/...ld/cli/artifacts/ArtifactListCommand.java → ...bs/cli/artifacts/ArtifactListCommand.java b/...ld/cli/artifacts/ArtifactListCommand.java → ...bs/cli/artifacts/ArtifactListCommand.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.artifacts;
+package com.redhat.hacbs.cli.artifacts;
 
 import com.redhat.hacbs.resources.model.v1alpha1.ModelConstants;
 

diff --git a/...cli/artifacts/ArtifactRebuildCommand.java → ...cli/artifacts/ArtifactRebuildCommand.java b/...cli/artifacts/ArtifactRebuildCommand.java → ...cli/artifacts/ArtifactRebuildCommand.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.artifacts;
+package com.redhat.hacbs.cli.artifacts;
 
 import java.util.HashMap;
 import java.util.function.UnaryOperator;

diff --git a/...cli/artifacts/ArtifactSummaryCommand.java → ...cli/artifacts/ArtifactSummaryCommand.java b/...cli/artifacts/ArtifactSummaryCommand.java → ...cli/artifacts/ArtifactSummaryCommand.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.artifacts;
+package com.redhat.hacbs.cli.artifacts;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/.../jvmbuild/cli/artifacts/GavCompleter.java → ...hat/hacbs/cli/artifacts/GavCompleter.java b/.../jvmbuild/cli/artifacts/GavCompleter.java → ...hat/hacbs/cli/artifacts/GavCompleter.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.artifacts;
+package com.redhat.hacbs.cli.artifacts;
 
 import java.util.Map;
 import java.util.TreeMap;

diff --git a/...ifacts/MissingArtifactBuildCompleter.java → ...ifacts/MissingArtifactBuildCompleter.java b/...ifacts/MissingArtifactBuildCompleter.java → ...ifacts/MissingArtifactBuildCompleter.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.artifacts;
+package com.redhat.hacbs.cli.artifacts;
 
 import java.util.stream.Collectors;
 

diff --git a/...ld/cli/artifacts/MissingGavCompleter.java → ...bs/cli/artifacts/MissingGavCompleter.java b/...ld/cli/artifacts/MissingGavCompleter.java → ...bs/cli/artifacts/MissingGavCompleter.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.artifacts;
+package com.redhat.hacbs.cli.artifacts;
 
 import java.util.stream.Collectors;
 

diff --git a/...dio/jvmbuild/cli/builds/BuildCommand.java → ...redhat/hacbs/cli/builds/BuildCommand.java b/...dio/jvmbuild/cli/builds/BuildCommand.java → ...redhat/hacbs/cli/builds/BuildCommand.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.builds;
+package com.redhat.hacbs.cli.builds;
 
 import picocli.CommandLine;
 

diff --git a/...mbuild/cli/builds/BuildCreateCommand.java → .../hacbs/cli/builds/BuildCreateCommand.java b/...mbuild/cli/builds/BuildCreateCommand.java → .../hacbs/cli/builds/BuildCreateCommand.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.builds;
+package com.redhat.hacbs.cli.builds;
 
 import org.apache.commons.codec.digest.DigestUtils;
 

diff --git a/...ld/cli/builds/BuildDiagnosticCommand.java → ...bs/cli/builds/BuildDiagnosticCommand.java b/...ld/cli/builds/BuildDiagnosticCommand.java → ...bs/cli/builds/BuildDiagnosticCommand.java
@@ -1,19 +1,19 @@
-package io.github.redhatappstudio.jvmbuild.cli.builds;
+package com.redhat.hacbs.cli.builds;
 
 import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Map;
 
+import com.redhat.hacbs.cli.artifacts.ArtifactBuildCompleter;
+import com.redhat.hacbs.cli.artifacts.GavCompleter;
+import com.redhat.hacbs.cli.util.BuildConverter;
 import com.redhat.hacbs.common.tools.completer.BuildCompleter;
 import com.redhat.hacbs.resources.model.v1alpha1.ArtifactBuild;
 import com.redhat.hacbs.resources.model.v1alpha1.DependencyBuild;
 
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.github.redhatappstudio.jvmbuild.cli.artifacts.ArtifactBuildCompleter;
-import io.github.redhatappstudio.jvmbuild.cli.artifacts.GavCompleter;
-import io.github.redhatappstudio.jvmbuild.cli.util.BuildConverter;
 import io.quarkus.arc.Arc;
 import picocli.CommandLine;
 

diff --git a/.../jvmbuild/cli/builds/BuildFixCommand.java → ...hat/hacbs/cli/builds/BuildFixCommand.java b/.../jvmbuild/cli/builds/BuildFixCommand.java → ...hat/hacbs/cli/builds/BuildFixCommand.java
@@ -1,18 +1,18 @@
-package io.github.redhatappstudio.jvmbuild.cli.builds;
+package com.redhat.hacbs.cli.builds;
 
 import java.util.Map;
 import java.util.function.Function;
 
+import com.redhat.hacbs.cli.artifacts.ArtifactBuildCompleter;
+import com.redhat.hacbs.cli.artifacts.GavCompleter;
+import com.redhat.hacbs.cli.util.BuildConverter;
 import com.redhat.hacbs.common.tools.completer.BuildCompleter;
 import com.redhat.hacbs.common.tools.recipes.ModifyBuildRecipeCommand;
 import com.redhat.hacbs.recipes.build.BuildRecipeInfo;
 import com.redhat.hacbs.resources.model.v1alpha1.ArtifactBuild;
 import com.redhat.hacbs.resources.model.v1alpha1.DependencyBuild;
 
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.github.redhatappstudio.jvmbuild.cli.artifacts.ArtifactBuildCompleter;
-import io.github.redhatappstudio.jvmbuild.cli.artifacts.GavCompleter;
-import io.github.redhatappstudio.jvmbuild.cli.util.BuildConverter;
 import io.quarkus.arc.Arc;
 import picocli.CommandLine;
 

diff --git a/...jvmbuild/cli/builds/BuildListCommand.java → ...at/hacbs/cli/builds/BuildListCommand.java b/...jvmbuild/cli/builds/BuildListCommand.java → ...at/hacbs/cli/builds/BuildListCommand.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.builds;
+package com.redhat.hacbs.cli.builds;
 
 import java.util.TreeMap;
 

diff --git a/...jvmbuild/cli/builds/BuildLogsCommand.java → ...at/hacbs/cli/builds/BuildLogsCommand.java b/...jvmbuild/cli/builds/BuildLogsCommand.java → ...at/hacbs/cli/builds/BuildLogsCommand.java
@@ -1,8 +1,11 @@
-package io.github.redhatappstudio.jvmbuild.cli.builds;
+package com.redhat.hacbs.cli.builds;
 
 import java.util.LinkedHashSet;
 import java.util.Map;
 
+import com.redhat.hacbs.cli.artifacts.ArtifactBuildCompleter;
+import com.redhat.hacbs.cli.artifacts.GavCompleter;
+import com.redhat.hacbs.cli.util.BuildConverter;
 import com.redhat.hacbs.common.tools.completer.BuildCompleter;
 import com.redhat.hacbs.common.tools.logging.LogExtractor;
 import com.redhat.hacbs.resources.model.v1alpha1.ArtifactBuild;
@@ -13,9 +16,6 @@
 import io.fabric8.openshift.api.model.RouteSpec;
 import io.fabric8.openshift.client.OpenShiftClient;
 import io.fabric8.tekton.pipeline.v1beta1.PipelineRun;
-import io.github.redhatappstudio.jvmbuild.cli.artifacts.ArtifactBuildCompleter;
-import io.github.redhatappstudio.jvmbuild.cli.artifacts.GavCompleter;
-import io.github.redhatappstudio.jvmbuild.cli.util.BuildConverter;
 import io.quarkus.arc.Arc;
 import picocli.CommandLine;
 

diff --git a/...build/cli/builds/BuildSummaryCommand.java → ...hacbs/cli/builds/BuildSummaryCommand.java b/...build/cli/builds/BuildSummaryCommand.java → ...hacbs/cli/builds/BuildSummaryCommand.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.builds;
+package com.redhat.hacbs.cli.builds;
 
 import java.util.HashMap;
 import java.util.Map;

diff --git a/...vmbuild/cli/rebuilt/RebuildCompleter.java → ...t/hacbs/cli/rebuilt/RebuildCompleter.java b/...vmbuild/cli/rebuilt/RebuildCompleter.java → ...t/hacbs/cli/rebuilt/RebuildCompleter.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.rebuilt;
+package com.redhat.hacbs.cli.rebuilt;
 
 import java.util.Map;
 import java.util.TreeMap;

diff --git a/.../jvmbuild/cli/rebuilt/RebuiltCommand.java → ...hat/hacbs/cli/rebuilt/RebuiltCommand.java b/.../jvmbuild/cli/rebuilt/RebuiltCommand.java → ...hat/hacbs/cli/rebuilt/RebuiltCommand.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.rebuilt;
+package com.redhat.hacbs.cli.rebuilt;
 
 import picocli.CommandLine;
 

diff --git a/...d/cli/rebuilt/RebuiltDownloadCommand.java → ...s/cli/rebuilt/RebuiltDownloadCommand.java b/...d/cli/rebuilt/RebuiltDownloadCommand.java → ...s/cli/rebuilt/RebuiltDownloadCommand.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.rebuilt;
+package com.redhat.hacbs.cli.rebuilt;
 
 import java.io.File;
 import java.io.IOException;
@@ -28,10 +28,10 @@
 import com.google.cloud.tools.jib.registry.ManifestAndDigest;
 import com.google.cloud.tools.jib.registry.RegistryClient;
 import com.google.cloud.tools.jib.registry.credentials.CredentialRetrievalException;
+import com.redhat.hacbs.cli.artifacts.GavCompleter;
 import com.redhat.hacbs.resources.model.v1alpha1.RebuiltArtifact;
 import com.redhat.hacbs.resources.model.v1alpha1.RebuiltArtifactSpec;
 
-import io.github.redhatappstudio.jvmbuild.cli.artifacts.GavCompleter;
 import io.quarkus.logging.Log;
 import picocli.CommandLine;
 

diff --git a/...build/cli/rebuilt/RebuiltListCommand.java → ...hacbs/cli/rebuilt/RebuiltListCommand.java b/...build/cli/rebuilt/RebuiltListCommand.java → ...hacbs/cli/rebuilt/RebuiltListCommand.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.rebuilt;
+package com.redhat.hacbs.cli.rebuilt;
 
 import java.util.Comparator;
 import java.util.Map;

diff --git a/...o/jvmbuild/cli/settings/SetupCommand.java → ...dhat/hacbs/cli/settings/SetupCommand.java b/...o/jvmbuild/cli/settings/SetupCommand.java → ...dhat/hacbs/cli/settings/SetupCommand.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.settings;
+package com.redhat.hacbs.cli.settings;
 
 import picocli.CommandLine;
 

diff --git a/...ld/cli/settings/SetupRebuildsCommand.java → ...bs/cli/settings/SetupRebuildsCommand.java b/...ld/cli/settings/SetupRebuildsCommand.java → ...bs/cli/settings/SetupRebuildsCommand.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.settings;
+package com.redhat.hacbs.cli.settings;
 
 import jakarta.inject.Inject;
 

diff --git a/...tings/SetupSharedRepositoriesCommand.java → ...tings/SetupSharedRepositoriesCommand.java b/...tings/SetupSharedRepositoriesCommand.java → ...tings/SetupSharedRepositoriesCommand.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.settings;
+package com.redhat.hacbs.cli.settings;
 
 import java.util.ArrayList;
 import java.util.Objects;

diff --git a/...dio/jvmbuild/cli/util/BuildConverter.java → ...redhat/hacbs/cli/util/BuildConverter.java b/...dio/jvmbuild/cli/util/BuildConverter.java → ...redhat/hacbs/cli/util/BuildConverter.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.util;
+package com.redhat.hacbs.cli.util;
 
 import java.util.Optional;
 

diff --git a/...o/jvmbuild/cli/DiagnosticCommandTest.java → ...dhat/hacbs/cli/DiagnosticCommandTest.java b/...o/jvmbuild/cli/DiagnosticCommandTest.java → ...dhat/hacbs/cli/DiagnosticCommandTest.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli;
+package com.redhat.hacbs.cli;
 
 import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemOut;
 import static org.junit.jupiter.api.Assertions.*;

diff --git a/...io/jvmbuild/cli/TestComponentManager.java → ...edhat/hacbs/cli/TestComponentManager.java b/...io/jvmbuild/cli/TestComponentManager.java → ...edhat/hacbs/cli/TestComponentManager.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli;
+package com.redhat.hacbs.cli;
 
 import java.time.OffsetDateTime;
 import java.util.Map;

diff --git a/...udio/jvmbuild/cli/WireMockExtensions.java → .../redhat/hacbs/cli/WireMockExtensions.java b/...udio/jvmbuild/cli/WireMockExtensions.java → .../redhat/hacbs/cli/WireMockExtensions.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli;
+package com.redhat.hacbs.cli;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
 import static com.github.tomakehurst.wiremock.client.WireMock.get;

diff --git a/...artifacts/ArtifactBuildCompleterTest.java → ...artifacts/ArtifactBuildCompleterTest.java b/...artifacts/ArtifactBuildCompleterTest.java → ...artifacts/ArtifactBuildCompleterTest.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.artifacts;
+package com.redhat.hacbs.cli.artifacts;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -7,11 +7,11 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.redhat.hacbs.cli.TestComponentManager;
 import com.redhat.hacbs.resources.model.v1alpha1.ArtifactBuild;
 import com.redhat.hacbs.resources.model.v1alpha1.ModelConstants;
 
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.github.redhatappstudio.jvmbuild.cli.TestComponentManager;
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest

diff --git a/...li/artifacts/ArtifactListCommandTest.java → ...li/artifacts/ArtifactListCommandTest.java b/...li/artifacts/ArtifactListCommandTest.java → ...li/artifacts/ArtifactListCommandTest.java
@@ -1,14 +1,14 @@
-package io.github.redhatappstudio.jvmbuild.cli.artifacts;
+package com.redhat.hacbs.cli.artifacts;
 
 import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemOut;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 
+import com.redhat.hacbs.cli.TestComponentManager;
 import com.redhat.hacbs.resources.model.v1alpha1.ModelConstants;
 
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.github.redhatappstudio.jvmbuild.cli.TestComponentManager;
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest

diff --git a/...mbuild/cli/builds/BuildCompleterTest.java → .../hacbs/cli/builds/BuildCompleterTest.java b/...mbuild/cli/builds/BuildCompleterTest.java → .../hacbs/cli/builds/BuildCompleterTest.java
@@ -1,16 +1,16 @@
-package io.github.redhatappstudio.jvmbuild.cli.builds;
+package com.redhat.hacbs.cli.builds;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 
+import com.redhat.hacbs.cli.TestComponentManager;
 import com.redhat.hacbs.common.tools.completer.BuildCompleter;
 import com.redhat.hacbs.resources.model.v1alpha1.ArtifactBuild;
 import com.redhat.hacbs.resources.model.v1alpha1.DependencyBuild;
 import com.redhat.hacbs.resources.model.v1alpha1.ModelConstants;
 
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.github.redhatappstudio.jvmbuild.cli.TestComponentManager;
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest

diff --git a/...uild/cli/builds/BuildListCommandTest.java → ...acbs/cli/builds/BuildListCommandTest.java b/...uild/cli/builds/BuildListCommandTest.java → ...acbs/cli/builds/BuildListCommandTest.java
@@ -1,16 +1,16 @@
-package io.github.redhatappstudio.jvmbuild.cli.builds;
+package com.redhat.hacbs.cli.builds;
 
 import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemOut;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.junit.jupiter.api.Test;
 
+import com.redhat.hacbs.cli.TestComponentManager;
 import com.redhat.hacbs.resources.model.v1alpha1.ArtifactBuild;
 import com.redhat.hacbs.resources.model.v1alpha1.DependencyBuild;
 import com.redhat.hacbs.resources.model.v1alpha1.ModelConstants;
 
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.github.redhatappstudio.jvmbuild.cli.TestComponentManager;
 import io.quarkus.test.junit.QuarkusTest;
 
 @QuarkusTest

diff --git a/...dio/jvmbuild/cli/builds/BuildLogTest.java → ...redhat/hacbs/cli/builds/BuildLogTest.java b/...dio/jvmbuild/cli/builds/BuildLogTest.java → ...redhat/hacbs/cli/builds/BuildLogTest.java
@@ -1,16 +1,18 @@
-package io.github.redhatappstudio.jvmbuild.cli.builds;
+package com.redhat.hacbs.cli.builds;
 
 import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemErrAndOut;
 import static com.github.stefanbirkner.systemlambda.SystemLambda.tapSystemOut;
-import static io.github.redhatappstudio.jvmbuild.cli.WireMockExtensions.LOG_UID;
-import static io.github.redhatappstudio.jvmbuild.cli.WireMockExtensions.RESULT_UID;
+import static com.redhat.hacbs.cli.WireMockExtensions.LOG_UID;
+import static com.redhat.hacbs.cli.WireMockExtensions.RESULT_UID;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Collections;
 
 import org.junit.jupiter.api.Test;
 
 import com.github.tomakehurst.wiremock.WireMockServer;
+import com.redhat.hacbs.cli.TestComponentManager;
+import com.redhat.hacbs.cli.WireMockExtensions;
 import com.redhat.hacbs.resources.model.v1alpha1.ArtifactBuild;
 import com.redhat.hacbs.resources.model.v1alpha1.DependencyBuild;
 import com.redhat.hacbs.resources.model.v1alpha1.ModelConstants;
@@ -24,8 +26,6 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.tekton.pipeline.v1beta1.PipelineRun;
 import io.fabric8.tekton.pipeline.v1beta1.TaskRun;
-import io.github.redhatappstudio.jvmbuild.cli.TestComponentManager;
-import io.github.redhatappstudio.jvmbuild.cli.WireMockExtensions;
 import io.quarkus.test.common.QuarkusTestResource;
 import io.quarkus.test.junit.QuarkusTest;
 

diff --git a/...i/rebuilt/RebuiltDownloadCommandTest.java → ...i/rebuilt/RebuiltDownloadCommandTest.java b/...i/rebuilt/RebuiltDownloadCommandTest.java → ...i/rebuilt/RebuiltDownloadCommandTest.java
@@ -1,4 +1,4 @@
-package io.github.redhatappstudio.jvmbuild.cli.rebuilt;
+package com.redhat.hacbs.cli.rebuilt;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;