Merge branch 'main' of https://github.com/HHS/ASPR-ms-taskit into dev

HHS · Dec 6, 2023 · 0986e96 · 0986e96
2 parents d50149d + 65dcad4
commit 0986e96
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git 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
@@ -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/...ov/hhs/aspr/ms/taskit/protobuf/date.proto → ...buf/src/main/proto/google/type/date.proto b/...ov/hhs/aspr/ms/taskit/protobuf/date.proto → ...buf/src/main/proto/google/type/date.proto
diff --git a/...s/taskit/protobuf/testcomplexobject.proto → ...tobuf/testsupport/testcomplexobject.proto b/...s/taskit/protobuf/testcomplexobject.proto → ...tobuf/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/.../aspr/ms/taskit/protobuf/testobject.proto → ...kit/protobuf/testsupport/testobject.proto b/.../aspr/ms/taskit/protobuf/testobject.proto → ...kit/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;