Eliminate log4j from maven plugins

NationalSecurityAgency · Apr 2, 2024 · 001e52a · 001e52a
1 parent 53845ae
commit 001e52a
Show file tree

Hide file tree

Showing 22 changed files with 74 additions and 22 deletions.
diff --git a/core/base-rest-responses b/core/base-rest-responses
diff --git a/core/in-memory-accumulo b/core/in-memory-accumulo
diff --git a/core/metrics-reporter b/core/metrics-reporter
diff --git a/core/utils/accumulo-utils b/core/utils/accumulo-utils
diff --git a/core/utils/common-utils b/core/utils/common-utils
diff --git a/core/utils/metadata-utils b/core/utils/metadata-utils
diff --git a/core/utils/type-utils b/core/utils/type-utils
diff --git a/microservices/microservice-parent b/microservices/microservice-parent
diff --git a/microservices/microservice-service-parent b/microservices/microservice-service-parent
diff --git a/microservices/services/accumulo b/microservices/services/accumulo
diff --git a/microservices/services/audit b/microservices/services/audit
diff --git a/microservices/services/authorization b/microservices/services/authorization
diff --git a/microservices/services/config b/microservices/services/config
diff --git a/microservices/services/dictionary b/microservices/services/dictionary
diff --git a/microservices/services/hazelcast b/microservices/services/hazelcast
diff --git a/microservices/services/query-metric b/microservices/services/query-metric
diff --git a/microservices/starters/audit b/microservices/starters/audit
diff --git a/microservices/starters/cache b/microservices/starters/cache
diff --git a/microservices/starters/datawave b/microservices/starters/datawave
diff --git a/microservices/starters/metadata b/microservices/starters/metadata
diff --git a/microservices/starters/query-metric b/microservices/starters/query-metric
diff --git a/pom.xml b/pom.xml
@@ -103,7 +103,7 @@
         <version.microservice.metadata-utils>3.0.0</version.microservice.metadata-utils>
         <version.microservice.metrics-reporter>2.0.0</version.microservice.metrics-reporter>
         <version.microservice.query-metric-api>3.0.0</version.microservice.query-metric-api>
-        <version.microservice.type-utils>2.0.1</version.microservice.type-utils>
+        <version.microservice.type-utils>2.0.2</version.microservice.type-utils>
         <version.minlog>1.2</version.minlog>
         <version.mockito>2.23.0</version.mockito>
         <version.mysql-connector>8.0.28</version.mysql-connector>
@@ -1358,11 +1358,27 @@
                         <failOnViolation>false</failOnViolation>
                     </configuration>
                     <dependencies>
+                        <dependency>
+                            <groupId>ch.qos.reload4j</groupId>
+                            <artifactId>reload4j</artifactId>
+                            <version>1.2.22</version>
+                        </dependency>
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
                             <version>8.29</version>
                         </dependency>
+                        <dependency>
+                            <groupId>org.apache.maven.doxia</groupId>
+                            <artifactId>doxia-site-renderer</artifactId>
+                            <version>1.4</version>
+                            <exclusions>
+                                <exclusion>
+                                    <groupId>log4j</groupId>
+                                    <artifactId>log4j</artifactId>
+                                </exclusion>
+                            </exclusions>
+                        </dependency>
                     </dependencies>
                     <executions>
                         <execution>
@@ -1413,6 +1429,24 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
                     <version>3.1.1</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>ch.qos.reload4j</groupId>
+                            <artifactId>reload4j</artifactId>
+                            <version>1.2.22</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.maven.doxia</groupId>
+                            <artifactId>doxia-site-renderer</artifactId>
+                            <version>1.4</version>
+                            <exclusions>
+                                <exclusion>
+                                    <groupId>log4j</groupId>
+                                    <artifactId>log4j</artifactId>
+                                </exclusion>
+                            </exclusions>
+                        </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -1525,6 +1559,24 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>3.1.1</version>
+                    <dependencies>
+                        <dependency>
+                            <groupId>ch.qos.reload4j</groupId>
+                            <artifactId>reload4j</artifactId>
+                            <version>1.2.22</version>
+                        </dependency>
+                        <dependency>
+                            <groupId>org.apache.maven.doxia</groupId>
+                            <artifactId>doxia-site-renderer</artifactId>
+                            <version>1.7.4</version>
+                            <exclusions>
+                                <exclusion>
+                                    <groupId>log4j</groupId>
+                                    <artifactId>log4j</artifactId>
+                                </exclusion>
+                            </exclusions>
+                        </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
+3 −3		pom.xml
+4 −4		src/main/java/datawave/query/model/FieldMapping.java
+1 −1		src/main/java/datawave/query/model/QueryModel.java
+1 −1		src/main/java/datawave/query/util/MetadataHelper.java
+1 −1		client/pom.xml
+1 −1		common/pom.xml
+1 −1		pom.xml
+1 −1		service/pom.xml