This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new e23fb3c HDDS-5473. Bump jetty version to 9.4.43.v20210629 (#2449)
e23fb3c is described below
commit e23fb3c9ee8587564529aa93a3849911660e0114
Author: Elek, Márton <[email protected]>
AuthorDate: Fri Aug 6 08:34:32 2021 +0200
HDDS-5473. Bump jetty version to 9.4.43.v20210629 (#2449)
Co-authored-by: Doroszlai, Attila <[email protected]>
---
hadoop-ozone/dist/src/main/license/jar-report.txt | 46 +++++++++++-----------
.../dist/src/main/license/update-jar-report.sh | 2 +-
pom.xml | 2 +-
3 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt
b/hadoop-ozone/dist/src/main/license/jar-report.txt
index 8233966..ec949fd 100644
--- a/hadoop-ozone/dist/src/main/license/jar-report.txt
+++ b/hadoop-ozone/dist/src/main/license/jar-report.txt
@@ -1,11 +1,10 @@
-share/ozone/lib/FastInfoset.jar
share/ozone/lib/accessors-smart.jar
share/ozone/lib/activation.jar
share/ozone/lib/animal-sniffer-annotations.jar
share/ozone/lib/annotations.jar
share/ozone/lib/annotations.jar
-share/ozone/lib/aopalliance-repackaged.jar
share/ozone/lib/aopalliance.jar
+share/ozone/lib/aopalliance-repackaged.jar
share/ozone/lib/asm.jar
share/ozone/lib/aspectjrt.jar
share/ozone/lib/aspectjweaver.jar
@@ -38,20 +37,21 @@ share/ozone/lib/disruptor.jar
share/ozone/lib/dnsjava.jar
share/ozone/lib/error_prone_annotations.jar
share/ozone/lib/failureaccess.jar
+share/ozone/lib/FastInfoset.jar
share/ozone/lib/grpc-api.jar
share/ozone/lib/grpc-context.jar
share/ozone/lib/grpc-core.jar
share/ozone/lib/grpc-netty.jar
-share/ozone/lib/grpc-protobuf-lite.jar
share/ozone/lib/grpc-protobuf.jar
+share/ozone/lib/grpc-protobuf-lite.jar
share/ozone/lib/grpc-stub.jar
share/ozone/lib/gson.jar
share/ozone/lib/guava-jre.jar
share/ozone/lib/guice-assistedinject.jar
share/ozone/lib/guice-bridge.jar
+share/ozone/lib/guice.jar
share/ozone/lib/guice-multibindings.jar
share/ozone/lib/guice-servlet.jar
-share/ozone/lib/guice.jar
share/ozone/lib/hadoop-annotations.jar
share/ozone/lib/hadoop-auth.jar
share/ozone/lib/hadoop-common.jar
@@ -121,20 +121,20 @@ share/ozone/lib/jersey-media-json-jackson.jar
share/ozone/lib/jersey-server.jar
share/ozone/lib/jersey-server.jar
share/ozone/lib/jersey-servlet.jar
-share/ozone/lib/jetty-http.v20201120.jar
-share/ozone/lib/jetty-io.v20201120.jar
-share/ozone/lib/jetty-security.v20201120.jar
-share/ozone/lib/jetty-server.v20201120.jar
-share/ozone/lib/jetty-servlet.v20201120.jar
-share/ozone/lib/jetty-util-ajax.v20201120.jar
-share/ozone/lib/jetty-util.v20201120.jar
-share/ozone/lib/jetty-webapp.v20201120.jar
-share/ozone/lib/jetty-xml.v20201120.jar
+share/ozone/lib/jetty-http.jar
+share/ozone/lib/jetty-io.jar
+share/ozone/lib/jetty-security.jar
+share/ozone/lib/jetty-server.jar
+share/ozone/lib/jetty-servlet.jar
+share/ozone/lib/jetty-util-ajax.jar
+share/ozone/lib/jetty-util.jar
+share/ozone/lib/jetty-webapp.jar
+share/ozone/lib/jetty-xml.jar
share/ozone/lib/jmespath-java.jar
share/ozone/lib/joda-time.jar
share/ozone/lib/jooq-codegen.jar
-share/ozone/lib/jooq-meta.jar
share/ozone/lib/jooq.jar
+share/ozone/lib/jooq-meta.jar
share/ozone/lib/jsch.jar
share/ozone/lib/json-smart.jar
share/ozone/lib/jsp-api.jar
@@ -164,17 +164,17 @@ share/ozone/lib/log4j.jar
share/ozone/lib/metainf-services.jar
share/ozone/lib/metrics-core.jar
share/ozone/lib/netty-buffer.Final.jar
-share/ozone/lib/netty-codec-http.Final.jar
+share/ozone/lib/netty-codec.Final.jar
share/ozone/lib/netty-codec-http2.Final.jar
+share/ozone/lib/netty-codec-http.Final.jar
share/ozone/lib/netty-codec-socks.Final.jar
-share/ozone/lib/netty-codec.Final.jar
share/ozone/lib/netty-common.Final.jar
-share/ozone/lib/netty-handler-proxy.Final.jar
share/ozone/lib/netty-handler.Final.jar
+share/ozone/lib/netty-handler-proxy.Final.jar
share/ozone/lib/netty-resolver.Final.jar
+share/ozone/lib/netty-transport.Final.jar
share/ozone/lib/netty-transport-native-epoll.Final.jar
share/ozone/lib/netty-transport-native-unix-common.Final.jar
-share/ozone/lib/netty-transport.Final.jar
share/ozone/lib/nimbus-jose-jwt.jar
share/ozone/lib/okhttp.jar
share/ozone/lib/okio.jar
@@ -195,16 +195,16 @@ share/ozone/lib/ozone-insight.jar
share/ozone/lib/ozone-interface-client.jar
share/ozone/lib/ozone-interface-storage.jar
share/ozone/lib/ozone-manager.jar
-share/ozone/lib/ozone-recon.jar
share/ozone/lib/ozone-reconcodegen.jar
+share/ozone/lib/ozone-recon.jar
share/ozone/lib/ozone-s3gateway.jar
share/ozone/lib/ozone-tools.jar
share/ozone/lib/perfmark-api.jar
share/ozone/lib/picocli.jar
-share/ozone/lib/proto-google-common-protos.jar
-share/ozone/lib/protobuf-java-util.jar
share/ozone/lib/protobuf-java.jar
share/ozone/lib/protobuf-java.jar
+share/ozone/lib/protobuf-java-util.jar
+share/ozone/lib/proto-google-common-protos.jar
share/ozone/lib/ratis-client.jar
share/ozone/lib/ratis-common.jar
share/ozone/lib/ratis-grpc.jar
@@ -218,9 +218,9 @@ share/ozone/lib/ratis-tools.jar
share/ozone/lib/re2j.jar
share/ozone/lib/reflections.jar
share/ozone/lib/rocksdbjni.jar
-share/ozone/lib/simpleclient.jar
share/ozone/lib/simpleclient_common.jar
share/ozone/lib/simpleclient_dropwizard.jar
+share/ozone/lib/simpleclient.jar
share/ozone/lib/slf4j-api.jar
share/ozone/lib/slf4j-log4j12.jar
share/ozone/lib/snakeyaml.jar
@@ -231,8 +231,8 @@ share/ozone/lib/spring-jcl.RELEASE.jar
share/ozone/lib/spring-jdbc.RELEASE.jar
share/ozone/lib/spring-tx.RELEASE.jar
share/ozone/lib/sqlite-jdbc.jar
-share/ozone/lib/stax-ex.jar
share/ozone/lib/stax2-api.jar
+share/ozone/lib/stax-ex.jar
share/ozone/lib/token-provider.jar
share/ozone/lib/txw2.jar
share/ozone/lib/weld-servlet.Final.jar
diff --git a/hadoop-ozone/dist/src/main/license/update-jar-report.sh
b/hadoop-ozone/dist/src/main/license/update-jar-report.sh
index 9e0d9c4..dfd68a2 100755
--- a/hadoop-ozone/dist/src/main/license/update-jar-report.sh
+++ b/hadoop-ozone/dist/src/main/license/update-jar-report.sh
@@ -30,4 +30,4 @@ cd "$OZONE_DIST_DIR"
#sed expression removes the version. Usually license is not changed with
version bumps
#jacoco and test dependencies are excluded
-find . -type f -name "*.jar" | cut -c3- | perl -wpl -e
's/-[0-9]+(.[0-9]+)*(-([0-9a-z]+-)?SNAPSHOT)?+//g' | grep -v -e jacoco -e
hdds-test-utils | sort > "$SCRIPTDIR"/$REPORT_NAME
+find . -type f -name "*.jar" | cut -c3- | perl -wpl -e
's/-[0-9]+(.[0-9]+)*(-([0-9a-z]+-)?SNAPSHOT)?+//g; s/\.v\d+\.jar/.jar/g;' |
grep -v -e jacoco -e hdds-test-utils | sort > "$SCRIPTDIR"/$REPORT_NAME
diff --git a/pom.xml b/pom.xml
index fffdd37..c7d270e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
<failIfNoTests>false</failIfNoTests>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
- <jetty.version>9.4.35.v20201120</jetty.version>
+ <jetty.version>9.4.43.v20210629</jetty.version>
<test.exclude>_</test.exclude>
<test.exclude.pattern>_</test.exclude.pattern>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
