You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by wu...@apache.org on 2022/04/05 11:54:45 UTC
[skywalking] branch deps created (now e156991fa5)
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a change to branch deps
in repository https://gitbox.apache.org/repos/asf/skywalking.git
at e156991fa5 Bump up versions for Apache httpclient, commons-io, postgresql, log4j2(test codes)
This branch includes the following new commits:
new e156991fa5 Bump up versions for Apache httpclient, commons-io, postgresql, log4j2(test codes)
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[skywalking] 01/01: Bump up versions for Apache httpclient, commons-io, postgresql, log4j2(test codes)
Posted by wu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch deps
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit e156991fa55159958b61b142673c1f99e1502926
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Tue Apr 5 19:54:30 2022 +0800
Bump up versions for Apache httpclient, commons-io, postgresql, log4j2(test codes)
---
CHANGES.md | 6 ++++--
apm-webapp/pom.xml | 2 +-
dist-material/release-docs/LICENSE | 5 +++--
oap-server-bom/pom.xml | 4 ++--
pom.xml | 2 +-
test/e2e-v2/java-test-service/e2e-service-provider/pom.xml | 2 +-
tools/dependencies/known-oap-backend-dependencies.txt | 4 ++--
7 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 9351ea9bbf..d4686220dd 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -32,9 +32,11 @@ Release Notes.
* Improve CI with the GHA new feature "run failed jobs".
* Fix `./mvnw compile` not work if `./mvnw install` is not executed at least once.
* Add `JD_PRESERVE_LINE_FEEDS=true` in official code style file.
-* Upgrade OAP dependencies gson(2.9.0), guava(31.1), jackson(2.13.2), protobuf-java(3.18.4).
+* Upgrade OAP dependencies gson(2.9.0), guava(31.1), jackson(2.13.2), protobuf-java(3.18.4), commons-io(2.7),
+ postgresql(42.3.3).
* Remove commons-pool and commons-dbcp from OAP dependencies(Not used before).
-* Upgrade webapp dependencies gson(2.9.0), spring boot(2.6.6), jackson(2.13.2.2), spring cloud(2021.0.1).
+* Upgrade webapp dependencies gson(2.9.0), spring boot(2.6.6), jackson(2.13.2.2), spring cloud(2021.0.1), Apache
+ httpclient(4.5.13).
#### OAP Server
diff --git a/apm-webapp/pom.xml b/apm-webapp/pom.xml
index 29099b6d23..e34baba6a6 100644
--- a/apm-webapp/pom.xml
+++ b/apm-webapp/pom.xml
@@ -33,7 +33,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.boot.version>2.6.6</spring.boot.version>
<gson.version>2.9.0</gson.version>
- <apache-httpclient.version>4.5.3</apache-httpclient.version>
+ <apache-httpclient.version>4.5.13</apache-httpclient.version>
<spring-cloud-dependencies.version>2021.0.1</spring-cloud-dependencies.version>
<frontend-maven-plugin.version>1.12.1</frontend-maven-plugin.version>
<logback-classic.version>1.2.3</logback-classic.version>
diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE
index 995e715a00..4535bb7417 100755
--- a/dist-material/release-docs/LICENSE
+++ b/dist-material/release-docs/LICENSE
@@ -249,11 +249,12 @@ The text of each license is the standard Apache 2.0 license.
Apache: zookeeper 3.5.7: https://github.com/apache/zookeeper, Apache 2.0
Apache: commons-collections 3.2.2: https://github.com/apache/commons-collections, Apache 2.0
Apache: commons-configuration 1.8: https://github.com/apache/commons-configuration, Apache 2.0
- Apache: commons-io 2.4: https://github.com/apache/commons-io, Apache 2.0
+ Apache: commons-io 2.7: https://github.com/apache/commons-io, Apache 2.0
Apache: commons-compress 1.21: https://github.com/apache/commons-compress, Apache 2.0
Apache: commons-collections4 4.4: https://mvnrepository.com/artifact/org.apache.commons/commons-collections4, Apache 2.0
Apache: freemarker 2.3.28: https://github.com/apache/freemarker, Apache 2.0
Apache: Tomcat-embed 9.0.56 https://tomcat.apache.org, Apache 2.0
+ Apache: httpclient 4.5.13 https://hc.apache.org/, Apache 2.0
netty 4.1.68: https://github.com/netty/netty/blob/4.1/LICENSE.txt, Apache 2.0
netty: netty-tcnative-boringssl-static 2.0.43: https://github.com/netty/netty-tcnative, Apache 2.0
annotations 13.0: http://www.jetbrains.org, Apache 2.0
@@ -372,7 +373,7 @@ The text of each license is also included at licenses/LICENSE-[project].txt.
Google: protobuf-java-util 3.19.4: https://github.com/google/protobuf/blob/master/java/pom.xml , BSD-3-Clause
zstd-jni 1.4.3-1: https://github.com/luben/zstd-jni, BSD-3-Clause
- postgresql 42.3.2: https://jdbc.postgresql.org/about/license.html, BSD-2-Clause
+ postgresql 42.3.3: https://jdbc.postgresql.org/about/license.html, BSD-2-Clause
LatencyUtils 2.0.3: https://github.com/LatencyUtils/LatencyUtils, BSD-2-Clause
========================================================================
diff --git a/oap-server-bom/pom.xml b/oap-server-bom/pom.xml
index 0dbe6eb2f8..e75686d2c1 100644
--- a/oap-server-bom/pom.xml
+++ b/oap-server-bom/pom.xml
@@ -46,7 +46,7 @@
<commons-codec.version>1.11</commons-codec.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<netty-tcnative-boringssl-static.version>2.0.43.Final</netty-tcnative-boringssl-static.version>
- <commons-io.version>2.6</commons-io.version>
+ <commons-io.version>2.7</commons-io.version>
<kubernetes.version>14.0.0</kubernetes.version>
<hikaricp.version>3.1.0</hikaricp.version>
<zipkin.version>2.9.1</zipkin.version>
@@ -70,7 +70,7 @@
<mvel.version>2.4.8.Final</mvel.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<flatbuffers-java.version>1.12.0</flatbuffers-java.version>
- <postgresql.version>42.3.2</postgresql.version>
+ <postgresql.version>42.3.3</postgresql.version>
<jetcd.version>0.5.3</jetcd.version>
<testcontainers.version>1.15.3</testcontainers.version>
<armeria.version>1.14.1</armeria.version>
diff --git a/pom.xml b/pom.xml
index 55d8770b1a..b9f0b24b70 100755
--- a/pom.xml
+++ b/pom.xml
@@ -149,7 +149,7 @@
<compiler.version>1.8</compiler.version>
<powermock.version>2.0.7</powermock.version>
<checkstyle.version>6.18</checkstyle.version>
- <junit.version>4.12</junit.version>
+ <junit.version>4.13.1</junit.version>
<mockito-core.version>3.5.13</mockito-core.version>
<lombok.version>1.18.22</lombok.version>
diff --git a/test/e2e-v2/java-test-service/e2e-service-provider/pom.xml b/test/e2e-v2/java-test-service/e2e-service-provider/pom.xml
index 27171d571b..cc43d409b3 100644
--- a/test/e2e-v2/java-test-service/e2e-service-provider/pom.xml
+++ b/test/e2e-v2/java-test-service/e2e-service-provider/pom.xml
@@ -35,7 +35,7 @@
<properties>
<log4j.version>1.2.17</log4j.version>
- <log4j2.version>2.7</log4j2.version>
+ <log4j2.version>2.17.1</log4j2.version>
<logback.version>1.2.3</logback.version>
</properties>
diff --git a/tools/dependencies/known-oap-backend-dependencies.txt b/tools/dependencies/known-oap-backend-dependencies.txt
index 6dec58acc5..5940193a8e 100755
--- a/tools/dependencies/known-oap-backend-dependencies.txt
+++ b/tools/dependencies/known-oap-backend-dependencies.txt
@@ -26,7 +26,7 @@ commons-beanutils-1.9.4.jar
commons-codec-1.11.jar
commons-collections4-4.4.jar
commons-compress-1.21.jar
-commons-io-2.6.jar
+commons-io-2.7.jar
commons-lang3-3.12.0.jar
commons-logging-1.2.jar
commons-text-1.4.jar
@@ -132,7 +132,7 @@ netty-transport-native-unix-common-4.1.68.Final-linux-x86_64.jar
okhttp-3.14.9.jar
okio-1.17.2.jar
perfmark-api-0.23.0.jar
-postgresql-42.3.2.jar
+postgresql-42.3.3.jar
proto-google-common-protos-2.0.1.jar
protobuf-java-3.19.4.jar
protobuf-java-util-3.19.4.jar