From 65dcad48424fe63db9f5bd73a14efa1fb56f71ed Mon Sep 17 00:00:00 2001
From: Zachary Bischoff <116595361+bischoffz@users.noreply.github.com>
Date: Wed, 6 Dec 2023 03:24:19 -0500
Subject: [PATCH] Update proto paths in jar (#7)

* update proto paths in jar
---
 pom.xml                                                   | 4 ++--
 protobuf/pom.xml                                          | 8 +++++++-
 .../aspr/ms/taskit/protobuf => google/type}/date.proto    | 0
 .../protobuf/{ => testsupport}/testcomplexobject.proto    | 2 +-
 .../ms/taskit/protobuf/{ => testsupport}/testobject.proto | 4 ++--
 5 files changed, 12 insertions(+), 6 deletions(-)
 rename protobuf/src/main/proto/{gov/hhs/aspr/ms/taskit/protobuf => google/type}/date.proto (100%)
 rename protobuf/src/main/proto/gov/hhs/aspr/ms/taskit/protobuf/{ => testsupport}/testcomplexobject.proto (88%)
 rename protobuf/src/main/proto/gov/hhs/aspr/ms/taskit/protobuf/{ => testsupport}/testobject.proto (73%)

diff --git a/pom.xml b/pom.xml
index 3167464..be55dca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,8 +40,8 @@
 
     <!-- Properties -->
     <properties>
-        <!-- Revision -->
-        <revision>3.0.0</revision>
+        <!-- Version -->
+        <revision>3.1.0</revision>
 
         <!-- basic project properties -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/protobuf/pom.xml b/protobuf/pom.xml
index 4083343..56f9db7 100644
--- a/protobuf/pom.xml
+++ b/protobuf/pom.xml
@@ -52,6 +52,11 @@
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/proto</directory>
+            </resource>
+        </resources>
         <!-- 
             The plugins here are listed in order of execution to aid in understanding when they will run.
             Look up "maven lifecycle phases" and compare those to the phases in each execution for a more
@@ -88,7 +93,8 @@
                 </executions>
                 <configuration>
                     <protocArtifact>com.google.protobuf:protoc:${protoc.version}:exe:${os.detected.classifier}</protocArtifact>
-                    <protoSourceRoot>${basedir}/src/main/proto/gov/hhs/aspr/ms/taskit/protobuf</protoSourceRoot>
+                    <protoSourceRoot>${basedir}/src/main/proto</protoSourceRoot>
+                    <attachProtoSources>false</attachProtoSources>
                 </configuration>
             </plugin>
 
diff --git a/protobuf/src/main/proto/gov/hhs/aspr/ms/taskit/protobuf/date.proto b/protobuf/src/main/proto/google/type/date.proto
similarity index 100%
rename from protobuf/src/main/proto/gov/hhs/aspr/ms/taskit/protobuf/date.proto
rename to protobuf/src/main/proto/google/type/date.proto
diff --git a/protobuf/src/main/proto/gov/hhs/aspr/ms/taskit/protobuf/testcomplexobject.proto b/protobuf/src/main/proto/gov/hhs/aspr/ms/taskit/protobuf/testsupport/testcomplexobject.proto
similarity index 88%
rename from protobuf/src/main/proto/gov/hhs/aspr/ms/taskit/protobuf/testcomplexobject.proto
rename to protobuf/src/main/proto/gov/hhs/aspr/ms/taskit/protobuf/testsupport/testcomplexobject.proto
index ef64e0b..0addc8f 100644
--- a/protobuf/src/main/proto/gov/hhs/aspr/ms/taskit/protobuf/testcomplexobject.proto
+++ b/protobuf/src/main/proto/gov/hhs/aspr/ms/taskit/protobuf/testsupport/testcomplexobject.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package gov.hhs.aspr.ms.taskit.protobuf;
+package gov.hhs.aspr.ms.taskit.protobuf.testsupport;
 
 option java_multiple_files = true;
 option java_package = "gov.hhs.aspr.ms.taskit.protobuf.testsupport.testcomplexobject.input";
diff --git a/protobuf/src/main/proto/gov/hhs/aspr/ms/taskit/protobuf/testobject.proto b/protobuf/src/main/proto/gov/hhs/aspr/ms/taskit/protobuf/testsupport/testobject.proto
similarity index 73%
rename from protobuf/src/main/proto/gov/hhs/aspr/ms/taskit/protobuf/testobject.proto
rename to protobuf/src/main/proto/gov/hhs/aspr/ms/taskit/protobuf/testsupport/testobject.proto
index 4b3667d..ef69b4b 100644
--- a/protobuf/src/main/proto/gov/hhs/aspr/ms/taskit/protobuf/testobject.proto
+++ b/protobuf/src/main/proto/gov/hhs/aspr/ms/taskit/protobuf/testsupport/testobject.proto
@@ -1,10 +1,10 @@
 syntax = "proto3";
-package gov.hhs.aspr.ms.taskit.protobuf;
+package gov.hhs.aspr.ms.taskit.protobuf.testsupport;
 
 option java_multiple_files = true;
 option java_package = "gov.hhs.aspr.ms.taskit.protobuf.testsupport.testobject.input";
 
-import "testcomplexobject.proto";
+import "gov/hhs/aspr/ms/taskit/protobuf/testsupport/testcomplexobject.proto";
 
 enum TestInputEnum {
     TEST1 = 0;