Skip to content

Commit 240c572

Browse files
billoleyFineAndDandy
billoley
authored and
FineAndDandy
committed
Use correct slf4j impl in wildfly and services, update versions of type-utils, metadata-utils, common-utils, accumulo-utils, base-rest-responses (#3382)
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 The use of these dependencies under microservices (starters, services, api) should track the datawave version instead of the version number from when they were in separate repositories Because the prior versions used a different groupId, we have the case where multiple versions of the same artifact are being included in some microservices. For instance, this caused a serialization conflict once the serializationId in BaseType (type-utils) changed in datawave version 7.30.0. When both versions are present on both sides of a serialization, whether a serialization exception occurs is indeterminate. gov.nsa.datawave.core:accumulo-utils gov.nsa.datawave.core:type-utils gov.nsa.datawave.core:metadata-utils gov.nsa.datawave.core:common-utils gov.nsa.datawave.core:base-rest-responses After this PR is merged, the following should be done to make the starters, apis, modules, and services depend on released version of each other. Release datawave-microservice-service-parent:5.0.8 In all modules with parent datawave-microservice-service-parent, update to datawave-microservice-service-parent:5.0.8 Release authorization-api:4.0.2 In starter-datawave update to authorization-api:4.0.2 Release starter-datawave:4.0.6 Release query-metric-api:4.1.3 Release query-api:1.0.1 Release accumulo-api:4.0.1 Release modification-api:1.0.1 Release dictionary-api:4.0.6 In hazelcast-common update to starter-datawave:4.0.6 Release hazelcast-common:4.0.3 In hazelcast-client update to hazelcast-common:4.0.3 In starter-audit update to starter-datawave:4.0.6, authorization-api:4.0.2 In starter-metadata update to starter-datawave:4.0.6 In starter-query-metric update to starter-datawave:4.0.6, query-metric-api:4.1.3, authorization-api:4.0.2 Release hazelcast-client:4.0.3 Release starter-audit:4.0.4 Release starter-metadata:3.0.3 Release starter-query-metric:3.0.4 In starter-query update to starter-datawave:4.0.6, query-api:1.0.1, hazelcast-client:4.0.3, starter-metadata:3.0.3, starter-query-metric:3.0.4 Release starter-query:1.0.9 In starter-cached-query update to starter-datawave:4.0.6, hazelcast-client:4.0.3, starter-audit:4.0.4, starter-query:1.0.9 Release starter-cached-query:1.0.11 In mapreduce-query-core-job update to starter-query:1.0.9 Release mapreduce-query-core-job:1.0.5 In query-executor-api update to starter-datawave:4.0.6, starter-query:1.0.9 Release query-executor-api:1.0.8 In accumulo-service update to starter-datawave:4.0.6, accumulo-api:4.0.1 In audit-service update to starter-datawave:4.0.6, hazelcast-client:4.0.3 In authorization-service update to starter-datawave:4.0.6, hazelcast-client:4.0.3, authorization-api:4.0.2 In config-service update to starter-datawave:4.0.6 In dictionary-service update to starter-datawave:4.0.6, dictionary-api:4.0.6, starter-metadata:3.0.3 In file-provider-service update to starter-datawave:4.0.6 In hazelcast-service update to hazelcast-common:4.0.3 In mapreduce-query-service update to mapreduce-query-core-job:1.0.5, starter-query:1.0.9 In modification-service update to starter-metadata:3.0.3, query-api:1.0.1, modification-api:1.0.1 In query-service update to starter-datawave:4.0.6, query-api:1.0.1, starter-cached-results:1.0.11, starter-query:1.0.9 In query-executor-service update to starter-query:1.0.9, query-executor-api:1.0.8 In query-metric-service update to starter-datawave:4.0.6, starter-metadata:3.0.3, hazelcast-common:4.0.3 Release accumulo-service:4.0.3 Release audit-service:4.0.3 Release authorization-service:4.0.5 Release config-service:4.0.2 Release dictionary-service:4.0.10 Release file-provider-service:1.0.1 Release hazelcast-service:4.0.3 Release mapreduce-query-service:1.0.5 Release modification-service:1.0.3 Release query-service:1.0.12 Release query-executor-service:1.0.10 Release query-metric-service:4.1.9
1 parent e992895 commit 240c572

106 files changed

Lines changed: 4279 additions & 1279 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎core/base-rest-responses/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<name>${project.artifactId}</name>
1111
<properties>
1212
<datawave.webservice.namespace>http://webservice.datawave.nsa/v1</datawave.webservice.namespace>
13-
<version.commons-lang3>3.12.0</version.commons-lang3>
13+
<version.commons-lang3>3.20.0</version.commons-lang3>
1414
</properties>
1515
<dependencyManagement>
1616
<dependencies>

‎core/common-util/src/main/java/datawave/core/common/logging/ThreadConfigurableLogger.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class ThreadConfigurableLogger extends Logger {
1313
private final Logger log;
1414
private static ThreadLocal<Map<String,Level>> logToLevelMap = ThreadLocal.withInitial(HashMap::new);
1515

16-
public static Logger getLogger(final Class<?> clazz) {
16+
public static Logger getLogger(final Class clazz) {
1717
return new ThreadConfigurableLogger(Logger.getLogger(clazz));
1818
}
1919

‎core/in-memory-accumulo/pom.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,16 @@
3434
<version.accumulo>2.1.4-5792fed3-bulkv2</version.accumulo>
3535
<version.hadoop>3.3.4</version.hadoop>
3636
<version.junit5>5.12.0</version.junit5>
37-
<version.log4j.bom>2.17.2</version.log4j.bom>
37+
<version.log4j>2.25.3</version.log4j>
3838
<version.mockito>2.28.2</version.mockito>
3939
</properties>
4040
<dependencyManagement>
4141
<dependencies>
42+
<?SORTPOM IGNORE?>
4243
<dependency>
4344
<groupId>org.apache.logging.log4j</groupId>
4445
<artifactId>log4j-bom</artifactId>
45-
<version>${version.log4j.bom}</version>
46+
<version>${version.log4j}</version>
4647
<type>pom</type>
4748
<scope>import</scope>
4849
</dependency>
@@ -53,6 +54,7 @@
5354
<type>pom</type>
5455
<scope>import</scope>
5556
</dependency>
57+
<?SORTPOM RESUME?>
5658
<dependency>
5759
<groupId>commons-collections</groupId>
5860
<artifactId>commons-collections</artifactId>

‎core/metrics-reporter/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
<url>https://github.com/NationalSecurityAgency/datawave</url>
2424
</scm>
2525
<properties>
26-
<version.commons-io>2.6</version.commons-io>
26+
<version.commons-io>2.18.0</version.commons-io>
2727
<version.dropwizard-metrics>4.1.2</version.dropwizard-metrics>
2828
<version.httpclient>4.5.10</version.httpclient>
2929
<version.javastatsd>3.1.0</version.javastatsd>
30-
<version.slf4j>2.0.12</version.slf4j>
30+
<version.slf4j>2.0.17</version.slf4j>
3131
</properties>
3232
<dependencyManagement>
3333
<dependencies>

‎core/utils/type-utils/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<properties>
1212
<datawave.webservice.namespace>http://webservice.datawave.nsa/v1</datawave.webservice.namespace>
1313
<spotbugs.excludes.file>${project.basedir}/src/main/spotbugs/excludes.xml</spotbugs.excludes.file>
14-
<version.commons-lang3>3.12.0</version.commons-lang3>
14+
<version.commons-lang3>3.20.0</version.commons-lang3>
1515
<version.commons-net>3.6</version.commons-net>
1616
</properties>
1717
<dependencyManagement>

‎docker/config/application-query.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,7 @@ datawave:
475475
fieldName: 'EVENT_ID'
476476
queryLogics:
477477
'default': 'LuceneUUIDEventQuery'
478-
allowedWildcardAfter: 28
478+
allowWildcardAfter: 28
479479
'UUID':
480480
fieldName: 'UUID'
481481
queryLogics:

‎microservices/configcheck/pom.xml‎

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,35 @@
2323
<skipUTs>${skipTests}</skipUTs>
2424
<spotbugs.excludes.file />
2525
<surefire.forkCount>1C</surefire.forkCount>
26-
<version.jackson>2.13.2</version.jackson>
26+
<version.jackson>2.13.5</version.jackson>
2727
<version.junit5>5.12.0</version.junit5>
2828
<version.junit5.platform>1.12.0</version.junit5.platform>
29-
<version.log4j.bom>2.19.0</version.log4j.bom>
29+
<version.log4j>2.25.3</version.log4j>
30+
<version.slf4j>2.0.17</version.slf4j>
3031
<version.spring.boot>2.7.1</version.spring.boot>
3132
</properties>
3233
<dependencyManagement>
3334
<dependencies>
35+
<!-- Don't sort the import scope dependencies. The first declared version of a dependency in dependencyManagement will prevail. -->
36+
<?SORTPOM IGNORE?>
3437
<dependency>
3538
<groupId>com.fasterxml.jackson</groupId>
3639
<artifactId>jackson-bom</artifactId>
3740
<version>${version.jackson}</version>
3841
<type>pom</type>
3942
<scope>import</scope>
4043
</dependency>
44+
<dependency>
45+
<groupId>org.slf4j</groupId>
46+
<artifactId>slf4j-bom</artifactId>
47+
<version>${version.slf4j}</version>
48+
<type>pom</type>
49+
<scope>import</scope>
50+
</dependency>
4151
<dependency>
4252
<groupId>org.apache.logging.log4j</groupId>
4353
<artifactId>log4j-bom</artifactId>
44-
<version>${version.log4j.bom}</version>
54+
<version>${version.log4j}</version>
4555
<type>pom</type>
4656
<scope>import</scope>
4757
</dependency>
@@ -52,6 +62,7 @@
5262
<type>pom</type>
5363
<scope>import</scope>
5464
</dependency>
65+
<?SORTPOM RESUME?>
5566
<dependency>
5667
<groupId>org.springframework.boot</groupId>
5768
<artifactId>spring-boot-starter</artifactId>
@@ -122,6 +133,14 @@
122133
<groupId>com.fasterxml.jackson.dataformat</groupId>
123134
<artifactId>jackson-dataformat-yaml</artifactId>
124135
</dependency>
136+
<dependency>
137+
<groupId>org.apache.logging.log4j</groupId>
138+
<artifactId>log4j-slf4j2-impl</artifactId>
139+
</dependency>
140+
<dependency>
141+
<groupId>org.slf4j</groupId>
142+
<artifactId>slf4j-api</artifactId>
143+
</dependency>
125144
<dependency>
126145
<groupId>org.springframework.boot</groupId>
127146
<artifactId>spring-boot-starter</artifactId>
@@ -130,6 +149,10 @@
130149
<groupId>commons-logging</groupId>
131150
<artifactId>commons-logging</artifactId>
132151
</exclusion>
152+
<exclusion>
153+
<groupId>org.apache.logging.log4j</groupId>
154+
<artifactId>log4j-slf4j-impl</artifactId>
155+
</exclusion>
133156
<exclusion>
134157
<groupId>org.springframework.boot</groupId>
135158
<artifactId>spring-boot-starter-logging</artifactId>
@@ -139,6 +162,12 @@
139162
<dependency>
140163
<groupId>org.springframework.boot</groupId>
141164
<artifactId>spring-boot-starter-log4j2</artifactId>
165+
<exclusions>
166+
<exclusion>
167+
<groupId>org.apache.logging.log4j</groupId>
168+
<artifactId>log4j-slf4j-impl</artifactId>
169+
</exclusion>
170+
</exclusions>
142171
</dependency>
143172
<dependency>
144173
<groupId>org.junit.jupiter</groupId>
@@ -339,7 +368,7 @@
339368
<threadCountClasses>1</threadCountClasses>
340369
<threadCountMethods>0</threadCountMethods>
341370
<threadCountSuites>0</threadCountSuites>
342-
<argLine>@{argLine} -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Dfile.encoding=UTF8 -Duser.timezone=GMT -Xmx1024m -Dapple.awt.UIElement=true -Djava.security.krb5.realm= -Djava.security.krb5.kdc=</argLine>
371+
<argLine>-XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Dfile.encoding=UTF8 -Duser.timezone=GMT -Xmx1024m -Dapple.awt.UIElement=true -Djava.security.krb5.realm= -Djava.security.krb5.kdc=</argLine>
343372
<redirectTestOutputToFile>true</redirectTestOutputToFile>
344373
<runOrder>random</runOrder>
345374
</configuration>

‎microservices/configcheck/src/test/resources/input/microservice/yaml/application-query.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ datawave:
427427
'EVENT_ID':
428428
fieldName: 'EVENT_ID'
429429
queryLogic: 'LuceneUUIDEventQuery'
430-
allowedWildcardAfter: 28
430+
allowWildcardAfter: 28
431431
'UUID':
432432
fieldName: 'UUID'
433433
queryLogic: 'LuceneUUIDEventQuery'

‎microservices/configcheck/src/test/resources/rendered/fullComparison.diff‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,10 +1244,12 @@ doc.beans.BaseEventQuery.filterClassNames: baseEventQueryFilterClassNames
12441244
doc.beans.BaseEventQuery.filterOptions: baseEventQueryFilterOptions
12451245
doc.beans.BaseEventQuery.hierarchyFieldOptions: baseEventQueryHierarchyFieldOptions
12461246
doc.beans.BaseEventQuery.ivaratorCacheDirConfigs: baseEventQueryIvaratorCacheDirConfigs
1247+
doc.beans.BaseEventQuery.localIvaratorCacheDirConfigs: baseEventQueryLocalIvaratorCacheDirConfigs
12471248
=======
12481249
doc.beans.BaseEventQuery.filterOptions: BaseEventQueryFilterOptions
12491250
doc.beans.BaseEventQuery.hierarchyFieldOptions: BaseEventQueryHierarchyFieldOptions
12501251
doc.beans.BaseEventQuery.ivaratorCacheDirConfigs: IvaratorCacheDirConfigs
1252+
doc.beans.BaseEventQuery.localIvaratorCacheDirConfigs: LocalIvaratorCacheDirConfigs
12511253
>>>>>>> SECOND
12521254
doc.beans.BaseEventQuery.metadataHelperFactory: metadataHelperFactory
12531255
doc.beans.BaseEventQuery.queryPlanner: DefaultQueryPlanner

‎microservices/configcheck/src/test/resources/rendered/microservice/fullReport.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,7 @@ doc.beans.BaseEventQuery.filterClassNames: baseEventQueryFilterClassNames
454454
doc.beans.BaseEventQuery.filterOptions: baseEventQueryFilterOptions
455455
doc.beans.BaseEventQuery.hierarchyFieldOptions: baseEventQueryHierarchyFieldOptions
456456
doc.beans.BaseEventQuery.ivaratorCacheDirConfigs: baseEventQueryIvaratorCacheDirConfigs
457+
doc.beans.BaseEventQuery.localIvaratorCacheDirConfigs: baseEventQueryLocalIvaratorCacheDirConfigs
457458
doc.beans.BaseEventQuery.metadataHelperFactory: metadataHelperFactory
458459
doc.beans.BaseEventQuery.queryPlanner: DefaultQueryPlanner
459460
doc.beans.BaseEventQuery.querySyntaxParsers: baseEventQuerySyntaxParsers

0 commit comments

Comments
 (0)