Skip to content

Commit 16d827b

Browse files
committed
Update some dependencies for OpenTSDB#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.
1 parent a82a4f8 commit 16d827b

28 files changed

+26
-23
lines changed

src/tsd/HttpJsonSerializer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -859,7 +859,7 @@ public Object call(final ArrayList<Object> deferreds) throws Exception {
859859
final double value = dp.doubleValue();
860860
if (Double.isNaN(value) &&
861861
orig_query.fillPolicy() == FillPolicy.NULL) {
862-
json.writeNumberField(Long.toString(timestamp), null);
862+
json.writeNullField(Long.toString(timestamp));
863863
} else {
864864
json.writeNumberField(Long.toString(timestamp), dp.doubleValue());
865865
}

test/core/LongHistogramDataPointForTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
import java.util.Map;
1919

2020
import org.hbase.async.Bytes;
21+
import org.junit.Ignore;
2122

23+
@Ignore
2224
public class LongHistogramDataPointForTest implements Histogram {
2325
private final int id;
2426
private long data;

test/core/LongHistogramDataPointForTestDecoder.java

+3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
// see <http://www.gnu.org/licenses/>.
1313
package net.opentsdb.core;
1414

15+
import org.junit.Ignore;
16+
17+
@Ignore
1518
public class LongHistogramDataPointForTestDecoder extends HistogramDataPointCodec {
1619

1720
@Override
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
5b730d97e4e6368069de1983937c508e

third_party/apache/include.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2011-2013 The OpenTSDB Authors.
1+
# Copyright (C) 2011-2022 The OpenTSDB Authors.
22
#
33
# Redistribution and use in source and binary forms, with or without
44
# modification, are permitted provided that the following conditions are met:
@@ -22,7 +22,7 @@
2222
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
2323
# POSSIBILITY OF SUCH DAMAGE.
2424

25-
APACHE_MATH_VERSION := 3.4.1
25+
APACHE_MATH_VERSION := 3.6.1
2626
APACHE_MATH := third_party/apache/commons-math3-$(APACHE_MATH_VERSION).jar
2727
APACHE_MATH_BASE_URL := https://repo1.maven.org/maven2/org/apache/commons/commons-math3/$(APACHE_MATH_VERSION)
2828

third_party/gwt/gwt-dev-2.5.0.jar.md5

-1
This file was deleted.

third_party/gwt/gwt-user-2.5.0.jar.md5

-1
This file was deleted.

third_party/gwt/include.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2011-2012 The OpenTSDB Authors.
1+
# Copyright (C) 2011-2023 The OpenTSDB Authors.
22
#
33
# This library is free software: you can redistribute it and/or modify it
44
# under the terms of the GNU Lesser General Public License as published
@@ -13,7 +13,7 @@
1313
# You should have received a copy of the GNU Lesser General Public License
1414
# along with this library. If not, see <http://www.gnu.org/licenses/>.
1515

16-
GWT_VERSION := 2.6.0
16+
GWT_VERSION := 2.6.1
1717

1818
GWT_DEV_VERSION := $(GWT_VERSION)
1919
GWT_DEV := third_party/gwt/gwt-dev-$(GWT_DEV_VERSION).jar

third_party/jackson/include.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2011-2014 The OpenTSDB Authors.
1+
# Copyright (C) 2011-2022 The OpenTSDB Authors.
22
#
33
# This library is free software: you can redistribute it and/or modify it
44
# under the terms of the GNU Lesser General Public License as published
@@ -13,7 +13,7 @@
1313
# You should have received a copy of the GNU Lesser General Public License
1414
# along with this library. If not, see <http://www.gnu.org/licenses/>.
1515

16-
JACKSON_VERSION := 2.9.5
16+
JACKSON_VERSION := 2.14.1
1717

1818
JACKSON_ANNOTATIONS_VERSION = $(JACKSON_VERSION)
1919
JACKSON_ANNOTATIONS := third_party/jackson/jackson-annotations-$(JACKSON_ANNOTATIONS_VERSION).jar
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
da4742ba6aeb24bf1bd29382fd95647b

third_party/jackson/jackson-annotations-2.4.3.jar.md5

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
f9604a5f31129cdb7db4bdec90111850

third_party/jackson/jackson-core-2.4.3.jar.md5

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
3e3e7aab8799ccc169b10f244e6fb5b4

third_party/jackson/jackson-databind-2.4.3.jar.md5

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
040b4b4d8eac886f6b4a2a3bd2f31b00

third_party/jexl/include.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2015 The OpenTSDB Authors.
1+
# Copyright (C) 2015-2023 The OpenTSDB Authors.
22
#
33
# This library is free software: you can redistribute it and/or modify it
44
# under the terms of the GNU Lesser General Public License as published
@@ -23,7 +23,7 @@ $(JEXL): $(JEXL).md5
2323
THIRD_PARTY += $(JEXL)
2424

2525
# In here as Jexl depends on it and no one else (for now, I hope)
26-
COMMONS_LOGGING_VERSION := 1.1.1
26+
COMMONS_LOGGING_VERSION := 1.2
2727
COMMONS_LOGGING := third_party/jexl/commons-logging-$(COMMONS_LOGGING_VERSION).jar
2828
COMMONS_LOGGING_BASE_URL := https://repo1.maven.org/maven2/commons-logging/commons-logging/$(COMMONS_LOGGING_VERSION)
2929

third_party/logback/include.mk

+2-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2015 The OpenTSDB Authors.
1+
# Copyright (C) 2015-2022 The OpenTSDB Authors.
22
#
33
# This library is free software: you can redistribute it and/or modify it
44
# under the terms of the GNU Lesser General Public License as published
@@ -12,9 +12,7 @@
1212
#
1313
# You should have received a copy of the GNU Lesser General Public License
1414
# along with this library. If not, see <http://www.gnu.org/licenses/>.
15-
16-
https://repo1.maven.org/maven2/ch/qos/logback/logback-classic/1.2.9/logback-classic-1.2.9.jar
17-
LOGBACK_VERSION := 1.2.9
15+
LOGBACK_VERSION := 1.3.4
1816

1917
LOGBACK_CLASSIC_VERSION := $(LOGBACK_VERSION)
2018
LOGBACK_CLASSIC := third_party/logback/logback-classic-$(LOGBACK_CLASSIC_VERSION).jar

third_party/logback/logback-classic-1.0.13.jar.md5

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0b98f1f2ad1caa97556b979598038d3d

third_party/logback/logback-core-1.0.13.jar.md5

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bbb33326f538cfd28186d5b4310b44fa

third_party/slf4j/include.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# You should have received a copy of the GNU Lesser General Public License
1414
# along with this library. If not, see <http://www.gnu.org/licenses/>.
1515

16-
SLF4J_VERSION = 1.7.7
16+
SLF4J_VERSION = 2.0.6
1717

1818

1919
LOG4J_OVER_SLF4J_VERSION := $(SLF4J_VERSION)

third_party/slf4j/log4j-over-slf4j-1.7.2.jar.md5

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
a5ccd131feef393a926dcdfc80436d08

third_party/slf4j/slf4j-api-1.7.2.jar.md5

-1
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
0dd65c386e8c5f4e6e014de3f7a7ae60

0 commit comments

Comments
 (0)