Skip to content

Commit 0d5d3c7

Browse files
VihasMakwanaVihasMakwana
authored
Merge pull request #384 from bparmar-splunk/develop
fix: Updated dependencies to clear vulnerabilities
2 parents 6cc9a3c + 3b4a41b commit 0d5d3c7

File tree

2 files changed

+39
-48
lines changed

2 files changed

+39
-48
lines changed

‎pom.xml‎

Lines changed: 25 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,12 @@
1515
<maven.compiler.target>1.8</maven.compiler.target>
1616
<java.version>1.8</java.version>
1717
<junit.version>4.13.2</junit.version>
18-
<junit.jupiter.version>5.3.2</junit.jupiter.version>
19-
<junit.vintage.version>5.3.2</junit.vintage.version>
20-
<junit.platform.version>1.3.2</junit.platform.version>
18+
<junit.jupiter.version>5.9.2</junit.jupiter.version>
19+
<junit.vintage.version>5.9.2</junit.vintage.version>
20+
<junit.platform.version>1.9.2</junit.platform.version>
21+
<jackson.version>2.14.2</jackson.version>
22+
<kafka.version>3.4.0</kafka.version>
23+
<slf4j.version>2.0.7</slf4j.version>
2124
</properties>
2225

2326
<dependencies>
@@ -26,20 +29,20 @@
2629
<dependency>
2730
<groupId>com.fasterxml.jackson.core</groupId>
2831
<artifactId>jackson-core</artifactId>
29-
<version>2.12.6</version>
32+
<version>${jackson.version}</version>
3033
<scope>compile</scope>
3134
</dependency>
3235
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
3336
<dependency>
3437
<groupId>com.fasterxml.jackson.core</groupId>
3538
<artifactId>jackson-databind</artifactId>
36-
<version>2.12.7.1</version>
39+
<version>${jackson.version}</version>
3740
<scope>compile</scope>
3841
</dependency>
3942
<dependency>
4043
<groupId>org.apache.kafka</groupId>
4144
<artifactId>connect-api</artifactId>
42-
<version>2.8.1</version>
45+
<version>${kafka.version}</version>
4346
<scope>compile</scope>
4447
</dependency>
4548
<dependency>
@@ -79,7 +82,7 @@
7982
<dependency>
8083
<groupId>org.apache.httpcomponents</groupId>
8184
<artifactId>httpclient</artifactId>
82-
<version>4.5.13</version>
85+
<version>4.5.14</version>
8386
<exclusions>
8487
<exclusion>
8588
<groupId>commons-logging</groupId>
@@ -108,74 +111,62 @@
108111
<dependency>
109112
<groupId>commons-codec</groupId>
110113
<artifactId>commons-codec</artifactId>
111-
<version>1.14</version>
114+
<version>1.15</version>
112115
<scope>compile</scope>
113116
</dependency>
114117

115118
<dependency>
116119
<groupId>org.apache.logging.log4j</groupId>
117120
<artifactId>log4j-core</artifactId>
118-
<version>2.17.2</version>
121+
<version>2.20.0</version>
119122
<scope>compile</scope>
120123
</dependency>
121124

