Merge pull request #6 from NationalSecurityAgency/version-property-names

Standardize version property names

Author: ivakegg

api/pom.xml

@@ -19,8 +19,8 @@
     <properties>
         <datawave.webservice.namespace>http://webservice.datawave/v1</datawave.webservice.namespace>
         <version.datawave>7.3.0</version.datawave>
-        <version.microservice.base-rest-responses>4.0.0</version.microservice.base-rest-responses>
-        <version.microservice.starter-query>1.0.5</version.microservice.starter-query>
+        <version.datawave.base-rest-responses>4.0.0</version.datawave.base-rest-responses>
+        <version.datawave.starter-query>1.0.5</version.datawave.starter-query>
     </properties>
     <dependencyManagement>
         <dependencies>
@@ -42,7 +42,7 @@
             <dependency>
                 <groupId>gov.nsa.datawave.microservice</groupId>
                 <artifactId>base-rest-responses</artifactId>
-                <version>${version.microservice.base-rest-responses}</version>
+                <version>${version.datawave.base-rest-responses}</version>
                 <exclusions>
                     <exclusion>
                         <artifactId>slf4j-reload4j</artifactId>
@@ -53,7 +53,7 @@
             <dependency>
                 <groupId>gov.nsa.datawave.microservice</groupId>
                 <artifactId>spring-boot-starter-datawave-query</artifactId>
-                <version>${version.microservice.starter-query}</version>
+                <version>${version.datawave.starter-query}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

service/pom.xml

@@ -22,9 +22,9 @@
         <version.accumulo>2.1.1</version.accumulo>
         <version.curator>5.2.0</version.curator>
         <version.datawave>7.3.0</version.datawave>
+        <version.datawave.query-executor-api>1.0.7</version.datawave.query-executor-api>
+        <version.datawave.starter-query>1.0.8</version.datawave.starter-query>
         <version.in-memory-accumulo>4.0.0</version.in-memory-accumulo>
-        <version.microservice.query-executor-api>1.0.7</version.microservice.query-executor-api>
-        <version.microservice.starter-query>1.0.8</version.microservice.starter-query>
         <version.zookeeper>3.8.0</version.zookeeper>
     </properties>
     <dependencyManagement>
@@ -46,12 +46,12 @@
             <dependency>
                 <groupId>gov.nsa.datawave.microservice</groupId>
                 <artifactId>query-executor-api</artifactId>
-                <version>${version.microservice.query-executor-api}</version>
+                <version>${version.datawave.query-executor-api}</version>
             </dependency>
             <dependency>
                 <groupId>gov.nsa.datawave.microservice</groupId>
                 <artifactId>spring-boot-starter-datawave-query</artifactId>
-                <version>${version.microservice.starter-query}</version>
+                <version>${version.datawave.starter-query}</version>
             </dependency>
             <!-- Added to get the service working again -->
             <dependency>
@@ -102,7 +102,7 @@
             <dependency>
                 <groupId>gov.nsa.datawave.microservice</groupId>
                 <artifactId>spring-boot-starter-datawave-query</artifactId>
-                <version>${version.microservice.starter-query}</version>
+                <version>${version.datawave.starter-query}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -228,7 +228,7 @@
             <dependency>
                 <groupId>gov.nsa.datawave.microservice</groupId>
                 <artifactId>spring-boot-starter-datawave-query</artifactId>
-                <version>${version.microservice.starter-query}</version>
+                <version>${version.datawave.starter-query}</version>
                 <type>test-jar</type>
                 <scope>test</scope>
             </dependency>