Merge pull request #17 from NationalSecurityAgency/version-property-n…

…ames Standardize version property names
NationalSecurityAgency · Nov 6, 2024 · 7ecb4dd · 7ecb4dd
2 parents 1ed0c60 + eedc0f2
commit 7ecb4dd
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -19,16 +19,16 @@
     <properties>
         <datawave.webservice.namespace>http://webservice.datawave.nsa/v1</datawave.webservice.namespace>
         <version.accumulo>2.1.1</version.accumulo>
-        <version.base-rest-responses>4.0.0</version.base-rest-responses>
-        <version.microservice.accumulo-utils>4.0.0</version.microservice.accumulo-utils>
-        <version.microservice.type-utils>3.0.0</version.microservice.type-utils>
+        <version.datawave.accumulo-utils>4.0.0</version.datawave.accumulo-utils>
+        <version.datawave.base-rest-responses>4.0.0</version.datawave.base-rest-responses>
+        <version.datawave.type-utils>3.0.0</version.datawave.type-utils>
     </properties>
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>gov.nsa.datawave.microservice</groupId>
                 <artifactId>accumulo-utils</artifactId>
-                <version>${version.microservice.accumulo-utils}</version>
+                <version>${version.datawave.accumulo-utils}</version>
                 <exclusions>
                     <exclusion>
                         <artifactId>guava</artifactId>
@@ -39,12 +39,12 @@
             <dependency>
                 <groupId>gov.nsa.datawave.microservice</groupId>
                 <artifactId>base-rest-responses</artifactId>
-                <version>${version.base-rest-responses}</version>
+                <version>${version.datawave.base-rest-responses}</version>
             </dependency>
             <dependency>
                 <groupId>gov.nsa.datawave.microservice</groupId>
                 <artifactId>type-utils</artifactId>
-                <version>${version.microservice.type-utils}</version>
+                <version>${version.datawave.type-utils}</version>
                 <exclusions>
                     <exclusion>
                         <artifactId>avro</artifactId>

diff --git a/service/pom.xml b/service/pom.xml
@@ -21,18 +21,18 @@
         <start-class>datawave.microservice.accumulo.AccumuloService</start-class>
         <version.curator>5.2.0</version.curator>
         <version.curator.test>5.2.0</version.curator.test>
+        <version.datawave.accumulo-api>4.0.0</version.datawave.accumulo-api>
+        <version.datawave.starter-datawave>4.0.2</version.datawave.starter-datawave>
+        <version.datawave.starter-datawave-audit>4.0.2</version.datawave.starter-datawave-audit>
         <version.hadoop>3.3.4</version.hadoop>
-        <version.microservice.accumulo-api>4.0.0</version.microservice.accumulo-api>
-        <version.microservice.starter-datawave>4.0.2</version.microservice.starter-datawave>
-        <version.microservice.starter-datawave-audit>4.0.2</version.microservice.starter-datawave-audit>
         <version.zookeeper>3.8.3</version.zookeeper>
     </properties>
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>gov.nsa.datawave.microservice</groupId>
                 <artifactId>accumulo-api</artifactId>
-                <version>${version.microservice.accumulo-api}</version>
+                <version>${version.datawave.accumulo-api}</version>
                 <exclusions>
                     <exclusion>
                         <artifactId>*</artifactId>
@@ -51,7 +51,7 @@
             <dependency>
                 <groupId>gov.nsa.datawave.microservice</groupId>
                 <artifactId>spring-boot-starter-datawave-audit</artifactId>
-                <version>${version.microservice.starter-datawave-audit}</version>
+                <version>${version.datawave.starter-datawave-audit}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.curator</groupId>
@@ -126,7 +126,7 @@
             <dependency>
                 <groupId>gov.nsa.datawave.microservice</groupId>
                 <artifactId>spring-boot-starter-datawave</artifactId>
-                <version>${version.microservice.starter-datawave}</version>
+                <version>${version.datawave.starter-datawave}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -167,7 +167,7 @@
         <dependency>
             <groupId>gov.nsa.datawave.microservice</groupId>
             <artifactId>spring-boot-starter-datawave</artifactId>
-            <version>${version.microservice.starter-datawave}</version>
+            <version>${version.datawave.starter-datawave}</version>
         </dependency>
         <dependency>
             <groupId>gov.nsa.datawave.microservice</groupId>