Skip to content

Commit

Permalink
Update some dependencies for OpenTSDB#2262.
Browse files Browse the repository at this point in the history
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.
Ignore a couple of histogram generating data files.
  • Loading branch information
manolama committed Jan 3, 2023
1 parent a82a4f8 commit 4069aab
Show file tree
Hide file tree
Showing 28 changed files with 29 additions and 26 deletions.
4 changes: 2 additions & 2 deletions src/tsd/HttpJsonSerializer.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is part of OpenTSDB.
// Copyright (C) 2013 The OpenTSDB Authors.
// Copyright (C) 2013-2023 The OpenTSDB Authors.
//
// This program is free software: you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
Expand Down Expand Up @@ -859,7 +859,7 @@ public Object call(final ArrayList<Object> 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());
}
Expand Down
4 changes: 3 additions & 1 deletion test/core/LongHistogramDataPointForTest.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is part of OpenTSDB.
// Copyright (C) 2016-2017 The OpenTSDB Authors.
// Copyright (C) 2016-2023 The OpenTSDB Authors.
//
// This program is free software: you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
Expand All @@ -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;
Expand Down
5 changes: 4 additions & 1 deletion test/core/LongHistogramDataPointForTestDecoder.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// This file is part of OpenTSDB.
// Copyright (C) 2016-2017 The OpenTSDB Authors.
// Copyright (C) 2016-2023 The OpenTSDB Authors.
//
// This program is free software: you can redistribute it and/or modify it
// under the terms of the GNU Lesser General Public License as published by
Expand All @@ -12,6 +12,9 @@
// see <http://www.gnu.org/licenses/>.
package net.opentsdb.core;

import org.junit.Ignore;

@Ignore
public class LongHistogramDataPointForTestDecoder extends HistogramDataPointCodec {

@Override
Expand Down
1 change: 1 addition & 0 deletions third_party/apache/commons-math3-3.6.1.jar.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5b730d97e4e6368069de1983937c508e
4 changes: 2 additions & 2 deletions third_party/apache/include.mk
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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)

Expand Down
1 change: 0 additions & 1 deletion third_party/gwt/gwt-dev-2.5.0.jar.md5

This file was deleted.

1 change: 0 additions & 1 deletion third_party/gwt/gwt-user-2.5.0.jar.md5

This file was deleted.

4 changes: 2 additions & 2 deletions third_party/gwt/include.mk
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -13,7 +13,7 @@
# You should have received a copy of the GNU Lesser General Public License
# along with this library. If not, see <http://www.gnu.org/licenses/>.

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
Expand Down
4 changes: 2 additions & 2 deletions third_party/jackson/include.mk
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -13,7 +13,7 @@
# You should have received a copy of the GNU Lesser General Public License
# along with this library. If not, see <http://www.gnu.org/licenses/>.

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
Expand Down
1 change: 1 addition & 0 deletions third_party/jackson/jackson-annotations-2.14.1.jar.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
da4742ba6aeb24bf1bd29382fd95647b
1 change: 0 additions & 1 deletion third_party/jackson/jackson-annotations-2.4.3.jar.md5

This file was deleted.

1 change: 1 addition & 0 deletions third_party/jackson/jackson-core-2.14.1.jar.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f9604a5f31129cdb7db4bdec90111850
1 change: 0 additions & 1 deletion third_party/jackson/jackson-core-2.4.3.jar.md5

This file was deleted.

1 change: 1 addition & 0 deletions third_party/jackson/jackson-databind-2.14.1.jar.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3e3e7aab8799ccc169b10f244e6fb5b4
1 change: 0 additions & 1 deletion third_party/jackson/jackson-databind-2.4.3.jar.md5

This file was deleted.

1 change: 1 addition & 0 deletions third_party/jexl/commons-logging-1.2.jar.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
040b4b4d8eac886f6b4a2a3bd2f31b00
4 changes: 2 additions & 2 deletions third_party/jexl/include.mk
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (C) 2015 The OpenTSDB Authors.
# Copyright (C) 2015-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
Expand All @@ -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)

Expand Down
6 changes: 2 additions & 4 deletions third_party/logback/include.mk
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -12,9 +12,7 @@
#
# You should have received a copy of the GNU Lesser General Public License
# along with this library. If not, see <http://www.gnu.org/licenses/>.

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
Expand Down
1 change: 0 additions & 1 deletion third_party/logback/logback-classic-1.0.13.jar.md5

This file was deleted.

1 change: 1 addition & 0 deletions third_party/logback/logback-classic-1.3.4.jar.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0b98f1f2ad1caa97556b979598038d3d
1 change: 0 additions & 1 deletion third_party/logback/logback-core-1.0.13.jar.md5

This file was deleted.

1 change: 1 addition & 0 deletions third_party/logback/logback-core-1.3.4.jar.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bbb33326f538cfd28186d5b4310b44fa
File renamed without changes.
2 changes: 1 addition & 1 deletion third_party/slf4j/include.mk
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# You should have received a copy of the GNU Lesser General Public License
# along with this library. If not, see <http://www.gnu.org/licenses/>.

SLF4J_VERSION = 1.7.7
SLF4J_VERSION = 2.0.6


LOG4J_OVER_SLF4J_VERSION := $(SLF4J_VERSION)
Expand Down
1 change: 0 additions & 1 deletion third_party/slf4j/log4j-over-slf4j-1.7.2.jar.md5

This file was deleted.

1 change: 1 addition & 0 deletions third_party/slf4j/log4j-over-slf4j-2.0.6.jar.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
a5ccd131feef393a926dcdfc80436d08
1 change: 0 additions & 1 deletion third_party/slf4j/slf4j-api-1.7.2.jar.md5

This file was deleted.

1 change: 1 addition & 0 deletions third_party/slf4j/slf4j-api-2.0.6.jar.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0dd65c386e8c5f4e6e014de3f7a7ae60

0 comments on commit 4069aab

Please sign in to comment.