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 2021/12/21 04:55:20 UTC
[skywalking] 01/01: Remove unused jars and bump up netty version in webapp
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a commit to branch webapp/chore
in repository https://gitbox.apache.org/repos/asf/skywalking.git
commit 6e346d3602c746f3afa066ac2a92b217df7eb896
Author: kezhenxu94 <ke...@apache.org>
AuthorDate: Tue Dec 21 12:54:55 2021 +0800
Remove unused jars and bump up netty version in webapp
---
apm-webapp/pom.xml | 15 ++++++++++++---
dist-material/release-docs/LICENSE | 1 -
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/apm-webapp/pom.xml b/apm-webapp/pom.xml
index d0055ae..2e5d797 100644
--- a/apm-webapp/pom.xml
+++ b/apm-webapp/pom.xml
@@ -39,6 +39,7 @@
<logback-classic.version>1.2.3</logback-classic.version>
<jackson-version>2.12.2</jackson-version>
<yaml.version>1.28</yaml.version>
+ <netty.version>4.1.68.Final</netty.version>
<ui.path>${project.parent.basedir}/skywalking-ui</ui.path>
</properties>
@@ -52,6 +53,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-bom</artifactId>
+ <version>${netty.version}</version>
+ <scope>import</scope>
+ <type>pom</type>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -75,6 +83,10 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<!-- https://www.cvedetails.com/cve/CVE-2019-17267/ -->
@@ -120,9 +132,6 @@
<build>
<finalName>skywalking-webapp</finalName>
- <resources>
-
- </resources>
<plugins>
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
diff --git a/dist-material/release-docs/LICENSE b/dist-material/release-docs/LICENSE
index c9f241e..a74ee36 100755
--- a/dist-material/release-docs/LICENSE
+++ b/dist-material/release-docs/LICENSE
@@ -320,7 +320,6 @@ The text of each license is the standard Apache 2.0 license.
slf4j-api 1.7.30: http://www.slf4j.org, Apache 2.0
mvel 2.4.8: https://github.com/mvel/mvel, Apache 2.0
okio 1.17.2: https://github.com/square/okio Apache 2.0
- caffeine 2.6.2: https://github.com/ben-manes/caffeine Apache 2.0
simpleclient_httpserver 0.12.0 from prometheus https://github.com/prometheus/client_java Apache 2.0
jetcd 0.5.3, https://github.com/etcd-io/jetcd, Apache 2.0
failasfe 2.3.4, https://github.com/jhalterman/failsafe, Apache 2.0