From f1066c4d7abdcfa33cc823ba16921d21cdc99c88 Mon Sep 17 00:00:00 2001
From: Sydney Munro <sydmunro@google.com>
Date: Thu, 17 Aug 2023 13:03:16 -0700
Subject: [PATCH] Moving CLI files back into ssb module

---
 google-cloud-storage/pom.xml                  |  6 -----
 pom.xml                                       |  2 +-
 {ssb => storage-shared-benchmarking}/pom.xml  | 24 ++++---------------
 .../benchmarking/CloudMonitoringResult.java   |  0
 .../StorageSharedBenchmarkingCli.java         |  0
 .../StorageSharedBenchmarkingUtils.java       |  0
 .../cloud/storage/benchmarking/Workload1.java |  0
 7 files changed, 6 insertions(+), 26 deletions(-)
 rename {ssb => storage-shared-benchmarking}/pom.xml (85%)
 rename {google-cloud-storage/src/test => storage-shared-benchmarking/src/main}/java/com/google/cloud/storage/benchmarking/CloudMonitoringResult.java (100%)
 rename {google-cloud-storage/src/test => storage-shared-benchmarking/src/main}/java/com/google/cloud/storage/benchmarking/StorageSharedBenchmarkingCli.java (100%)
 rename {google-cloud-storage/src/test => storage-shared-benchmarking/src/main}/java/com/google/cloud/storage/benchmarking/StorageSharedBenchmarkingUtils.java (100%)
 rename {google-cloud-storage/src/test => storage-shared-benchmarking/src/main}/java/com/google/cloud/storage/benchmarking/Workload1.java (100%)

diff --git a/google-cloud-storage/pom.xml b/google-cloud-storage/pom.xml
index 1e1bfa2868..3a3c9010af 100644
--- a/google-cloud-storage/pom.xml
+++ b/google-cloud-storage/pom.xml
@@ -251,12 +251,6 @@
       <version>1.7.4</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>info.picocli</groupId>
-      <artifactId>picocli</artifactId>
-      <version>4.7.0</version>
-      <scope>test</scope>
-    </dependency>
 
   </dependencies>
 
diff --git a/pom.xml b/pom.xml
index 48f17b3271..29b1fe580b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,7 +199,7 @@
     <module>proto-google-cloud-storage-v2</module>
     <module>gapic-google-cloud-storage-v2</module>
     <module>google-cloud-storage-bom</module>
-    <module>ssb</module>
+    <module>storage-shared-benchmarking</module>
   </modules>
 
   <profiles>
diff --git a/ssb/pom.xml b/storage-shared-benchmarking/pom.xml
similarity index 85%
rename from ssb/pom.xml
rename to storage-shared-benchmarking/pom.xml
index 6dd1fae472..f8b20c8dcc 100644
--- a/ssb/pom.xml
+++ b/storage-shared-benchmarking/pom.xml
@@ -3,14 +3,14 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
+  <groupId>com.google.cloud</groupId>
+  <packaging>jar</packaging>
   <artifactId>storage-shared-benchmarking</artifactId>
   <version>0.0.1-SNAPSHOT</version><!-- This artifact should not be released -->
-
   <parent>
-    <groupId>com.google.cloud.samples</groupId>
-    <artifactId>shared-configuration</artifactId>
-    <version>1.2.0</version>
-    <relativePath/>
+    <groupId>com.google.cloud</groupId>
+    <artifactId>google-cloud-storage-parent</artifactId>
+    <version>2.26.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-storage:current} -->
   </parent>
 
   <properties>
@@ -86,20 +86,6 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <version>3.6.0</version>
-        <executions>
-          <execution>
-            <id>copy-dependencies</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-dependencies</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>
-                ${project.build.directory}/dependency-jars/
-              </outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
       </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/benchmarking/CloudMonitoringResult.java b/storage-shared-benchmarking/src/main/java/com/google/cloud/storage/benchmarking/CloudMonitoringResult.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/benchmarking/CloudMonitoringResult.java
rename to storage-shared-benchmarking/src/main/java/com/google/cloud/storage/benchmarking/CloudMonitoringResult.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/benchmarking/StorageSharedBenchmarkingCli.java b/storage-shared-benchmarking/src/main/java/com/google/cloud/storage/benchmarking/StorageSharedBenchmarkingCli.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/benchmarking/StorageSharedBenchmarkingCli.java
rename to storage-shared-benchmarking/src/main/java/com/google/cloud/storage/benchmarking/StorageSharedBenchmarkingCli.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/benchmarking/StorageSharedBenchmarkingUtils.java b/storage-shared-benchmarking/src/main/java/com/google/cloud/storage/benchmarking/StorageSharedBenchmarkingUtils.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/benchmarking/StorageSharedBenchmarkingUtils.java
rename to storage-shared-benchmarking/src/main/java/com/google/cloud/storage/benchmarking/StorageSharedBenchmarkingUtils.java
diff --git a/google-cloud-storage/src/test/java/com/google/cloud/storage/benchmarking/Workload1.java b/storage-shared-benchmarking/src/main/java/com/google/cloud/storage/benchmarking/Workload1.java
similarity index 100%
rename from google-cloud-storage/src/test/java/com/google/cloud/storage/benchmarking/Workload1.java
rename to storage-shared-benchmarking/src/main/java/com/google/cloud/storage/benchmarking/Workload1.java