Use correct slf4j impl in wildfly and services, update versions of type-utils, metadata-utils, common-utils, accumulo-utils, base-rest-responses in microservice starters, apis, services to track datawave version

Author: billoley

core/metrics-reporter/pom.xml

@@ -27,7 +27,7 @@
         <version.dropwizard-metrics>4.1.2</version.dropwizard-metrics>
         <version.httpclient>4.5.10</version.httpclient>
         <version.javastatsd>3.1.0</version.javastatsd>
-        <version.slf4j>2.0.12</version.slf4j>
+        <version.slf4j>2.0.17</version.slf4j>
     </properties>
     <dependencyManagement>
         <dependencies>

microservices/microservice-service-parent/pom.xml

@@ -19,12 +19,21 @@
     </scm>
     <properties>
         <resource.delimiter>@</resource.delimiter>
+        <version.slf4j>2.0.17</version.slf4j>
         <!-- delimiter that doesn't clash with Spring ${} placeholders -->
         <version.spring.boot>2.7.1</version.spring.boot>
         <version.spring.cloud>2021.0.3</version.spring.cloud>
     </properties>
     <dependencyManagement>
         <dependencies>
+            <!-- override the slf4j declarations in spring-boot-dependencies with our own version -->
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-bom</artifactId>
+                <version>${version.slf4j}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>

microservices/services/accumulo/api/pom.xml

@@ -19,16 +19,14 @@
     <properties>
         <datawave.webservice.namespace>http://webservice.datawave.nsa/v1</datawave.webservice.namespace>
         <version.accumulo>2.1.4-5792fed3-bulkv2</version.accumulo>
-        <version.datawave.accumulo-utils>4.0.1</version.datawave.accumulo-utils>
-        <version.datawave.base-rest-responses>4.0.1</version.datawave.base-rest-responses>
-        <version.datawave.type-utils>3.1.2</version.datawave.type-utils>
+        <version.datawave>7.33.1</version.datawave>
     </properties>
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>gov.nsa.datawave.core</groupId>
                 <artifactId>accumulo-utils</artifactId>
-                <version>${version.datawave.accumulo-utils}</version>
+                <version>${version.datawave}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>com.google.guava</groupId>
@@ -39,12 +37,12 @@
             <dependency>
                 <groupId>gov.nsa.datawave.core</groupId>
                 <artifactId>base-rest-responses</artifactId>
-                <version>${version.datawave.base-rest-responses}</version>
+                <version>${version.datawave}</version>
             </dependency>
             <dependency>
                 <groupId>gov.nsa.datawave.core</groupId>
                 <artifactId>type-utils</artifactId>
-                <version>${version.datawave.type-utils}</version>
+                <version>${version.datawave}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>org.apache.avro</groupId>

microservices/services/accumulo/service/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave.microservice</groupId>
         <artifactId>datawave-microservice-service-parent</artifactId>
-        <version>5.0.7</version>
+        <version>5.0.8-SNAPSHOT</version>
         <relativePath>../../../microservice-service-parent/pom.xml</relativePath>
     </parent>
     <artifactId>accumulo-service</artifactId>
@@ -21,8 +21,8 @@
         <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.5</version.datawave.starter-datawave>
+        <version.datawave.accumulo-api>4.0.1-SNAPSHOT</version.datawave.accumulo-api>
+        <version.datawave.starter>4.0.6-SNAPSHOT</version.datawave.starter>
         <version.datawave.starter-datawave-audit>4.0.2</version.datawave.starter-datawave-audit>
         <version.hadoop>3.3.4</version.hadoop>
         <version.zookeeper>3.8.3</version.zookeeper>
@@ -32,7 +32,7 @@
             <dependency>
                 <groupId>gov.nsa.datawave.microservice</groupId>
                 <artifactId>spring-boot-starter-datawave</artifactId>
-                <version>${version.datawave.starter-datawave}</version>
+                <version>${version.datawave.starter}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -171,7 +171,7 @@
         <dependency>
             <groupId>gov.nsa.datawave.microservice</groupId>
             <artifactId>spring-boot-starter-datawave</artifactId>
-            <version>${version.datawave.starter-datawave}</version>
+            <version>${version.datawave.starter}</version>
         </dependency>
         <dependency>
             <groupId>gov.nsa.datawave.microservice</groupId>

microservices/services/audit/service/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave.microservice</groupId>
         <artifactId>datawave-microservice-service-parent</artifactId>
-        <version>5.0.7</version>
+        <version>5.0.8-SNAPSHOT</version>
         <relativePath>../../../microservice-service-parent/pom.xml</relativePath>
     </parent>
     <artifactId>audit-service</artifactId>
@@ -20,8 +20,8 @@
     <properties>
         <version.commons>3.9</version.commons>
         <version.datawave.audit-api>4.0.1</version.datawave.audit-api>
-        <version.datawave.hazelcast-client>4.0.2</version.datawave.hazelcast-client>
-        <version.datawave.starter>4.0.5</version.datawave.starter>
+        <version.datawave.hazelcast-client>4.0.3-SNAPSHOT</version.datawave.hazelcast-client>
+        <version.datawave.starter>4.0.6-SNAPSHOT</version.datawave.starter>
         <version.hadoop>3.3.4</version.hadoop>
         <version.zookeeper>3.8.0</version.zookeeper>
     </properties>

