Skip to content

Commit 1406f68

Browse files
rzo1rzo1
authored
STORM-3961 - Modernize Storm-UI Dependencies (apache#3572)
- Removes com.googlecode.json-simple:json-simple from Storm 2 (legacy library 12 years old) and replace it with already included json minidev library. - Minidev json is now included in the client shaded deps. - Removes org.jooq:jool from webui as it was included for the purpose of a few methods which can be replaced with Java 11 features. - Pins some versions on parent pom to avoid inclusion of the same library in the distribution - commons-lang3 -> 3.13.0 - log4j -> 2.20.0 - slf4j -> 1.7.36 - Jersey -> 2.40 - Dropwizard -> 1.3.29 - j2html -> 1.6.0 - minidev json -> 2.5.0 - JUnit 5.10.0 Excludes some dependencies from autocreds as jdbc/mssql driver is not needed for runtime operations
1 parent 4f99de0 commit 1406f68

File tree

73 files changed

+460
-404
lines changed

Some content is hidden

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

73 files changed

+460
-404
lines changed

‎DEPENDENCY-LICENSES

Lines changed: 66 additions & 76 deletions
Large diffs are not rendered by default.

‎LICENSE-binary

Lines changed: 82 additions & 93 deletions
Large diffs are not rendered by default.

‎examples/storm-loadgen/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@
7070
<artifactId>commons-io</artifactId>
7171
</dependency>
7272
<dependency>
73-
<groupId>com.googlecode.json-simple</groupId>
74-
<artifactId>json-simple</artifactId>
73+
<groupId>net.minidev</groupId>
74+
<artifactId>json-smart</artifactId>
7575
</dependency>
7676
<dependency>
7777
<groupId>org.yaml</groupId>

‎examples/storm-loadgen/src/main/java/org/apache/storm/loadgen/CaptureLoad.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
import java.util.Map;
2626
import java.util.function.Function;
2727
import java.util.stream.Collectors;
28+
import net.minidev.json.JSONObject;
29+
import net.minidev.json.JSONValue;
30+
import net.minidev.json.parser.JSONParser;
2831
import org.apache.commons.cli.CommandLine;
2932
import org.apache.commons.cli.CommandLineParser;
3033
import org.apache.commons.cli.DefaultParser;
@@ -35,7 +38,6 @@
3538
import org.apache.storm.Config;
3639
import org.apache.storm.generated.Bolt;
3740
import org.apache.storm.generated.BoltStats;
38-
import org.apache.storm.generated.ClusterSummary;
3941
import org.apache.storm.generated.ComponentCommon;
4042
import org.apache.storm.generated.ExecutorSummary;
4143
import org.apache.storm.generated.GlobalStreamId;
@@ -50,9 +52,6 @@
5052
import org.apache.storm.generated.WorkerSummary;
5153
import org.apache.storm.utils.NimbusClient;
5254
import org.apache.storm.utils.ObjectReader;
53-
import org.json.simple.JSONObject;
54-
import org.json.simple.JSONValue;
55-
import org.json.simple.parser.JSONParser;
5655
import org.slf4j.Logger;
5756
import org.slf4j.LoggerFactory;
5857

@@ -419,7 +418,7 @@ static Map<String, Double> parseResources(String input) {
419418
}
420419
LOG.debug("Topology Resources {}", topologyResources);
421420
}
422-
} catch (org.json.simple.parser.ParseException e) {
421+
} catch (net.minidev.json.parser.ParseException e) {
423422
LOG.error("Failed to parse component resources is:" + e.toString(), e);
424423
return null;
425424
}

