Skip to content

Commit 91857d9

Browse files
jacksondelametterjacksondelametter
authored
Merge pull request #427 from boozallen/426-drift-detection-jdk17
#426 - Cleaned up drift detection modules pom files and verifies it w…
2 parents d31f536 + df04230 commit 91857d9

File tree

4 files changed

+117
-66
lines changed
  • foundation/foundation-drift-detection
    • foundation-drift-detection-client-java
    • foundation-drift-detection-core-java
    • foundation-drift-detection-engine
    • foundation-drift-detection-service

4 files changed

+117
-66
lines changed

‎foundation/foundation-drift-detection/foundation-drift-detection-client-java/pom.xml‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,49 @@
3131
</dependency>
3232
<dependency>
3333
<groupId>io.quarkus</groupId>
34-
<artifactId>quarkus-rest-client</artifactId>
34+
<artifactId>quarkus-rest-client-jackson</artifactId>
3535
</dependency>
3636
<dependency>
37-
<groupId>io.quarkus</groupId>
38-
<artifactId>quarkus-rest-client-jackson</artifactId>
37+
<groupId>org.eclipse.microprofile.rest.client</groupId>
38+
<artifactId>microprofile-rest-client-api</artifactId>
39+
<version>3.0.1</version>
3940
</dependency>
4041
<dependency>
41-
<groupId>io.quarkus</groupId>
42-
<artifactId>quarkus-smallrye-fault-tolerance</artifactId>
42+
<groupId>jakarta.inject</groupId>
43+
<artifactId>jakarta.inject-api</artifactId>
44+
<version>${version.jakarta.inject}</version>
4345
</dependency>
4446
<dependency>
45-
<groupId>io.quarkus</groupId>
46-
<artifactId>quarkus-smallrye-metrics</artifactId>
47+
<groupId>jakarta.ws.rs</groupId>
48+
<artifactId>jakarta.ws.rs-api</artifactId>
49+
<version>${version.jakarta.wr.rs}</version>
50+
</dependency>
51+
<dependency>
52+
<groupId>jakarta.enterprise</groupId>
53+
<artifactId>jakarta.enterprise.cdi-api</artifactId>
54+
<version>${version.jakarta.cdi}</version>
4755
</dependency>
4856

4957
<!--Test Dependencies -->
58+
<dependency>
59+
<groupId>com.boozallen.aissemble</groupId>
60+
<artifactId>foundation-alerting</artifactId>
61+
<version>${project.version}</version>
62+
<scope>test</scope>
63+
</dependency>
5064
<dependency>
5165
<groupId>com.boozallen.aissemble</groupId>
5266
<artifactId>foundation-drift-detection-engine</artifactId>
5367
<type>test-jar</type>
5468
<version>${project.version}</version>
5569
<scope>test</scope>
5670
</dependency>
71+
<dependency>
72+
<groupId>org.junit.jupiter</groupId>
73+
<artifactId>junit-jupiter-api</artifactId>
74+
<version>5.10.1</version>
75+
<scope>test</scope>
76+
</dependency>
5777
<dependency>
5878
<groupId>com.boozallen.aissemble</groupId>
5979
<artifactId>foundation-drift-detection-service</artifactId>

‎foundation/foundation-drift-detection/foundation-drift-detection-core-java/pom.xml‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@
1717
<artifactId>jackson-annotations</artifactId>
1818
<version>${version.jackson}</version>
1919
</dependency>
20+
<dependency>
21+
<groupId>com.fasterxml.jackson.core</groupId>
22+
<artifactId>jackson-core</artifactId>
23+
<version>${version.jackson}</version>
24+
</dependency>
2025
<dependency>
2126
<groupId>com.fasterxml.jackson.core</groupId>
2227
<artifactId>jackson-databind</artifactId>
@@ -27,15 +32,6 @@
2732
<artifactId>commons-lang3</artifactId>
2833
</dependency>
2934

30-
<!-- Logging Dependencies (from aiops-parent pom) -->
31-
<dependency>
32-
<groupId>org.apache.logging.log4j</groupId>
33-
<artifactId>log4j-slf4j2-impl</artifactId>
34-
</dependency>
35-
<dependency>
36-
<groupId>org.apache.logging.log4j</groupId>
37-
<artifactId>log4j-core</artifactId>
38-
</dependency>
3935
<dependency>
4036
<groupId>com.boozallen.aissemble</groupId>
4137
<artifactId>foundation-alerting</artifactId>

