From fe9d822c8e33c69fbf45caa1fa051dfff988ba82 Mon Sep 17 00:00:00 2001 From: Chris Larsen Date: Thu, 22 Dec 2022 19:59:51 -0800 Subject: [PATCH] Update some dependencies for #2262. WARNING: The minimum JDK is now version 8 due to Jackson. Fix the Json serializer to explicitly write nulls due to API changes in Jackson. --- src/tools/CliOptions.java | 2 +- src/tsd/HttpJsonSerializer.java | 2 +- test/core/LongHistogramDataPointForTest.java | 2 ++ test/core/LongHistogramDataPointForTestDecoder.java | 3 +++ third_party/apache/commons-math3-3.6.1.jar.md5 | 1 + third_party/apache/include.mk | 4 ++-- third_party/gwt/gwt-dev-2.5.0.jar.md5 | 1 - third_party/gwt/gwt-dev-2.6.0.jar.md5 | 1 - third_party/gwt/gwt-dev-2.7.0.jar.md5 | 1 + third_party/gwt/gwt-user-2.5.0.jar.md5 | 1 - third_party/gwt/gwt-user-2.6.0.jar.md5 | 1 - third_party/gwt/gwt-user-2.7.0.jar.md5 | 1 + third_party/gwt/include.mk | 4 ++-- third_party/jackson/include.mk | 4 ++-- third_party/jackson/jackson-annotations-2.14.1.jar.md5 | 1 + third_party/jackson/jackson-annotations-2.4.3.jar.md5 | 1 - third_party/jackson/jackson-core-2.14.1.jar.md5 | 1 + third_party/jackson/jackson-core-2.4.3.jar.md5 | 1 - third_party/jackson/jackson-databind-2.14.1.jar.md5 | 1 + third_party/jackson/jackson-databind-2.4.3.jar.md5 | 1 - third_party/jexl/commons-logging-1.2.jar.md5 | 1 + third_party/jexl/include.mk | 2 +- third_party/junit/junit-4.10.jar.md5 | 1 - third_party/junit/junit-4.13.2.jar.md5 | 1 + third_party/logback/include.mk | 6 ++---- third_party/logback/logback-classic-1.0.13.jar.md5 | 1 - third_party/logback/logback-classic-1.3.4.jar.md5 | 1 + third_party/logback/logback-core-1.0.13.jar.md5 | 1 - third_party/logback/logback-core-1.3.4.jar.md5 | 1 + third_party/mockito/include.mk | 2 +- third_party/mockito/mockito-1.9.0.jar.md5 | 1 - third_party/mockito/mockito-core-1.10.19.jar.md5 | 1 + third_party/slf4j/include.mk | 2 +- third_party/slf4j/log4j-over-slf4j-1.7.2.jar.md5 | 1 - third_party/slf4j/log4j-over-slf4j-2.0.6.jar.md5 | 1 + third_party/slf4j/slf4j-api-1.7.2.jar.md5 | 1 - third_party/slf4j/slf4j-api-2.0.6.jar.md5 | 1 + 37 files changed, 31 insertions(+), 28 deletions(-) create mode 100644 third_party/apache/commons-math3-3.6.1.jar.md5 delete mode 100644 third_party/gwt/gwt-dev-2.5.0.jar.md5 delete mode 100644 third_party/gwt/gwt-dev-2.6.0.jar.md5 create mode 100644 third_party/gwt/gwt-dev-2.7.0.jar.md5 delete mode 100644 third_party/gwt/gwt-user-2.5.0.jar.md5 delete mode 100644 third_party/gwt/gwt-user-2.6.0.jar.md5 create mode 100644 third_party/gwt/gwt-user-2.7.0.jar.md5 create mode 100644 third_party/jackson/jackson-annotations-2.14.1.jar.md5 delete mode 100644 third_party/jackson/jackson-annotations-2.4.3.jar.md5 create mode 100644 third_party/jackson/jackson-core-2.14.1.jar.md5 delete mode 100644 third_party/jackson/jackson-core-2.4.3.jar.md5 create mode 100644 third_party/jackson/jackson-databind-2.14.1.jar.md5 delete mode 100644 third_party/jackson/jackson-databind-2.4.3.jar.md5 create mode 100644 third_party/jexl/commons-logging-1.2.jar.md5 delete mode 100644 third_party/junit/junit-4.10.jar.md5 create mode 100644 third_party/junit/junit-4.13.2.jar.md5 delete mode 100644 third_party/logback/logback-classic-1.0.13.jar.md5 create mode 100644 third_party/logback/logback-classic-1.3.4.jar.md5 delete mode 100644 third_party/logback/logback-core-1.0.13.jar.md5 create mode 100644 third_party/logback/logback-core-1.3.4.jar.md5 delete mode 100644 third_party/mockito/mockito-1.9.0.jar.md5 create mode 100644 third_party/mockito/mockito-core-1.10.19.jar.md5 delete mode 100644 third_party/slf4j/log4j-over-slf4j-1.7.2.jar.md5 create mode 100644 third_party/slf4j/log4j-over-slf4j-2.0.6.jar.md5 delete mode 100644 third_party/slf4j/slf4j-api-1.7.2.jar.md5 create mode 100644 third_party/slf4j/slf4j-api-2.0.6.jar.md5 diff --git a/src/tools/CliOptions.java b/src/tools/CliOptions.java index 60ddefc179..9a16a1b3fa 100644 --- a/src/tools/CliOptions.java +++ b/src/tools/CliOptions.java @@ -168,7 +168,7 @@ private static void honorVerboseFlag(final ArgP argp) { // level of the underlying logging library. So we have to violate the // encapsulation provided by SLF4J. for (final Logger logger : - ((Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME)) + ((Logger) LoggerFactory.getLogger("ROOT")) .getLoggerContext().getLoggerList()) { logger.setLevel(Level.WARN); } diff --git a/src/tsd/HttpJsonSerializer.java b/src/tsd/HttpJsonSerializer.java index b3e7d6937b..d0605bd42f 100644 --- a/src/tsd/HttpJsonSerializer.java +++ b/src/tsd/HttpJsonSerializer.java @@ -859,7 +859,7 @@ public Object call(final ArrayList deferreds) throws Exception { final double value = dp.doubleValue(); if (Double.isNaN(value) && orig_query.fillPolicy() == FillPolicy.NULL) { - json.writeNumberField(Long.toString(timestamp), null); + json.writeNullField(Long.toString(timestamp)); } else { json.writeNumberField(Long.toString(timestamp), dp.doubleValue()); } diff --git a/test/core/LongHistogramDataPointForTest.java b/test/core/LongHistogramDataPointForTest.java index 65b84ec691..b4f0509485 100644 --- a/test/core/LongHistogramDataPointForTest.java +++ b/test/core/LongHistogramDataPointForTest.java @@ -18,7 +18,9 @@ import java.util.Map; import org.hbase.async.Bytes; +import org.junit.Ignore; +@Ignore public class LongHistogramDataPointForTest implements Histogram { private final int id; private long data; diff --git a/test/core/LongHistogramDataPointForTestDecoder.java b/test/core/LongHistogramDataPointForTestDecoder.java index f7381643e9..489eb60333 100644 --- a/test/core/LongHistogramDataPointForTestDecoder.java +++ b/test/core/LongHistogramDataPointForTestDecoder.java @@ -12,6 +12,9 @@ // see . package net.opentsdb.core; +import org.junit.Ignore; + +@Ignore public class LongHistogramDataPointForTestDecoder extends HistogramDataPointCodec { @Override diff --git a/third_party/apache/commons-math3-3.6.1.jar.md5 b/third_party/apache/commons-math3-3.6.1.jar.md5 new file mode 100644 index 0000000000..2a5ecc945b --- /dev/null +++ b/third_party/apache/commons-math3-3.6.1.jar.md5 @@ -0,0 +1 @@ +5b730d97e4e6368069de1983937c508e diff --git a/third_party/apache/include.mk b/third_party/apache/include.mk index 5f4fb82d7b..991f95bb8c 100644 --- a/third_party/apache/include.mk +++ b/third_party/apache/include.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2013 The OpenTSDB Authors. +# Copyright (C) 2011-2022 The OpenTSDB Authors. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: @@ -22,7 +22,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -APACHE_MATH_VERSION := 3.4.1 +APACHE_MATH_VERSION := 3.6.1 APACHE_MATH := third_party/apache/commons-math3-$(APACHE_MATH_VERSION).jar APACHE_MATH_BASE_URL := https://repo1.maven.org/maven2/org/apache/commons/commons-math3/$(APACHE_MATH_VERSION) diff --git a/third_party/gwt/gwt-dev-2.5.0.jar.md5 b/third_party/gwt/gwt-dev-2.5.0.jar.md5 deleted file mode 100644 index 757d50e319..0000000000 --- a/third_party/gwt/gwt-dev-2.5.0.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -538df8db77bacc863f34b82c59d5632d diff --git a/third_party/gwt/gwt-dev-2.6.0.jar.md5 b/third_party/gwt/gwt-dev-2.6.0.jar.md5 deleted file mode 100644 index 1b9eea2b1f..0000000000 --- a/third_party/gwt/gwt-dev-2.6.0.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -23d8bf52709230c2c7e6dd817261f9ee diff --git a/third_party/gwt/gwt-dev-2.7.0.jar.md5 b/third_party/gwt/gwt-dev-2.7.0.jar.md5 new file mode 100644 index 0000000000..401e1de1fb --- /dev/null +++ b/third_party/gwt/gwt-dev-2.7.0.jar.md5 @@ -0,0 +1 @@ +34536303425ef30b16832d384697ddbb \ No newline at end of file diff --git a/third_party/gwt/gwt-user-2.5.0.jar.md5 b/third_party/gwt/gwt-user-2.5.0.jar.md5 deleted file mode 100644 index 7a290c8be2..0000000000 --- a/third_party/gwt/gwt-user-2.5.0.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -c58e29c1132ee6694e8f780e045f4d13 diff --git a/third_party/gwt/gwt-user-2.6.0.jar.md5 b/third_party/gwt/gwt-user-2.6.0.jar.md5 deleted file mode 100644 index b1c2fe2bde..0000000000 --- a/third_party/gwt/gwt-user-2.6.0.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -99226fc2764f2b8fd6db6e05d0847659 diff --git a/third_party/gwt/gwt-user-2.7.0.jar.md5 b/third_party/gwt/gwt-user-2.7.0.jar.md5 new file mode 100644 index 0000000000..f71331c2eb --- /dev/null +++ b/third_party/gwt/gwt-user-2.7.0.jar.md5 @@ -0,0 +1 @@ +49bfa9ad1bbede5af29f7978a089266d \ No newline at end of file diff --git a/third_party/gwt/include.mk b/third_party/gwt/include.mk index 27f8699f3c..a3c911d71b 100644 --- a/third_party/gwt/include.mk +++ b/third_party/gwt/include.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2012 The OpenTSDB Authors. +# Copyright (C) 2011-2023 The OpenTSDB Authors. # # This library is free software: you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as published @@ -13,7 +13,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with this library. If not, see . -GWT_VERSION := 2.6.0 +GWT_VERSION := 2.6.1 GWT_DEV_VERSION := $(GWT_VERSION) GWT_DEV := third_party/gwt/gwt-dev-$(GWT_DEV_VERSION).jar diff --git a/third_party/jackson/include.mk b/third_party/jackson/include.mk index 7a0a904ce5..57002ac30b 100644 --- a/third_party/jackson/include.mk +++ b/third_party/jackson/include.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2014 The OpenTSDB Authors. +# Copyright (C) 2011-2022 The OpenTSDB Authors. # # This library is free software: you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as published @@ -13,7 +13,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with this library. If not, see . -JACKSON_VERSION := 2.9.5 +JACKSON_VERSION := 2.14.1 JACKSON_ANNOTATIONS_VERSION = $(JACKSON_VERSION) JACKSON_ANNOTATIONS := third_party/jackson/jackson-annotations-$(JACKSON_ANNOTATIONS_VERSION).jar diff --git a/third_party/jackson/jackson-annotations-2.14.1.jar.md5 b/third_party/jackson/jackson-annotations-2.14.1.jar.md5 new file mode 100644 index 0000000000..3e09d564c8 --- /dev/null +++ b/third_party/jackson/jackson-annotations-2.14.1.jar.md5 @@ -0,0 +1 @@ +da4742ba6aeb24bf1bd29382fd95647b diff --git a/third_party/jackson/jackson-annotations-2.4.3.jar.md5 b/third_party/jackson/jackson-annotations-2.4.3.jar.md5 deleted file mode 100644 index b921a9846f..0000000000 --- a/third_party/jackson/jackson-annotations-2.4.3.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -31ef4fa866f9d24960a6807c9c299e98 diff --git a/third_party/jackson/jackson-core-2.14.1.jar.md5 b/third_party/jackson/jackson-core-2.14.1.jar.md5 new file mode 100644 index 0000000000..72ffeeed96 --- /dev/null +++ b/third_party/jackson/jackson-core-2.14.1.jar.md5 @@ -0,0 +1 @@ +f9604a5f31129cdb7db4bdec90111850 \ No newline at end of file diff --git a/third_party/jackson/jackson-core-2.4.3.jar.md5 b/third_party/jackson/jackson-core-2.4.3.jar.md5 deleted file mode 100644 index d166db8725..0000000000 --- a/third_party/jackson/jackson-core-2.4.3.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -750ef3d86f04fe0d6d14d6ae904a6d2d diff --git a/third_party/jackson/jackson-databind-2.14.1.jar.md5 b/third_party/jackson/jackson-databind-2.14.1.jar.md5 new file mode 100644 index 0000000000..fe98f6bf13 --- /dev/null +++ b/third_party/jackson/jackson-databind-2.14.1.jar.md5 @@ -0,0 +1 @@ +3e3e7aab8799ccc169b10f244e6fb5b4 diff --git a/third_party/jackson/jackson-databind-2.4.3.jar.md5 b/third_party/jackson/jackson-databind-2.4.3.jar.md5 deleted file mode 100644 index 52f07b826c..0000000000 --- a/third_party/jackson/jackson-databind-2.4.3.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -4fcb9f74280eaa21de10191212c65b11 diff --git a/third_party/jexl/commons-logging-1.2.jar.md5 b/third_party/jexl/commons-logging-1.2.jar.md5 new file mode 100644 index 0000000000..4d1ffb1050 --- /dev/null +++ b/third_party/jexl/commons-logging-1.2.jar.md5 @@ -0,0 +1 @@ +040b4b4d8eac886f6b4a2a3bd2f31b00 \ No newline at end of file diff --git a/third_party/jexl/include.mk b/third_party/jexl/include.mk index b8ac41ff1a..8873ae3fbf 100644 --- a/third_party/jexl/include.mk +++ b/third_party/jexl/include.mk @@ -23,7 +23,7 @@ $(JEXL): $(JEXL).md5 THIRD_PARTY += $(JEXL) # In here as Jexl depends on it and no one else (for now, I hope) -COMMONS_LOGGING_VERSION := 1.1.1 +COMMONS_LOGGING_VERSION := 1.2 COMMONS_LOGGING := third_party/jexl/commons-logging-$(COMMONS_LOGGING_VERSION).jar COMMONS_LOGGING_BASE_URL := https://repo1.maven.org/maven2/commons-logging/commons-logging/$(COMMONS_LOGGING_VERSION) diff --git a/third_party/junit/junit-4.10.jar.md5 b/third_party/junit/junit-4.10.jar.md5 deleted file mode 100644 index 5f3dc10015..0000000000 --- a/third_party/junit/junit-4.10.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -972c3b8fb2cc26008cbceb01ff889ec4 diff --git a/third_party/junit/junit-4.13.2.jar.md5 b/third_party/junit/junit-4.13.2.jar.md5 new file mode 100644 index 0000000000..d22f85d46f --- /dev/null +++ b/third_party/junit/junit-4.13.2.jar.md5 @@ -0,0 +1 @@ +d98a9a02a99a9acd22d7653cbcc1f31f \ No newline at end of file diff --git a/third_party/logback/include.mk b/third_party/logback/include.mk index e9d2b34ebf..ba2f67e5c5 100644 --- a/third_party/logback/include.mk +++ b/third_party/logback/include.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2015 The OpenTSDB Authors. +# Copyright (C) 2015-2022 The OpenTSDB Authors. # # This library is free software: you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as published @@ -12,9 +12,7 @@ # # You should have received a copy of the GNU Lesser General Public License # along with this library. If not, see . - -https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/1.2.9/logback-classic-1.2.9.jar -LOGBACK_VERSION := 1.2.9 +LOGBACK_VERSION := 1.3.4 LOGBACK_CLASSIC_VERSION := $(LOGBACK_VERSION) LOGBACK_CLASSIC := third_party/logback/logback-classic-$(LOGBACK_CLASSIC_VERSION).jar diff --git a/third_party/logback/logback-classic-1.0.13.jar.md5 b/third_party/logback/logback-classic-1.0.13.jar.md5 deleted file mode 100644 index ae8b69cb80..0000000000 --- a/third_party/logback/logback-classic-1.0.13.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -18586a078b51918942002ec085338e19 diff --git a/third_party/logback/logback-classic-1.3.4.jar.md5 b/third_party/logback/logback-classic-1.3.4.jar.md5 new file mode 100644 index 0000000000..cc7fdb0a1f --- /dev/null +++ b/third_party/logback/logback-classic-1.3.4.jar.md5 @@ -0,0 +1 @@ +0b98f1f2ad1caa97556b979598038d3d \ No newline at end of file diff --git a/third_party/logback/logback-core-1.0.13.jar.md5 b/third_party/logback/logback-core-1.0.13.jar.md5 deleted file mode 100644 index d4093eb2a6..0000000000 --- a/third_party/logback/logback-core-1.0.13.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -945c6dc3c10d3ce784d456a8bbbd0262 diff --git a/third_party/logback/logback-core-1.3.4.jar.md5 b/third_party/logback/logback-core-1.3.4.jar.md5 new file mode 100644 index 0000000000..0e85214d09 --- /dev/null +++ b/third_party/logback/logback-core-1.3.4.jar.md5 @@ -0,0 +1 @@ +bbb33326f538cfd28186d5b4310b44fa \ No newline at end of file diff --git a/third_party/mockito/include.mk b/third_party/mockito/include.mk index 8f2e8591be..7c748fd95a 100644 --- a/third_party/mockito/include.mk +++ b/third_party/mockito/include.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2015 The OpenTSDB Authors. +# Copyright (C) 2015-2022 The OpenTSDB Authors. # # This library is free software: you can redistribute it and/or modify it # under the terms of the GNU Lesser General Public License as published diff --git a/third_party/mockito/mockito-1.9.0.jar.md5 b/third_party/mockito/mockito-1.9.0.jar.md5 deleted file mode 100644 index ac7d0ea553..0000000000 --- a/third_party/mockito/mockito-1.9.0.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -cab21b44958a173a5b1d55a6aff0ab54 diff --git a/third_party/mockito/mockito-core-1.10.19.jar.md5 b/third_party/mockito/mockito-core-1.10.19.jar.md5 new file mode 100644 index 0000000000..796a95485d --- /dev/null +++ b/third_party/mockito/mockito-core-1.10.19.jar.md5 @@ -0,0 +1 @@ +c1967f0a515c4b8155f62478ec823464 diff --git a/third_party/slf4j/include.mk b/third_party/slf4j/include.mk index 49743b486a..7fa319e9d3 100644 --- a/third_party/slf4j/include.mk +++ b/third_party/slf4j/include.mk @@ -13,7 +13,7 @@ # You should have received a copy of the GNU Lesser General Public License # along with this library. If not, see . -SLF4J_VERSION = 1.7.7 +SLF4J_VERSION = 2.0.6 LOG4J_OVER_SLF4J_VERSION := $(SLF4J_VERSION) diff --git a/third_party/slf4j/log4j-over-slf4j-1.7.2.jar.md5 b/third_party/slf4j/log4j-over-slf4j-1.7.2.jar.md5 deleted file mode 100644 index 3b024cdfe3..0000000000 --- a/third_party/slf4j/log4j-over-slf4j-1.7.2.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -cbd407d8ff67a6d54fd233fc0e0d8228 diff --git a/third_party/slf4j/log4j-over-slf4j-2.0.6.jar.md5 b/third_party/slf4j/log4j-over-slf4j-2.0.6.jar.md5 new file mode 100644 index 0000000000..0608e24c10 --- /dev/null +++ b/third_party/slf4j/log4j-over-slf4j-2.0.6.jar.md5 @@ -0,0 +1 @@ +a5ccd131feef393a926dcdfc80436d08 \ No newline at end of file diff --git a/third_party/slf4j/slf4j-api-1.7.2.jar.md5 b/third_party/slf4j/slf4j-api-1.7.2.jar.md5 deleted file mode 100644 index 4853af80dc..0000000000 --- a/third_party/slf4j/slf4j-api-1.7.2.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -ebf348e2831a3b610860fa134ad6f67f diff --git a/third_party/slf4j/slf4j-api-2.0.6.jar.md5 b/third_party/slf4j/slf4j-api-2.0.6.jar.md5 new file mode 100644 index 0000000000..31ad90d856 --- /dev/null +++ b/third_party/slf4j/slf4j-api-2.0.6.jar.md5 @@ -0,0 +1 @@ +0dd65c386e8c5f4e6e014de3f7a7ae60 \ No newline at end of file