Skip to content

Commit dadbde2

Browse files
christianpapechristianpape
committed
NMS-19198: Fixed test
1 parent 69d0941 commit dadbde2

File tree

9 files changed

+92
-3
lines changed

9 files changed

+92
-3
lines changed

‎container/features/src/main/resources/features-minion.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<feature>minion-core-api</feature>
3333
<feature>opennms-core</feature>
3434
<feature>opennms-core-ipc-sink-api</feature>
35+
<bundle dependency="true" start-level="${earlyStartLevel}">wrap:mvn:at.yawk.lz4/lz4-java/${lz4JavaVersion}$overwrite=merge;Export-Package=net.jpountz.lz4.*;version="${lz4JavaVersion}"</bundle>
3536
<bundle>mvn:org.opennms.features.minion.heartbeat/org.opennms.features.minion.heartbeat.common/${project.version}</bundle>
3637
<bundle>mvn:org.opennms.features.minion.heartbeat/org.opennms.features.minion.heartbeat.producer/${project.version}</bundle>
3738
</feature>

‎container/features/src/main/resources/features.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -450,14 +450,14 @@
450450
<feature name="opennms-kafka" version="${project.version}" description="OpenNMS :: Features :: Kafka">
451451
<feature>jackson-core</feature>
452452
<feature>zookeeper-dependencies</feature>
453+
<bundle dependency="true" start-level="${earlyStartLevel}">wrap:mvn:at.yawk.lz4/lz4-java/${lz4JavaVersion}$overwrite=merge;Export-Package=net.jpountz.lz4.*;version="${lz4JavaVersion}"</bundle>
453454
<bundle dependency="true">mvn:org.scala-lang/scala-library/${scalaLibraryVersion}</bundle>
454455
<bundle dependency="true">mvn:com.typesafe.scala-logging/scala-logging_${scalaVersion}/${scalaLoggingVersion}</bundle>
455456
<bundle dependency="true">wrap:mvn:com.yammer.metrics/metrics-core/2.2.0$Bundle-SymbolicName=com.yammer.metrics.core&amp;Bundle-Version=2.2.0&amp;Export-Package=*;-noimport:=true;version="2.2.0"</bundle>
456457
<bundle dependency="true">wrap:mvn:com.yammer.metrics/metrics-annotation/2.2.0$Bundle-SymbolicName=com.yammer.metrics.annotation&amp;Bundle-Version=2.2.0&amp;Export-Package=*;-noimport:=true;version="2.2.0"</bundle>
457458
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka_${scalaVersion}/${kafkaBundleVersion}</bundle>
458459
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/${kafkaBundleVersion}</bundle>
459460
<bundle dependency="true">mvn:com.github.luben/zstd-jni/${zstdJniVersion}</bundle>
460-
<bundle dependency="true">mvn:at.yawk.lz4/lz4-java/${lz4JavaVersion}</bundle>
461461
<bundle dependency="true">mvn:org.xerial.snappy/snappy-java/${snappyJavaVersion}</bundle>
462462
</feature>
463463
<feature name="opennms-core-ipc-sink-api" version="${project.version}" description="OpenNMS :: Core :: IPC :: Sink :: API">
@@ -987,12 +987,12 @@
987987
<feature>jackson-core</feature>
988988
-->
989989
<!-- Wrap the kafka-streams bundle instead of using the servicemix implementation since the later doesn't include the required imports for rocksdb -->
990+
<bundle dependency="true" start-level="${earlyStartLevel}">wrap:mvn:at.yawk.lz4/lz4-java/${lz4JavaVersion}$overwrite=merge;Export-Package=net.jpountz.lz4.*;version="${lz4JavaVersion}"</bundle>
990991
<bundle dependency="true">wrap:mvn:org.apache.kafka/kafka-streams/${kafkaVersion}$Bundle-Version=${kafkaVersion}&amp;Export-Package=*;-noimport:=true:version="${kafkaVersion}"</bundle>
991992
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.kafka-clients/${kafkaBundleVersion}</bundle>
992993
<bundle dependency="true">mvn:com.github.luben/zstd-jni/${zstdJniVersion}</bundle>
993994
<bundle dependency="true">wrap:mvn:org.apache.kafka/connect-json/${kafkaVersion}</bundle>
994995
<bundle dependency="true">wrap:mvn:org.apache.kafka/connect-api/${kafkaVersion}</bundle>
995-
<bundle dependency="true">mvn:at.yawk.lz4/lz4-java/${lz4JavaVersion}</bundle>
996996
<bundle dependency="true">mvn:org.xerial.snappy/snappy-java/${snappyJavaVersion}</bundle>
997997
<bundle dependency="true">mvn:com.typesafe.scala-logging/scala-logging_${scalaVersion}/${scalaLoggingVersion}</bundle>
998998
<bundle dependency="true">wrap:mvn:org.rocksdb/rocksdbjni/${rocksdbjniVersion}</bundle>
@@ -1004,6 +1004,7 @@
10041004
<feature>opennms-collection-api</feature>
10051005
<feature>opennms-situation-feedback-api</feature>
10061006
<bundle>wrap:mvn:com.google.protobuf/protobuf-java/${protobufVersion}</bundle>
1007+
<bundle dependency="true" start-level="${earlyStartLevel}">wrap:mvn:at.yawk.lz4/lz4-java/${lz4JavaVersion}$overwrite=merge;Export-Package=net.jpountz.lz4.*;version="${lz4JavaVersion}"</bundle>
10071008
<bundle>mvn:org.opennms.core.ipc.common/org.opennms.core.ipc.common.kafka/${project.version}</bundle>
10081009
<bundle>mvn:org.opennms.features.kafka/org.opennms.features.kafka.producer/${project.version}</bundle>
10091010
</feature>