‎foundation/foundation-drift-detection/foundation-drift-detection-engine/pom.xml‎

Lines changed: 46 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,41 @@
1717
<artifactId>foundation-drift-detection-core-java</artifactId>
1818
<version>${project.version}</version>
1919
</dependency>
20+
<dependency>
21+
<groupId>commons-io</groupId>
22+
<artifactId>commons-io</artifactId>
23+
<version>2.16.1</version>
24+
</dependency>
25+
<dependency>
26+
<groupId>com.fasterxml.jackson.core</groupId>
27+
<artifactId>jackson-databind</artifactId>
28+
<version>${version.jackson}</version>
29+
</dependency>
30+
<dependency>
31+
<groupId>jakarta.enterprise</groupId>
32+
<artifactId>jakarta.enterprise.cdi-api</artifactId>
33+
<version>${version.jakarta.cdi}</version>
34+
</dependency>
35+
<dependency>
36+
<groupId>com.fasterxml.jackson.core</groupId>
37+
<artifactId>jackson-annotations</artifactId>
38+
<version>${version.jackson}</version>
39+
</dependency>
40+
<dependency>
41+
<groupId>org.slf4j</groupId>
42+
<artifactId>slf4j-api</artifactId>
43+
<version>${version.slf4j}</version>
44+
</dependency>
2045
<dependency>
2146
<groupId>com.boozallen.aissemble</groupId>
22-
<artifactId>foundation-messaging-java</artifactId>
47+
<artifactId>foundation-core-java</artifactId>
2348
<version>${project.version}</version>
2449
</dependency>
50+
<dependency>
51+
<groupId>com.fasterxml.jackson.core</groupId>
52+
<artifactId>jackson-core</artifactId>
53+
<version>${version.jackson}</version>
54+
</dependency>
2555
<dependency>
2656
<groupId>com.boozallen.aissemble</groupId>
2757
<artifactId>foundation-alerting</artifactId>
@@ -31,17 +61,6 @@
3161
<groupId>org.technologybrewery.krausening</groupId>
3262
<artifactId>krausening</artifactId>
3363
</dependency>
34-
35-
<!-- Logging Dependencies (from aiops-parent pom) -->
36-
<dependency>
37-
<groupId>org.apache.logging.log4j</groupId>
38-
<artifactId>log4j-slf4j2-impl</artifactId>
39-
</dependency>
40-
<dependency>
41-
<groupId>org.apache.logging.log4j</groupId>
42-
<artifactId>log4j-core</artifactId>
43-
</dependency>
44-
4564
<dependency>
4665
<groupId>org.apache.commons</groupId>
4766
<artifactId>commons-collections4</artifactId>
@@ -57,25 +76,31 @@
5776

5877
<!-- Test Dependencies -->
5978
<dependency>
60-
<groupId>io.cucumber</groupId>
61-
<artifactId>cucumber-java</artifactId>
79+
<groupId>io.smallrye.reactive</groupId>
80+
<artifactId>smallrye-reactive-messaging-api</artifactId>
81+
<version>${version.smallrye.reactive.messaging}</version>
82+
<scope>test</scope>
83+
</dependency>
84+
<dependency>
85+
<groupId>org.jboss.weld.se</groupId>
86+
<artifactId>weld-se-core</artifactId>
87+
<version>${version.weld}</version>
6288
<scope>test</scope>
6389
</dependency>
6490
<dependency>
6591
<groupId>io.cucumber</groupId>
66-
<artifactId>cucumber-junit</artifactId>
92+
<artifactId>cucumber-java</artifactId>
6793
<scope>test</scope>
6894
</dependency>
6995
<dependency>
70-
<groupId>com.boozallen.aissemble</groupId>
71-
<artifactId>extensions-alerting-slack</artifactId>
72-
<version>${project.version}</version>
96+
<groupId>junit</groupId>
97+
<artifactId>junit</artifactId>
98+
<version>${version.junit}</version>
7399
<scope>test</scope>
74100
</dependency>
75101
<dependency>
76-
<groupId>net.masterthought</groupId>
77-
<artifactId>cucumber-reporting</artifactId>
78-
<version>${version.cucumber.reporting.plugin}</version>
102+
<groupId>io.cucumber</groupId>
103+
<artifactId>cucumber-junit</artifactId>
79104
<scope>test</scope>
80105
</dependency>
81106
</dependencies>