‎external/storm-autocreds/pom.xml

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,22 @@
7878
<groupId>org.apache.avro</groupId>
7979
<artifactId>avro</artifactId>
8080
</exclusion>
81+
<exclusion>
82+
<groupId>com.microsoft.sqlserver</groupId>
83+
<artifactId>mssql-jdbc</artifactId>
84+
</exclusion>
85+
<exclusion>
86+
<groupId>com.zaxxer</groupId>
87+
<artifactId>HikariCP-java7</artifactId>
88+
</exclusion>
89+
<exclusion>
90+
<groupId>org.apache.geronimo.specs</groupId>
91+
<artifactId>geronimo-jcache_1.0_spec</artifactId>
92+
</exclusion>
93+
<exclusion>
94+
<groupId>org.ehcache</groupId>
95+
<artifactId>ehcache</artifactId>
96+
</exclusion>
8197
</exclusions>
8298
</dependency>
8399
<dependency>
@@ -187,6 +203,15 @@
187203
<groupId>junit</groupId>
188204
<artifactId>junit</artifactId>
189205
</exclusion>
206+
<exclusion>
207+
<groupId>org.eclipse.jetty.aggregate</groupId>
208+
<artifactId>jetty-all</artifactId>
209+
</exclusion>
210+
<exclusion>
211+
<!-- Not needed for runtime ops -->
212+
<groupId>org.apache.hive</groupId>
213+
<artifactId>hive-cli</artifactId>
214+
</exclusion>
190215
</exclusions>
191216
</dependency>
192217
<dependency>
@@ -218,6 +243,11 @@
218243
<groupId>junit</groupId>
219244
<artifactId>junit</artifactId>
220245
</exclusion>
246+
<exclusion>
247+
<!-- Not needed for runtime ops -->
248+
<groupId>org.apache.hive</groupId>
249+
<artifactId>hive-cli</artifactId>
250+
</exclusion>
221251
</exclusions>
222252
</dependency>
223253
<dependency>
@@ -227,7 +257,6 @@
227257
<dependency>
228258
<groupId>org.glassfish</groupId>
229259
<artifactId>javax.el</artifactId>
230-
<version>3.0.1-b12</version>
231260
</dependency>
232261
</dependencies>
233262
<build>

‎external/storm-cassandra/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@
3232

3333
<properties>
3434
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
35-
<org.slf4j.version>1.7.6</org.slf4j.version>
3635
<guava.version>16.0.1</guava.version>
37-
<commons-lang3.version>3.3</commons-lang3.version>
3836
<cassandra.driver.core.version>3.1.2</cassandra.driver.core.version>
3937
<storm-cassandra.test.introspection.argLine>--add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.math=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/jdk.internal.misc=ALL-UNNAMED</storm-cassandra.test.introspection.argLine>
4038
</properties>
@@ -142,7 +140,6 @@
142140
<dependency>
143141
<groupId>org.slf4j</groupId>
144142
<artifactId>slf4j-api</artifactId>
145-
<version>${org.slf4j.version}</version>
146143
</dependency>
147144

148145
<dependency>
@@ -154,7 +151,6 @@
154151
<dependency>
155152
<groupId>org.apache.commons</groupId>
156153
<artifactId>commons-lang3</artifactId>
157-
<version>${commons-lang3.version}</version>
158154
</dependency>
159155

160156
<dependency>

‎external/storm-hive/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@
180180
</exclusions>
181181
</dependency>
182182
<dependency>
183-
<groupId>com.googlecode.json-simple</groupId>
184-
<artifactId>json-simple</artifactId>
183+
<groupId>net.minidev</groupId>
184+
<artifactId>json-smart</artifactId>
185185
</dependency>
186186
<dependency>
187187
<groupId>org.apache.hadoop</groupId>

‎external/storm-hive/src/main/java/org/apache/storm/hive/bolt/mapper/JsonRecordHiveMapper.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
import java.io.IOException;
1616
import java.text.SimpleDateFormat;
1717
import java.util.ArrayList;
18-
import java.util.Date;
1918
import java.util.List;
19+
import net.minidev.json.JSONObject;
2020
import org.apache.hive.hcatalog.streaming.HiveEndPoint;
2121
import org.apache.hive.hcatalog.streaming.RecordWriter;
2222
import org.apache.hive.hcatalog.streaming.StreamingException;
@@ -25,7 +25,6 @@
2525
import org.apache.storm.trident.tuple.TridentTuple;
2626
import org.apache.storm.tuple.Fields;
2727
import org.apache.storm.tuple.Tuple;
28-
import org.json.simple.JSONObject;
2928
import org.slf4j.Logger;
3029
import org.slf4j.LoggerFactory;
3130