‎core/ipc/common/kafka/pom.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,17 @@
6666
<artifactId>slf4j-log4j12</artifactId>
6767
<groupId>org.slf4j</groupId>
6868
</exclusion>
69+
<exclusion>
70+
<groupId>org.lz4</groupId>
71+
<artifactId>lz4-java</artifactId>
72+
</exclusion>
6973
</exclusions>
7074
</dependency>
75+
<dependency>
76+
<groupId>at.yawk.lz4</groupId>
77+
<artifactId>lz4-java</artifactId>
78+
<version>${lz4JavaVersion}</version>
79+
</dependency>
7180
<dependency>
7281
<groupId>org.apache.servicemix.bundles</groupId>
7382
<artifactId>org.apache.servicemix.bundles.kafka_${scalaVersion}</artifactId>
@@ -89,6 +98,10 @@
8998
<groupId>commons-logging</groupId>
9099
<artifactId>commons-logging</artifactId>
91100
</exclusion>
101+
<exclusion>
102+
<groupId>org.lz4</groupId>
103+
<artifactId>lz4-java</artifactId>
104+
</exclusion>
92105
</exclusions>
93106
</dependency>
94107
<dependency>

‎core/test-api/elasticsearch/pom.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,28 @@
2020
<groupId>org.elasticsearch</groupId>
2121
<artifactId>elasticsearch</artifactId>
2222
<version>${elasticsearchTargetVersion}</version>
23+
<exclusions>
24+
<exclusion>
25+
<groupId>org.elasticsearch</groupId>
26+
<artifactId>elasticsearch-lz4</artifactId>
27+
</exclusion>
28+
</exclusions>
29+
</dependency>
30+
<dependency>
31+
<groupId>org.elasticsearch</groupId>
32+
<artifactId>elasticsearch-lz4</artifactId>
33+
<version>${elasticsearchTargetVersion}</version>
34+
<exclusions>
35+
<exclusion>
36+
<groupId>org.lz4</groupId>
37+
<artifactId>lz4-java</artifactId>
38+
</exclusion>
39+
</exclusions>
40+
</dependency>
41+
<dependency>
42+
<groupId>at.yawk.lz4</groupId>
43+
<artifactId>lz4-java</artifactId>
44+
<version>${lz4JavaVersion}</version>
2345
</dependency>
2446
<dependency>
2547
<groupId>org.elasticsearch.client</groupId>

‎core/test-api/kafka/pom.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,17 @@
5959
<artifactId>slf4j-log4j12</artifactId>
6060
<groupId>org.slf4j</groupId>
6161
</exclusion>
62+
<exclusion>
63+
<groupId>org.lz4</groupId>
64+
<artifactId>lz4-java</artifactId>
65+
</exclusion>
6266
</exclusions>
6367
</dependency>
68+
<dependency>
69+
<groupId>at.yawk.lz4</groupId>
70+
<artifactId>lz4-java</artifactId>
71+
<version>${lz4JavaVersion}</version>
72+
</dependency>
6473
<dependency>
6574
<groupId>org.apache.servicemix.bundles</groupId>
6675
<artifactId>org.apache.servicemix.bundles.kafka_${scalaVersion}</artifactId>
@@ -82,6 +91,10 @@
8291
<groupId>commons-logging</groupId>
8392
<artifactId>commons-logging</artifactId>
8493
</exclusion>
94+
<exclusion>
95+
<groupId>org.lz4</groupId>
96+
<artifactId>lz4-java</artifactId>
97+
</exclusion>
8598
</exclusions>
8699
</dependency>
87100
<dependency>

