You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/05/17 12:42:51 UTC
[incubator-linkis] branch master updated: [Bug-2110] Remove maven-warpper.jar & upgrade py4j-*-src.zip (#2113) (#2123)
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/master by this push:
new 4a3fb0772 [Bug-2110] Remove maven-warpper.jar & upgrade py4j-*-src.zip (#2113) (#2123)
4a3fb0772 is described below
commit 4a3fb0772cbc4e72a1687c81a15b93577420db80
Author: peacewong <wp...@gmail.com>
AuthorDate: Tue May 17 20:42:45 2022 +0800
[Bug-2110] Remove maven-warpper.jar & upgrade py4j-*-src.zip (#2113) (#2123)
* remove maven-warpper.jar & upgrade py4j-*-src.zip
* udpate LICENSE
Co-authored-by: Casion <ca...@gmail.com>
---
.mvn/wrapper/maven-wrapper.jar | Bin 50710 -> 0 bytes
LICENSE | 15 ++++++++++++---
.../LICENSE-py4j-0.10.9.5-src.txt | 2 +-
.../python/src/main/py4j/py4j-0.10.7-src.zip | Bin 42437 -> 0 bytes
.../python/src/main/py4j/py4j-0.10.9.5-src.zip | Bin 0 -> 42404 bytes
5 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar
deleted file mode 100644
index 2cc7d4a55..000000000
Binary files a/.mvn/wrapper/maven-wrapper.jar and /dev/null differ
diff --git a/LICENSE b/LICENSE
index b5f5937e5..5371e073b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -216,13 +216,14 @@ BSD licenses
========================================================================
The following components are provided under the BSD License.
- linkis-engineconn-plugins/engineconn-plugins/python/src/main/py4j/py4j-*-src.zip(See linkis-engineconn-plugins/engineconn-plugins/python/src/main/py4j/LICENSE-py4j-0.10.7-src.txt for text of this license)
+ linkis-engineconn-plugins/engineconn-plugins/python/src/main/py4j/py4j-*-src.zip
+ (See licenses/LICENSE-py4j-*-src.txt for text of this license)
========================================================================
Apache 2.0 licenses
========================================================================
-The following file are provided under the Apache 2.0 License.
+The following file are provided under the Apache 2.0 License.
web/.editorconfig
web/.env
web/.eslintignore
@@ -234,5 +235,13 @@ The following file are provided under the Apache 2.0 License.
web/src/common/i18n/zh.json
web/src/config.json
web/public/favicon.ico
- Maven Wrapper(mvnw, mvnw.cmd, .mvn/* files in root path), https://github.com/takari/maven-wrapper Apache 2.0
+
+
+The files:
+.mvn/wrapper/MavenWrapperDownloader.java
+.mvn/wrapper/maven-wrapper.properties
+mvnw
+mvnw.cmd
+Are provided from the Github Project: https://github.com/takari/maven-wrapper
+which is distributed under the Apache 2.0 license.
diff --git a/linkis-engineconn-plugins/engineconn-plugins/python/src/main/py4j/LICENSE-py4j-0.10.7-src.txt b/licenses/LICENSE-py4j-0.10.9.5-src.txt
similarity index 95%
rename from linkis-engineconn-plugins/engineconn-plugins/python/src/main/py4j/LICENSE-py4j-0.10.7-src.txt
rename to licenses/LICENSE-py4j-0.10.9.5-src.txt
index 0f9b96189..e39678248 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/python/src/main/py4j/LICENSE-py4j-0.10.7-src.txt
+++ b/licenses/LICENSE-py4j-0.10.9.5-src.txt
@@ -1,4 +1,4 @@
-Copyright (c) 2009-2018, Barthelemy Dagenais and individual contributors. All
+Copyright (c) 2009-2022, Barthelemy Dagenais and individual contributors. All
rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/linkis-engineconn-plugins/engineconn-plugins/python/src/main/py4j/py4j-0.10.7-src.zip b/linkis-engineconn-plugins/engineconn-plugins/python/src/main/py4j/py4j-0.10.7-src.zip
deleted file mode 100644
index 128e32107..000000000
Binary files a/linkis-engineconn-plugins/engineconn-plugins/python/src/main/py4j/py4j-0.10.7-src.zip and /dev/null differ
diff --git a/linkis-engineconn-plugins/engineconn-plugins/python/src/main/py4j/py4j-0.10.9.5-src.zip b/linkis-engineconn-plugins/engineconn-plugins/python/src/main/py4j/py4j-0.10.9.5-src.zip
new file mode 100644
index 000000000..478d4b09b
Binary files /dev/null and b/linkis-engineconn-plugins/engineconn-plugins/python/src/main/py4j/py4j-0.10.9.5-src.zip differ
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org