‎foundation/foundation-drift-detection/foundation-drift-detection-service/pom.xml‎

Lines changed: 39 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -34,44 +34,59 @@
3434
</dependency>
3535
<dependency>
3636
<groupId>io.quarkus</groupId>
37-
<artifactId>quarkus-smallrye-fault-tolerance</artifactId>
38-
<exclusions>
39-
<exclusion>
40-
<groupId>org.jboss.slf4j</groupId>
41-
<artifactId>slf4j-jboss-logmanager</artifactId>
42-
</exclusion>
43-
</exclusions>
37+
<artifactId>quarkus-smallrye-reactive-messaging</artifactId>
4438
</dependency>
4539
<dependency>
46-
<groupId>io.quarkus</groupId>
47-
<artifactId>quarkus-smallrye-metrics</artifactId>
40+
<groupId>${project.groupId}</groupId>
41+
<artifactId>foundation-drift-detection-core-java</artifactId>
42+
<version>${project.version}</version>
4843
</dependency>
4944
<dependency>
50-
<groupId>io.quarkus</groupId>
51-
<artifactId>quarkus-smallrye-health</artifactId>
45+
<groupId>com.fasterxml.jackson.core</groupId>
46+
<artifactId>jackson-core</artifactId>
47+
<version>${version.jackson}</version>
5248
</dependency>
53-
<!-- Must be included for Quarkus ArC to be able to properly process reactive
54-
messaging components. -->
5549
<dependency>
56-
<groupId>io.quarkus</groupId>
57-
<artifactId>quarkus-smallrye-reactive-messaging</artifactId>
50+
<groupId>com.fasterxml.jackson.core</groupId>
51+
<artifactId>jackson-databind</artifactId>
52+
<version>${version.jackson}</version>
5853
</dependency>
5954
<dependency>
60-
<groupId>org.technologybrewery.krausening</groupId>
61-
<artifactId>krausening</artifactId>
55+
<groupId>jakarta.ws.rs</groupId>
56+
<artifactId>jakarta.ws.rs-api</artifactId>
57+
<version>${version.jakarta.wr.rs}</version>
6258
</dependency>
6359

64-
<!-- Logging Dependencies (from aiops-parent pom) -->
60+
<!--Test Dependencies -->
61+
<dependency>
62+
<groupId>org.slf4j</groupId>
63+
<artifactId>slf4j-api</artifactId>
64+
<version>${version.slf4j}</version>
65+
<scope>test</scope>
66+
</dependency>
6567
<dependency>
66-
<groupId>org.apache.logging.log4j</groupId>
67-
<artifactId>log4j-slf4j2-impl</artifactId>
68+
<groupId>org.apache.commons</groupId>
69+
<artifactId>commons-lang3</artifactId>
70+
<scope>test</scope>
6871
</dependency>
6972
<dependency>
70-
<groupId>org.apache.logging.log4j</groupId>
71-
<artifactId>log4j-core</artifactId>
73+
<groupId>${project.groupId}</groupId>
74+
<artifactId>foundation-alerting</artifactId>
75+
<version>${project.version}</version>
76+
<scope>test</scope>
77+
</dependency>
78+
<dependency>
79+
<groupId>jakarta.inject</groupId>
80+
<artifactId>jakarta.inject-api</artifactId>
81+
<version>${version.jakarta.inject}</version>
82+
<scope>test</scope>
83+
</dependency>
84+
<dependency>
85+
<groupId>org.junit.jupiter</groupId>
86+
<artifactId>junit-jupiter-api</artifactId>
87+
<version>5.10.1</version>
88+
<scope>test</scope>
7289
</dependency>
73-
74-
<!--Test Dependencies -->
7590
<dependency>
7691
<groupId>com.boozallen.aissemble</groupId>
7792
<artifactId>foundation-drift-detection-engine</artifactId>
@@ -90,11 +105,6 @@
90105
</exclusions>
91106
<scope>test</scope>
92107
</dependency>
93-
<dependency>
94-
<groupId>io.rest-assured</groupId>
95-
<artifactId>rest-assured</artifactId>
96-
<scope>test</scope>
97-
</dependency>
98108
</dependencies>
99109
<build>
100110
<plugins>

0 commit comments

Comments
 (0)