‎external/storm-jdbc/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
<dependency>
5050
<groupId>org.apache.commons</groupId>
5151
<artifactId>commons-lang3</artifactId>
52-
<version>3.13.0</version>
5352
</dependency>
5453
<dependency>
5554
<groupId>com.google.guava</groupId>

‎external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/trident/KafkaTridentSpoutBatchMetadataTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import static org.hamcrest.MatcherAssert.assertThat;
2121

2222
import java.util.Map;
23-
import org.json.simple.JSONValue;
23+
import net.minidev.json.JSONValue;
2424
import org.junit.jupiter.api.Test;
2525

2626
public class KafkaTridentSpoutBatchMetadataTest {

‎external/storm-kafka-monitor/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@
5959
<artifactId>zookeeper</artifactId>
6060
</dependency>
6161
<dependency>
62-
<groupId>com.googlecode.json-simple</groupId>
63-
<artifactId>json-simple</artifactId>
62+
<groupId>net.minidev</groupId>
63+
<artifactId>json-smart</artifactId>
6464
</dependency>
6565
<dependency>
6666
<groupId>commons-cli</groupId>

‎external/storm-kafka-monitor/src/main/java/org/apache/storm/kafka/monitor/KafkaOffsetLagResult.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
package org.apache.storm.kafka.monitor;
2020

21-
import org.json.simple.JSONAware;
21+
import net.minidev.json.JSONAware;
2222

2323
/**
2424
* Class representing the log head offsets, spout offsets and the lag for a topic.

‎external/storm-kafka-monitor/src/main/java/org/apache/storm/kafka/monitor/KafkaOffsetLagUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import java.util.List;
2525
import java.util.Map;
2626
import java.util.Properties;
27+
import net.minidev.json.JSONValue;
2728
import org.apache.commons.cli.CommandLine;
2829
import org.apache.commons.cli.CommandLineParser;
2930
import org.apache.commons.cli.DefaultParser;
@@ -34,7 +35,6 @@
3435
import org.apache.kafka.common.PartitionInfo;
3536
import org.apache.kafka.common.TopicPartition;
3637
import org.apache.kafka.common.utils.Utils;
37-
import org.json.simple.JSONValue;
3838

3939
/**
4040
* Utility class for querying offset lag for kafka spout.

‎external/storm-kinesis/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@
5151
<artifactId>zookeeper</artifactId>
5252
</dependency>
5353
<dependency>
54-
<groupId>com.googlecode.json-simple</groupId>
55-
<artifactId>json-simple</artifactId>
54+
<groupId>net.minidev</groupId>
55+
<artifactId>json-smart</artifactId>
5656
</dependency>
5757
</dependencies>
5858
<build>

‎external/storm-kinesis/src/main/java/org/apache/storm/kinesis/spout/ZkConnection.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@
2020

2121
import java.nio.charset.Charset;
2222
import java.util.Map;
23+
import net.minidev.json.JSONValue;
2324

2425
import org.apache.curator.framework.CuratorFramework;
2526
import org.apache.curator.framework.CuratorFrameworkFactory;
2627
import org.apache.curator.retry.RetryNTimes;
2728
import org.apache.zookeeper.CreateMode;
28-
import org.json.simple.JSONValue;
2929

3030
class ZkConnection {
3131

‎pom.xml

Lines changed: 33 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -297,13 +297,13 @@
297297
<commons-compress.version>1.21</commons-compress.version>
298298
<commons-io.version>2.11.0</commons-io.version>
299299
<commons-lang.version>2.6</commons-lang.version>
300+
<commons-lang3.version>3.13.0</commons-lang3.version>
300301
<commons-exec.version>1.3</commons-exec.version>
301302
<commons-collections.version>3.2.2</commons-collections.version>
302303
<commons-fileupload.version>1.5</commons-fileupload.version>
303304
<commons-codec.version>1.11</commons-codec.version>
304305
<commons-cli.version>1.4</commons-cli.version>
305306
<curator.version>5.5.0</curator.version>
306-
<json-simple.version>1.1</json-simple.version>
307307
<jetty.version>9.4.45.v20220203</jetty.version>
308308
<clojure.tools.logging.version>0.2.3</clojure.tools.logging.version>
309309
<carbonite.version>1.6.0</carbonite.version>
@@ -316,7 +316,7 @@
316316
<auto-service.version>1.0-rc4</auto-service.version>
317317
<netty.version>4.1.96.Final</netty.version>
318318
<sysout-over-slf4j.version>1.0.2</sysout-over-slf4j.version>
319-
<log4j.version>2.17.1</log4j.version>
319+
<log4j.version>2.20.0</log4j.version>
320320
<slf4j.version>1.7.36</slf4j.version>
321321
<metrics.version>3.2.6</metrics.version>
322322
<mockito.version>4.11.0</mockito.version>
@@ -329,9 +329,9 @@
329329
<hbase.version>2.1.3</hbase.version>
330330
<kryo.version>5.4.0</kryo.version>
331331
<servlet.version>3.1.0</servlet.version>
332-
<joda-time.version>2.3</joda-time.version>
332+
<joda-time.version>2.12.5</joda-time.version>
333333
<thrift.version>0.18.1</thrift.version>
334-
<junit.jupiter.version>5.5.1</junit.jupiter.version>
334+
<junit.jupiter.version>5.10.0</junit.jupiter.version>
335335
<surefire.version>3.0.0-M5</surefire.version>
336336
<awaitility.version>3.1.0</awaitility.version>
337337
<hdrhistogram.version>2.1.10</hdrhistogram.version>
@@ -360,20 +360,21 @@
360360
<maven-resolver.version>1.3.3</maven-resolver.version>
361361
<maven.version>3.6.0</maven.version>
362362
<azure-eventhubs.version>0.13.1</azure-eventhubs.version>
363-
<jersey.version>2.29</jersey.version>
364-
<dropwizard.version>1.3.19</dropwizard.version>
365-
<j2html.version>1.0.0</j2html.version>
366-
<jool.version>0.9.12</jool.version>
363+
<!-- Jersey 3.x is jakarta.* namespace. We have too many javax.* dependencies atm-->
364+
<jersey.version>2.40</jersey.version>
365+
<dropwizard.version>1.3.29</dropwizard.version>
366+
<j2html.version>1.6.0</j2html.version>
367367
<caffeine.version>2.3.5</caffeine.version>
368368
<jakarta-jaxb-version>2.3.2</jakarta-jaxb-version>
369369
<jakarta-activation-version>1.2.1</jakarta-activation-version>
370370
<jaxb-version>2.3.0</jaxb-version>
371371
<activation-version>1.1.1</activation-version>
372372
<rocksdb-version>8.1.1</rocksdb-version>
373-
<json-smart.version>2.3</json-smart.version>
373+
<json-smart.version>2.5.0</json-smart.version>
374374

375375
<!-- see intellij profile below... This fixes an annoyance with intellij -->
376376
<provided.scope>provided</provided.scope>
377+
<jakarta-el.version>3.0.1-b12</jakarta-el.version>
377378
</properties>
378379

379380
<modules>
@@ -854,6 +855,11 @@
854855
<artifactId>javax.servlet-api</artifactId>
855856
<version>${servlet.version}</version>
856857
</dependency>
858+
<dependency>
859+
<groupId>org.glassfish</groupId>
860+
<artifactId>javax.el</artifactId>
861+
<version>${jakarta-el.version}</version>
862+
</dependency>
857863
<dependency>
858864
<groupId>org.slf4j</groupId>
859865
<artifactId>slf4j-api</artifactId>
@@ -871,6 +877,11 @@
871877
<scope>import</scope>
872878
<type>pom</type>
873879
</dependency>
880+
<dependency>
881+
<groupId>org.apache.commons</groupId>
882+
<artifactId>commons-lang3</artifactId>
883+
<version>${commons-lang3.version}</version>
884+
</dependency>
874885
<dependency>
875886
<groupId>commons-fileupload</groupId>
876887
<artifactId>commons-fileupload</artifactId>
@@ -903,9 +914,9 @@
903914
<scope>test</scope>
904915
</dependency>
905916
<dependency>
906-
<groupId>com.googlecode.json-simple</groupId>
907-
<artifactId>json-simple</artifactId>
908-
<version>${json-simple.version}</version>
917+
<groupId>net.minidev</groupId>
918+
<artifactId>json-smart</artifactId>
919+
<version>${json-smart.version}</version>
909920
</dependency>
910921
<dependency>
911922
<groupId>org.eclipse.jetty</groupId>
@@ -967,6 +978,16 @@
967978
<artifactId>log4j-over-slf4j</artifactId>
968979
<version>${slf4j.version}</version>
969980
</dependency>
981+
<dependency>
982+
<groupId>org.slf4j</groupId>
983+
<artifactId>jcl-over-slf4j</artifactId>
984+
<version>${slf4j.version}</version>
985+
</dependency>
986+
<dependency>
987+
<groupId>org.slf4j</groupId>
988+
<artifactId>jul-to-slf4j</artifactId>
989+
<version>${slf4j.version}</version>
990+
</dependency>
970991
<dependency>
971992
<groupId>io.netty</groupId>
972993
<artifactId>netty-bom</artifactId>

‎storm-client/src/jvm/org/apache/storm/StormSubmitter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
import org.apache.storm.hooks.SubmitterHookException;
4242
import org.apache.storm.security.auth.ClientAuthUtils;
4343
import org.apache.storm.security.auth.IAutoCredentials;
44+
import org.apache.storm.shade.net.minidev.json.JSONValue;
4445
import org.apache.storm.shade.org.apache.commons.lang.StringUtils;
45-
import org.apache.storm.shade.org.json.simple.JSONValue;
4646
import org.apache.storm.thrift.TException;
4747
import org.apache.storm.utils.BufferFileInputStream;
4848
import org.apache.storm.utils.NimbusClient;

‎storm-client/src/jvm/org/apache/storm/Thrift.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
import org.apache.storm.generated.StormTopology;
4141
import org.apache.storm.generated.StormTopology._Fields;
4242
import org.apache.storm.generated.StreamInfo;
43-
import org.apache.storm.shade.org.json.simple.JSONValue;
43+
import org.apache.storm.shade.net.minidev.json.JSONValue;
4444
import org.apache.storm.task.IBolt;
4545
import org.apache.storm.topology.BoltDeclarer;
4646
import org.apache.storm.topology.IBasicBolt;

‎storm-client/src/jvm/org/apache/storm/daemon/StormCommon.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
import org.apache.storm.metric.util.DataPointExpander;
4343
import org.apache.storm.security.auth.IAuthorizer;
4444
import org.apache.storm.serialization.SerializationFactory;
45+
import org.apache.storm.shade.net.minidev.json.JSONValue;
4546
import org.apache.storm.shade.org.apache.commons.lang.StringUtils;
46-
import org.apache.storm.shade.org.json.simple.JSONValue;
4747
import org.apache.storm.task.IBolt;
4848
import org.apache.storm.task.WorkerTopologyContext;
4949
import org.apache.storm.tuple.Fields;

‎storm-client/src/jvm/org/apache/storm/dependency/DependencyPropertiesParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
import java.util.List;
2020
import java.util.Map;
2121
import org.apache.storm.shade.com.google.common.collect.Lists;
22-
import org.apache.storm.shade.org.json.simple.JSONValue;
23-
import org.apache.storm.shade.org.json.simple.parser.ParseException;
22+
import org.apache.storm.shade.net.minidev.json.JSONValue;
23+
import org.apache.storm.shade.net.minidev.json.parser.ParseException;
2424

2525
public class DependencyPropertiesParser {
2626
public List<File> parseJarsProperties(String prop) {

0 commit comments

Comments
 (0)