microservices/services/authorization/api/pom.xml

@@ -23,7 +23,7 @@
         <version.jackson>2.10.1</version.jackson>
         <version.jaxb>2.3.3</version.jaxb>
         <version.jjwt>0.11.2</version.jjwt>
-        <version.slf4j>2.0.12</version.slf4j>
+        <version.slf4j>2.0.17</version.slf4j>
     </properties>
     <dependencyManagement>
         <dependencies>

microservices/services/authorization/service/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave.microservice</groupId>
         <artifactId>datawave-microservice-service-parent</artifactId>
-        <version>5.0.7</version>
+        <version>5.0.8-SNAPSHOT</version>
         <relativePath>../../../microservice-service-parent/pom.xml</relativePath>
     </parent>
     <artifactId>authorization-service</artifactId>
@@ -19,12 +19,10 @@
     </scm>
     <properties>
         <start-class>datawave.microservice.authorization.AuthorizationService</start-class>
-        <version.datawave.authorization-api>4.0.1</version.datawave.authorization-api>
-        <version.datawave.hazelcast-client>4.0.2</version.datawave.hazelcast-client>
-        <version.datawave.starter>4.0.5</version.datawave.starter>
+        <version.datawave.authorization-api>4.0.2-SNAPSHOT</version.datawave.authorization-api>
+        <version.datawave.hazelcast-client>4.0.3-SNAPSHOT</version.datawave.hazelcast-client>
+        <version.datawave.starter>4.0.6-SNAPSHOT</version.datawave.starter>
         <version.jaxb>2.3.3</version.jaxb>
-        <version.microservice.hazelcast-client>4.0.2</version.microservice.hazelcast-client>
-        <version.microservice.starter>4.0.3</version.microservice.starter>
         <version.zookeeper>3.8.0</version.zookeeper>
     </properties>
     <dependencyManagement>

microservices/services/config/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave.microservice</groupId>
         <artifactId>datawave-microservice-service-parent</artifactId>
-        <version>5.0.7</version>
+        <version>5.0.8-SNAPSHOT</version>
         <relativePath>../../microservice-service-parent/pom.xml</relativePath>
     </parent>
     <artifactId>config-service</artifactId>
@@ -25,7 +25,7 @@
     </scm>
     <properties>
         <start-class>datawave.microservice.config.server.ConfigServerApplication</start-class>
-        <version.datawave.starter>4.0.5</version.datawave.starter>
+        <version.datawave.starter>4.0.6-SNAPSHOT</version.datawave.starter>
     </properties>
     <dependencyManagement>
         <dependencies>

microservices/services/dictionary/api/pom.xml

@@ -18,8 +18,7 @@
     </scm>
     <properties>
         <datawave.webservice.namespace>http://webservice.datawave.nsa/v1</datawave.webservice.namespace>
-        <version.datawave.base-rest-responses>4.0.1</version.datawave.base-rest-responses>
-        <version.datawave.metadata-utils>4.0.16</version.datawave.metadata-utils>
+        <version.datawave>7.33.1</version.datawave>
         <version.guava>31.1-jre</version.guava>
     </properties>
     <dependencyManagement>
@@ -32,7 +31,7 @@
             <dependency>
                 <groupId>gov.nsa.datawave.core</groupId>
                 <artifactId>base-rest-responses</artifactId>
-                <version>${version.datawave.base-rest-responses}</version>
+                <version>${version.datawave}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>ch.qos.logback</groupId>
@@ -47,7 +46,7 @@
             <dependency>
                 <groupId>gov.nsa.datawave.core</groupId>
                 <artifactId>metadata-utils</artifactId>
-                <version>${version.datawave.metadata-utils}</version>
+                <version>${version.datawave}</version>
                 <exclusions>
                     <exclusion>
                         <groupId>log4j</groupId>

microservices/services/dictionary/service/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>gov.nsa.datawave.microservice</groupId>
         <artifactId>datawave-microservice-service-parent</artifactId>
-        <version>5.0.7</version>
+        <version>5.0.8-SNAPSHOT</version>
         <relativePath>../../../microservice-service-parent/pom.xml</relativePath>
     </parent>
     <artifactId>dictionary-service</artifactId>
@@ -26,9 +26,9 @@
         <start-class>datawave.microservice.dictionary.DictionaryService</start-class>
         <version.accumulo>2.1.4-5792fed3-bulkv2</version.accumulo>
         <version.curator>5.2.0</version.curator>
-        <version.datawave.dictionary-api>4.0.5</version.datawave.dictionary-api>
-        <version.datawave.starter>4.0.5</version.datawave.starter>
-        <version.datawave.starter-metadata>3.0.2</version.datawave.starter-metadata>
+        <version.datawave.dictionary-api>4.0.6-SNAPSHOT</version.datawave.dictionary-api>
+        <version.datawave.starter>4.0.6-SNAPSHOT</version.datawave.starter>
+        <version.datawave.starter-metadata>3.0.3-SNAPSHOT</version.datawave.starter-metadata>
         <version.in-memory-accumulo>4.0.4</version.in-memory-accumulo>
         <version.webjars.datatables>1.11.4</version.webjars.datatables>
         <version.webjars.jquery>3.6.0</version.webjars.jquery>