‎features/flows/itests/pom.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,10 @@
180180
<version>${nephronVersion}</version>
181181
<scope>test</scope>
182182
<exclusions>
183+
<exclusion>
184+
<groupId>org.apache.kafka</groupId>
185+
<artifactId>kafka-clients</artifactId>
186+
</exclusion>
183187
<exclusion>
184188
<groupId>com.squareup.okio</groupId>
185189
<artifactId>okio</artifactId>
@@ -202,6 +206,22 @@
202206
</exclusion>
203207
</exclusions>
204208
</dependency>
209+
<dependency>
210+
<groupId>org.apache.kafka</groupId>
211+
<artifactId>kafka-clients</artifactId>
212+
<version>${kafkaVersion}</version>
213+
<exclusions>
214+
<exclusion>
215+
<groupId>org.lz4</groupId>
216+
<artifactId>lz4-java</artifactId>
217+
</exclusion>
218+
</exclusions>
219+
</dependency>
220+
<dependency>
221+
<groupId>at.yawk.lz4</groupId>
222+
<artifactId>lz4-java</artifactId>
223+
<version>${lz4JavaVersion}</version>
224+
</dependency>
205225
<dependency>
206226
<groupId>org.opennms</groupId>
207227
<artifactId>opennms-dao-mock</artifactId>

‎features/flows/kafka-persistence/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,17 @@
112112
<artifactId>slf4j-log4j12</artifactId>
113113
<groupId>org.slf4j</groupId>
114114
</exclusion>
115+
<exclusion>
116+
<groupId>org.lz4</groupId>
117+
<artifactId>lz4-java</artifactId>
118+
</exclusion>
115119
</exclusions>
116120
</dependency>
121+
<dependency>
122+
<groupId>at.yawk.lz4</groupId>
123+
<artifactId>lz4-java</artifactId>
124+
<version>${lz4JavaVersion}</version>
125+
</dependency>
117126
<dependency>
118127
<groupId>com.google.code.gson</groupId>
119128
<artifactId>gson</artifactId>

‎features/kafka/producer/pom.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,17 @@
121121
<artifactId>slf4j-log4j12</artifactId>
122122
<groupId>org.slf4j</groupId>
123123
</exclusion>
124+
<exclusion>
125+
<groupId>org.lz4</groupId>
126+
<artifactId>lz4-java</artifactId>
127+
</exclusion>
124128
</exclusions>
125129
</dependency>
130+
<dependency>
131+
<groupId>at.yawk.lz4</groupId>
132+
<artifactId>lz4-java</artifactId>
133+
<version>${lz4JavaVersion}</version>
134+
</dependency>
126135
<dependency>
127136
<groupId> com.google.protobuf</groupId>
128137
<artifactId>protobuf-java</artifactId>

‎pom.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1263,6 +1263,7 @@
12631263
<exclude>org.springframework:*</exclude> <!-- use: org.apache.servicemix.bundles.spring-* -->
12641264
<exclude>org.springframework.security:*</exclude> <!-- use: org.apache.servicemix.bundles.spring-security-* -->
12651265
<exclude>org.springframework.security.kerberos:*</exclude> <!-- use: org.apache.servicemix.bundles.spring-security-* -->
1266+
<exclude>org.lz4:lz4-java</exclude>
12661267
</excludes>
12671268
</bannedDependencies>
12681269
</rules>
@@ -1939,7 +1940,7 @@
19391940
<opentracingVersion>0.32.0</opentracingVersion>
19401941
<jaegertracingVersion>1.8.1</jaegertracingVersion>
19411942
<pyroscopeVersion>0.13.1</pyroscopeVersion>
1942-
<lz4JavaVersion>1.8.1</lz4JavaVersion>
1943+
<lz4JavaVersion>1.10.1</lz4JavaVersion>
19431944
<quartzVersion>2.3.2</quartzVersion>
19441945
<rancidApiVersion>2.0.0</rancidApiVersion>
19451946
<rateLimitedLoggerVersion>2.0.2</rateLimitedLoggerVersion>

0 commit comments

Comments
 (0)