You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2019/11/17 15:18:36 UTC
[skywalking] branch master updated: Update joda lib to fix UTC
+13/+14 bug (#3876)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 2c4caed Update joda lib to fix UTC +13/+14 bug (#3876)
2c4caed is described below
commit 2c4caedabb9087fddbe2574d5350ffb355d240f7
Author: 吴晟 Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Nov 17 23:18:28 2019 +0800
Update joda lib to fix UTC +13/+14 bug (#3876)
* Update joda lib to fix UTC 13/14 bug
* Change the dependencies file.
---
apm-dist/release-docs/LICENSE | 2 +-
oap-server/pom.xml | 2 +-
tools/dependencies/known-oap-backend-dependencies.txt | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/apm-dist/release-docs/LICENSE b/apm-dist/release-docs/LICENSE
index 81045f2..9e2186e 100755
--- a/apm-dist/release-docs/LICENSE
+++ b/apm-dist/release-docs/LICENSE
@@ -250,7 +250,7 @@ The text of each license is the standard Apache 2.0 license.
LMAX Ltd.(disruptor) 3.3.6: https://github.com/LMAX-Exchange/disruptor , Apache 2.0
Eclipse (Jetty) 3.3.6: https://www.eclipse.org/jetty/ , Apache 2.0 and Eclipse Public License 1.0
SnakeYAML 1.18: http://www.snakeyaml.org , Apache 2.0
- Joda-Time 2.9.9: http://www.joda.org/joda-time/ , Apache 2.0
+ Joda-Time 2.10.5: http://www.joda.org/joda-time/ , Apache 2.0
Joda-Convert 1.2: http://www.joda.org/joda-convert/ , Apache 2.0
Spring Framework 4.3.14.RELEASE: https://github.com/spring-projects/spring-framework, Apache 2.0
Spring Boot 1.5.10: https://spring.io/, Apache 2.0
diff --git a/oap-server/pom.xml b/oap-server/pom.xml
index 4bf6109..d013ea2 100755
--- a/oap-server/pom.xml
+++ b/oap-server/pom.xml
@@ -63,7 +63,7 @@
<commons-dbcp.version>1.4</commons-dbcp.version>
<commons-io.version>2.6</commons-io.version>
<elasticsearch.version>6.3.2</elasticsearch.version>
- <joda-time.version>2.9.9</joda-time.version>
+ <joda-time.version>2.10.5</joda-time.version>
<kubernetes.version>4.0.0</kubernetes.version>
<hikaricp.version>3.1.0</hikaricp.version>
<zipkin.version>2.9.1</zipkin.version>
diff --git a/tools/dependencies/known-oap-backend-dependencies.txt b/tools/dependencies/known-oap-backend-dependencies.txt
index d730f9a..98ea52f 100755
--- a/tools/dependencies/known-oap-backend-dependencies.txt
+++ b/tools/dependencies/known-oap-backend-dependencies.txt
@@ -83,7 +83,7 @@ jetty-util-9.4.2.v20170220.jar
jline-0.9.94.jar
jna-4.5.1.jar
joda-convert-1.2.jar
-joda-time-2.9.9.jar
+joda-time-2.10.5.jar
jopt-simple-4.6.jar
json-flattener-0.6.0.jar
jsr305-1.3.9.jar