122125
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-simple -->
123126
<dependency>
124127
<groupId>org.slf4j</groupId>
125128
<artifactId>slf4j-simple</artifactId>
126-
<version>1.7.26</version>
129+
<version>${slf4j.version}</version>
127130
<scope>test</scope>
128131
</dependency>
129132
<!-- https://mvnrepository.com/artifact/org.slf4j/slf4j-api -->
130133
<dependency>
131134
<groupId>org.slf4j</groupId>
132135
<artifactId>slf4j-api</artifactId>
133-
<version>1.7.26</version>
136+
<version>${slf4j.version}</version>
134137
<scope>compile</scope>
135138
</dependency>
136139
<!-- https://mvnrepository.com/artifact/commons-cli/commons-cli -->
137140
<dependency>
138141
<groupId>commons-cli</groupId>
139142
<artifactId>commons-cli</artifactId>
140-
<version>1.4</version>
143+
<version>1.5.0</version>
141144
</dependency>
142145
<!-- To avoid compiler warnings about @API annotations in JUnit code -->
143146
<dependency>
144147
<groupId>org.apiguardian</groupId>
145148
<artifactId>apiguardian-api</artifactId>
146-
<version>1.0.0</version>
149+
<version>1.1.2</version>
147150
<scope>test</scope>
148151
</dependency>
149152
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
150153
<dependency>
151154
<groupId>org.apache.commons</groupId>
152155
<artifactId>commons-lang3</artifactId>
153-
<version>3.7</version>
156+
<version>3.12.0</version>
154157
<scope>compile</scope>
155158
</dependency>
156-
<!-- https://mvnrepository.com/artifact/io.confluent/kafka-connect-protobuf-converter -->
157-
<dependency>
158-
<groupId>io.confluent</groupId>
159-
<artifactId>kafka-connect-protobuf-converter</artifactId>
160-
<version>7.1.1</version>
161-
</dependency>
162159
<!-- https://mvnrepository.com/artifact/com.google.protobuf/protobuf-java -->
163160
<dependency>
164161
<groupId>com.google.protobuf</groupId>
165162
<artifactId>protobuf-java</artifactId>
166-
<version>3.21.7</version>
163+
<version>3.22.2</version>
167164
</dependency>
168165
<!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
169166
<dependency>
170167
<groupId>com.google.code.gson</groupId>
171168
<artifactId>gson</artifactId>
172-
<version>2.9.0</version>
173-
</dependency>
174-
<!-- https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib -->
175-
<dependency>
176-
<groupId>org.jetbrains.kotlin</groupId>
177-
<artifactId>kotlin-stdlib</artifactId>
178-
<version>1.7.0</version>
169+
<version>2.10.1</version>
179170
</dependency>
180171
<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
181172
<dependency>
@@ -197,7 +188,7 @@
197188
<plugin>
198189
<groupId>org.apache.maven.plugins</groupId>
199190
<artifactId>maven-jxr-plugin</artifactId>
200-
<version>2.3</version>
191+
<version>3.3.0</version>
201192
</plugin>
202193
</plugins>
203194
</reporting>
@@ -207,7 +198,7 @@
207198
<plugin>
208199
<groupId>org.apache.maven.plugins</groupId>
209200
<artifactId>maven-shade-plugin</artifactId>
210-
<version>3.1.0</version>
201+
<version>3.4.1</version>
211202
<configuration>
212203
</configuration>
213204
<executions>
@@ -228,7 +219,7 @@
228219
</plugin>
229220
<plugin>
230221
<artifactId>maven-compiler-plugin</artifactId>
231-
<version>3.7.0</version>
222+
<version>3.11.0</version>
232223
<configuration>
233224
<source>${java.version}</source>
234225
<target>${java.version}</target>
@@ -240,7 +231,7 @@
240231
<plugin>
241232
<groupId>org.apache.maven.plugins</groupId>
242233
<artifactId>maven-checkstyle-plugin</artifactId>
243-
<version>2.17</version>
234+
<version>3.2.1</version>
244235
<executions>
245236
<execution>
246237
<id>validate</id>
@@ -260,7 +251,7 @@
260251
<plugin>
261252
<groupId>org.jacoco</groupId>
262253
<artifactId>jacoco-maven-plugin</artifactId>
263-
<version>0.8.6</version>
254+
<version>0.8.9</version>
264255
<configuration>
265256
<excludes>
266257
<exclude>**/*com/splunk/hecclient/examples/**/*</exclude>
@@ -311,7 +302,7 @@
311302

312303
<plugin>
313304
<artifactId>maven-surefire-plugin</artifactId>
314-
<version>2.22.2</version>
305+
<version>3.0.0</version>
315306
<configuration>
316307
<!-- Sets the VM argument line used when unit tests are run. -->
317308
<argLine>${surefireArgLine}</argLine>

‎test/testcases/test_data_onboarding.py‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,20 @@ def test_data_onboarding(self, setup, test_scenario, test_input, expected):
2727
logger.info("Splunk received %s events in the last hour", len(events))
2828
assert len(events) == expected
2929

30-
@pytest.mark.parametrize("test_scenario, test_input, expected", [
31-
("protobuf", "sourcetype::protobuf", 1),
32-
])
33-
def test_proto_data_onboarding(self, setup, test_scenario, test_input, expected):
34-
logger.info(f"testing {test_scenario} input={test_input} expected={expected} event(s)")
35-
search_query = f"index={setup['splunk_index']} | search {test_input}"
36-
logger.info(search_query)
37-
events = check_events_from_splunk(start_time="-15m@m",
38-
url=setup["splunkd_url"],
39-
user=setup["splunk_user"],
40-
query=[f"search {search_query}"],
41-
password=setup["splunk_password"])
42-
logger.info("Splunk received %s events in the last hour", len(events))
43-
assert len(events) == expected
30+
# @pytest.mark.parametrize("test_scenario, test_input, expected", [
31+
# ("protobuf", "sourcetype::protobuf", 1),
32+
# ])
33+
# def test_proto_data_onboarding(self, setup, test_scenario, test_input, expected):
34+
# logger.info(f"testing {test_scenario} input={test_input} expected={expected} event(s)")
35+
# search_query = f"index={setup['splunk_index']} | search {test_input}"
36+
# logger.info(search_query)
37+
# events = check_events_from_splunk(start_time="-15m@m",
38+
# url=setup["splunkd_url"],
39+
# user=setup["splunk_user"],
40+
# query=[f"search {search_query}"],
41+
# password=setup["splunk_password"])
42+
# logger.info("Splunk received %s events in the last hour", len(events))
43+
# assert len(events) == expected
4444

4545
@pytest.mark.parametrize("test_scenario, test_input, expected", [
4646
("date_format", "latest=1365209605.000 sourcetype::date_format", "2010-06-13T23:11:52.454+00:00"),

0 commit comments

Comments
 (0)