You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by pe...@apache.org on 2022/05/13 02:17:20 UTC
[incubator-linkis] branch dev-1.1.2 updated (e0c9310f5 -> c953223af)
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a change to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
from e0c9310f5 Merge pull request #2102 from apache/master
new b37ec5d8b Bump mysql-connector-java (#1947)
new 7cbf51f8b Bump hive-exec in /linkis-engineconn-plugins/engineconn-plugins/hive (#1948)
new e065339a1 Bump hive-exec (#1950)
new 420cff143 Bump hive-jdbc in /linkis-engineconn-plugins/engineconn-plugins/jdbc (#1951)
new 6134ef23b feat(cglib): optimized the cglib (#2016)
new 33b197937 feat(dependency): unify the json4s dependency, and add spark's version commont (#2018)
new 97930c125 set <hive.version>2.3.3</hive.version>
new c953223af update license
The 8 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.
Summary of changes:
LICENSE-binary | 2 +
NOTICE-binary | 9 ++-
...NSE-json4s-core_2.12.txt => LICENSE-tephra.txt} | 2 -
.../{LICENSE-commons-io.txt => LICENSE-twill.txt} | 0
linkis-commons/linkis-module/pom.xml | 5 --
linkis-commons/linkis-rpc/pom.xml | 9 ---
linkis-commons/linkis-storage/pom.xml | 2 +-
.../engineconn-plugins/hive/pom.xml | 4 +
.../engineconn-plugins/jdbc/pom.xml | 2 +-
.../cs/highavailable/DefaultContextHAManager.java | 6 +-
.../highavailable/proxy/MethodInterceptorImpl.java | 7 +-
.../linkis-metadata-manager/service/hive/pom.xml | 5 +-
.../linkis-metadata-manager/service/mysql/pom.xml | 2 +-
pom.xml | 53 +++++++++++--
tool/dependencies/known-dependencies.txt | 91 ++++++++++++++++------
15 files changed, 141 insertions(+), 58 deletions(-)
copy licenses-binary/{LICENSE-json4s-core_2.12.txt => LICENSE-tephra.txt} (99%)
copy licenses-binary/{LICENSE-commons-io.txt => LICENSE-twill.txt} (100%)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 03/08: Bump hive-exec (#1950)
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit e065339a121af5b63e0d9f3af80e22e8fae48fe8
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Sat May 7 14:06:43 2022 +0800
Bump hive-exec (#1950)
Bumps hive-exec from 2.3.3 to 2.3.4.
---
updated-dependencies:
- dependency-name: org.apache.hive:hive-exec
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
---
.../linkis-datasource/linkis-metadata-manager/service/hive/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/pom.xml
index dc36f515d..f46c3b6ed 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/pom.xml
@@ -28,7 +28,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <hive.version>2.3.3</hive.version>
+ <hive.version>2.3.4</hive.version>
<!-- <hive.version>1.2.1</hive.version>-->
<hadoop.version>2.7.2</hadoop.version>
<datanucleus-api-jdo.version>4.2.4</datanucleus-api-jdo.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 05/08: feat(cglib): optimized the cglib (#2016)
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 6134ef23bfad89ac2054a1e12df75811ffa5237e
Author: Jack Xu <xu...@126.com>
AuthorDate: Sat May 7 14:16:36 2022 +0800
feat(cglib): optimized the cglib (#2016)
1. replace the cglib with spring's cglib in linkis-cs-highavailable module, 2. remove cglib
dependency in linkis-module module, it's only used by linkis-storage module
---
linkis-commons/linkis-module/pom.xml | 5 -----
linkis-commons/linkis-storage/pom.xml | 2 +-
.../engineconn-plugins/hive/pom.xml | 4 ++++
.../cs/highavailable/DefaultContextHAManager.java | 6 +++---
.../highavailable/proxy/MethodInterceptorImpl.java | 7 ++++---
.../linkis-metadata-manager/service/hive/pom.xml | 4 ++++
pom.xml | 24 +++++++++++++++++-----
tool/dependencies/known-dependencies.txt | 12 +++++------
8 files changed, 40 insertions(+), 24 deletions(-)
diff --git a/linkis-commons/linkis-module/pom.xml b/linkis-commons/linkis-module/pom.xml
index 75b8cb95e..41a969a8c 100644
--- a/linkis-commons/linkis-module/pom.xml
+++ b/linkis-commons/linkis-module/pom.xml
@@ -314,11 +314,6 @@
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</version>
</dependency>
- <dependency>
- <groupId>cglib</groupId>
- <artifactId>cglib</artifactId>
- <version>2.2.2</version>
- </dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
diff --git a/linkis-commons/linkis-storage/pom.xml b/linkis-commons/linkis-storage/pom.xml
index e61e287c2..4c095c2b8 100644
--- a/linkis-commons/linkis-storage/pom.xml
+++ b/linkis-commons/linkis-storage/pom.xml
@@ -73,8 +73,8 @@
<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
- <version>2.2.2</version>
</dependency>
+
<dependency>
<groupId>com.github.pjfanning</groupId>
<artifactId>excel-streaming-reader</artifactId>
diff --git a/linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml b/linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml
index c1444e4a1..ca1adc8bd 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml
+++ b/linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml
@@ -74,6 +74,10 @@
<artifactId>hive-common</artifactId>
<version>${hive.version}</version>
<exclusions>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-resourcemanager</artifactId>
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java
index aab44195e..f6c056ce4 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/DefaultContextHAManager.java
@@ -28,13 +28,13 @@ import org.apache.linkis.cs.highavailable.proxy.MethodInterceptorImpl;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cglib.proxy.Callback;
+import org.springframework.cglib.proxy.Enhancer;
import org.springframework.stereotype.Component;
-import net.sf.cglib.proxy.Callback;
+import com.google.gson.Gson;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.sf.cglib.proxy.Enhancer;
-import com.google.gson.Gson;
/** ContextService高可用管理器默认实现 采用CGLib动态代理，一般用于CS持久层存储转换，将HAContextID实例进行转换 */
@Component
diff --git a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java
index f3288ccda..a722666ea 100644
--- a/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java
+++ b/linkis-public-enhancements/linkis-context-service/linkis-cs-highavailable/src/main/java/org/apache/linkis/cs/highavailable/proxy/MethodInterceptorImpl.java
@@ -25,11 +25,12 @@ import org.apache.linkis.cs.highavailable.exception.CSErrorCode;
import org.apache.commons.lang.StringUtils;
-import net.sf.cglib.proxy.MethodInterceptor;
+import org.springframework.cglib.proxy.MethodInterceptor;
+import org.springframework.cglib.proxy.MethodProxy;
+
+import com.google.gson.Gson;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import net.sf.cglib.proxy.MethodProxy;
-import com.google.gson.Gson;
import java.lang.reflect.Method;
import java.util.HashMap;
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/pom.xml
index f46c3b6ed..1f4379cc0 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/pom.xml
@@ -97,6 +97,10 @@
<artifactId>hive-common</artifactId>
<version>${hive.version}</version>
<exclusions>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-resourcemanager</artifactId>
diff --git a/pom.xml b/pom.xml
index 3762a9b9d..072ba0a20 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,16 +136,19 @@
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<druid.version>1.1.22</druid.version>
<protobuf.version>3.15.8</protobuf.version>
- <apache-rat-plugin.version>0.13</apache-rat-plugin.version>
- <assembly.package.rootpath>${basedir}</assembly.package.rootpath>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
+ <cglib.version>3.3.0</cglib.version>
+ <asm-bom.version>9.3</asm-bom.version>
<log4j2.version>2.17.2</log4j2.version>
<spotless.version>2.4.2</spotless.version>
<junit5.version>5.7.2</junit5.version>
<mockito.version>3.9.0</mockito.version>
<assertj.version>3.17.2</assertj.version>
<h2.version>1.4.200</h2.version>
+
+ <apache-rat-plugin.version>0.13</apache-rat-plugin.version>
+ <assembly.package.rootpath>${basedir}</assembly.package.rootpath>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<maven-surefire-plugin.version>2.22.1</maven-surefire-plugin.version>
<jacoco.version>0.8.7</jacoco.version>
<jacoco.skip>false</jacoco.skip>
@@ -769,7 +772,18 @@
<type>pom</type>
<scope>import</scope>
</dependency>
-
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>${cglib.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm-bom</artifactId>
+ <version>${asm-bom.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/tool/dependencies/known-dependencies.txt b/tool/dependencies/known-dependencies.txt
index bf7cfcf56..0499d09f0 100644
--- a/tool/dependencies/known-dependencies.txt
+++ b/tool/dependencies/known-dependencies.txt
@@ -22,12 +22,10 @@ apacheds-kerberos-codec-2.0.0-M15.jar
api-asn1-api-1.0.0-M20.jar
api-util-1.0.0-M20.jar
archaius-core-0.7.7.jar
-asm-3.3.1.jar
-asm-analysis-9.0.jar
-asm-commons-3.1.jar
-asm-commons-9.0.jar
-asm-tree-3.1.jar
-asm-tree-9.0.jar
+asm-9.3.jar
+asm-analysis-9.3.jar
+asm-commons-9.3.jar
+asm-tree-9.3.jar
aspectjweaver-1.9.6.jar
audience-annotations-0.5.0.jar
avatica-1.8.0.jar
@@ -42,7 +40,7 @@ caffeine-2.8.8.jar
calcite-core-1.10.0.jar
calcite-druid-1.10.0.jar
calcite-linq4j-1.10.0.jar
-cglib-2.2.2.jar
+cglib-3.3.0.jar
checker-qual-3.4.0.jar
checker-qual-3.5.0.jar
checker-qual-3.8.0.jar
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 08/08: update license
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit c953223afe1b80df8074dae7355a4cba6f0c8285
Author: casionone <ca...@gmail.com>
AuthorDate: Thu May 12 20:26:23 2022 +0800
update license
---
LICENSE-binary | 2 +
NOTICE-binary | 9 +-
licenses-binary/LICENSE-tephra.txt | 176 +++++++++++++++++++++++++++
licenses-binary/LICENSE-twill.txt | 203 +++++++++++++++++++++++++++++++
tool/dependencies/known-dependencies.txt | 79 +++++++++---
5 files changed, 450 insertions(+), 19 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index bf4881d6a..1ab20f914 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -574,6 +574,8 @@ See licenses-binary/ for text of these licenses.
(Apache License, version 2.0) XmlBeans:XmlBeans main jar (org.apache.xmlbeans:xmlbeans:5.0.3 - https://xmlbeans.apache.org/)
(Apache License, version 2.0) XStream Core (com.thoughtworks.xstream:xstream:1.4.18)
(Apache License, version 2.0) Apache ZooKeeper - Server (org.apache.zookeeper:zookeeper:3.4.6 - https://zookeeper.apache.org/)
+ (Apache License, version 2.0) Apache twill (org.apache.twill:* - https://twill.apache.org/)
+ (Apache License, version 2.0) Apache tephra (co.cask.tephra:* - https://tephra.apache.org/)
========================================================================
Third party CDDL licenses
diff --git a/NOTICE-binary b/NOTICE-binary
index bb165b792..a9edaf741 100644
--- a/NOTICE-binary
+++ b/NOTICE-binary
@@ -3440,4 +3440,11 @@ conditions of the subcomponent's license, as noted in the LICENSE file.
"Acegi" or any derivatives thereof may not be used to endorse or
promote products derived from this software without prior written
permission. For written permission, please contact
- ben.alex@springsource.com.
\ No newline at end of file
+ ben.alex@springsource.com.
+
+-------------------------------------- Apache Twill NOTICE --------------------------------------
+Apache Twill
+Copyright 2013-2017 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
\ No newline at end of file
diff --git a/licenses-binary/LICENSE-tephra.txt b/licenses-binary/LICENSE-tephra.txt
new file mode 100644
index 000000000..d9a10c0d8
--- /dev/null
+++ b/licenses-binary/LICENSE-tephra.txt
@@ -0,0 +1,176 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
diff --git a/licenses-binary/LICENSE-twill.txt b/licenses-binary/LICENSE-twill.txt
new file mode 100644
index 000000000..6b0b1270f
--- /dev/null
+++ b/licenses-binary/LICENSE-twill.txt
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
diff --git a/tool/dependencies/known-dependencies.txt b/tool/dependencies/known-dependencies.txt
index 0499d09f0..eb082ad0b 100644
--- a/tool/dependencies/known-dependencies.txt
+++ b/tool/dependencies/known-dependencies.txt
@@ -10,6 +10,7 @@ akka-protobuf_2.11-2.5.21.jar
akka-slf4j_2.11-2.5.21.jar
akka-stream_2.11-2.5.21.jar
annotations-2.0.1.jar
+ant-1.6.5.jar
ant-1.9.1.jar
ant-launcher-1.9.1.jar
antlr-2.7.7.jar
@@ -17,6 +18,7 @@ antlr-runtime-3.4.jar
antlr-runtime-3.5.2.jar
aopalliance-1.0.jar
aopalliance-repackaged-2.4.0-b34.jar
+apache-curator-2.7.1.pom
apacheds-i18n-2.0.0-M15.jar
apacheds-kerberos-codec-2.0.0-M15.jar
api-asn1-api-1.0.0-M20.jar
@@ -31,7 +33,7 @@ audience-annotations-0.5.0.jar
avatica-1.8.0.jar
avatica-metrics-1.8.0.jar
avro-1.7.4.jar
-avro-1.7.5.jar
+avro-1.7.7.jar
bcpkix-jdk15on-1.64.jar
bcprov-jdk15on-1.64.jar
bonecp-0.8.0.RELEASE.jar
@@ -57,7 +59,6 @@ commons-collections4-4.4.jar
commons-compiler-3.1.4.jar
commons-compress-1.20.jar
commons-compress-1.21.jar
-commons-compress-1.4.1.jar
commons-compress-1.9.jar
commons-configuration-1.10.jar
commons-configuration-1.6.jar
@@ -65,6 +66,7 @@ commons-configuration-1.8.jar
commons-daemon-1.0.13.jar
commons-dbcp-1.4.jar
commons-digester-1.8.jar
+commons-el-1.0.jar
commons-exec-1.3.jar
commons-fileupload-1.4.jar
commons-httpclient-3.1.jar
@@ -76,7 +78,6 @@ commons-lang-2.6.jar
commons-lang3-3.10.jar
commons-lang3-3.4.jar
commons-lang3-3.9.jar
-commons-logging-1.1.3.jar
commons-logging-1.2.jar
commons-math-2.2.jar
commons-math3-3.1.1.jar
@@ -89,12 +90,11 @@ curator-client-2.7.1.jar
curator-framework-2.7.1.jar
curator-recipes-2.7.1.jar
curvesapi-1.07.jar
-datanucleus-api-jdo-3.2.6.jar
datanucleus-api-jdo-4.2.4.jar
-datanucleus-core-3.2.10.jar
datanucleus-core-4.1.17.jar
-datanucleus-rdbms-3.2.9.jar
+datanucleus-rdbms-4.1.19.jar
derby-10.14.2.0.jar
+disruptor-3.3.0.jar
dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar
druid-1.1.22.jar
eigenbase-properties-1.1.5.jar
@@ -106,11 +106,13 @@ eureka-core-1.10.14.jar
evictor-1.0.0.jar
excel-streaming-reader-3.6.0.jar
failureaccess-1.0.1.jar
+fastutil-6.5.6.jar
feign-core-10.12.jar
feign-form-3.8.0.jar
feign-form-spring-3.8.0.jar
feign-hystrix-10.12.jar
feign-slf4j-10.12.jar
+findbugs-annotations-1.3.9-1.jar
flink-annotations-1.12.2.jar
flink-clients_2.11-1.12.2.jar
flink-connector-base-1.12.2.jar
@@ -154,6 +156,7 @@ guava-30.0-jre.jar
guava-retrying-2.0.0.jar
guice-3.0.jar
guice-4.1.0.jar
+guice-assistedinject-3.0.jar
guice-servlet-3.0.jar
hadoop-annotations-2.7.2.jar
hadoop-auth-2.7.2.jar
@@ -168,19 +171,36 @@ hadoop-mapreduce-client-shuffle-2.7.2.jar
hadoop-yarn-api-2.7.2.jar
hadoop-yarn-client-2.7.2.jar
hadoop-yarn-common-2.7.2.jar
+hadoop-yarn-registry-2.7.1.jar
hadoop-yarn-server-common-2.7.2.jar
+hbase-annotations-1.1.1.jar
+hbase-client-1.1.1.jar
+hbase-common-1.1.1-tests.jar
+hbase-common-1.1.1.jar
+hbase-hadoop-compat-1.1.1.jar
+hbase-hadoop2-compat-1.1.1.jar
+hbase-prefix-tree-1.1.1.jar
+hbase-procedure-1.1.1.jar
+hbase-protocol-1.1.1.jar
+hbase-server-1.1.1.jar
hibernate-validator-5.1.2.Final.jar
hibernate-validator-6.1.7.Final.jar
-hive-common-1.2.1.jar
hive-common-2.3.3.jar
+hive-common-2.3.4.jar
hive-exec-2.3.3.jar
-hive-jdbc-1.2.1.jar
+hive-jdbc-2.3.4.jar
hive-llap-client-2.3.3.jar
+hive-llap-client-2.3.4.jar
hive-llap-common-2.3.3.jar
+hive-llap-common-2.3.4-tests.jar
+hive-llap-common-2.3.4.jar
+hive-llap-server-2.3.4.jar
hive-llap-tez-2.3.3.jar
-hive-metastore-1.2.1.jar
-hive-serde-1.2.1.jar
-hive-service-1.2.1.jar
+hive-llap-tez-2.3.4.jar
+hive-metastore-2.3.4.jar
+hive-serde-2.3.4.jar
+hive-service-2.3.4.jar
+hive-service-rpc-2.3.4.jar
hive-storage-api-2.4.0.jar
hive-vector-code-gen-2.3.3.jar
hk2-api-2.4.0-b34.jar
@@ -223,7 +243,10 @@ jakarta.servlet-api-4.0.4.jar
jakarta.validation-api-2.0.2.jar
jakarta.websocket-api-1.1.2.jar
jakarta.xml.bind-api-2.3.3.jar
+jamon-runtime-2.3.1.jar
janino-3.1.4.jar
+jasper-compiler-5.5.23.jar
+jasper-runtime-5.5.23.jar
javassist-3.19.0-GA.jar
javassist-3.24.0-GA.jar
javassist-3.27.0-GA.jar
@@ -233,12 +256,16 @@ javax.activation-api-1.2.0.jar
javax.annotation-api-1.3.2.jar
javax.inject-1.jar
javax.inject-2.4.0-b34.jar
+javax.jdo-3.2.0-m3.jar
javax.servlet-3.0.0.v201112011016.jar
javax.ws.rs-api-2.0.1.jar
+javolution-5.5.1.jar
jaxb-api-2.3.1.jar
jaxb-impl-2.2.3-1.jar
jaxb-runtime-2.3.4.jar
jboss-logging-3.4.2.Final.jar
+jcodings-1.0.8.jar
+jcommander-1.30.jar
jdo-api-3.0.1.jar
jersey-apache-client4-1.19.4.jar
jersey-client-1.19.4.jar
@@ -255,6 +282,7 @@ jersey-server-2.23.1.jar
jersey-servlet-1.19.4.jar
jettison-1.1.jar
jettison-1.4.0.jar
+jetty-6.1.26.jar
jetty-all-7.6.0.v20120127.jar
jetty-annotations-9.4.42.v20210604.jar
jetty-client-9.4.42.v20210604.jar
@@ -266,6 +294,8 @@ jetty-security-9.4.42.v20210604.jar
jetty-server-9.4.42.v20210604.jar
jetty-servlet-9.4.42.v20210604.jar
jetty-servlets-9.4.42.v20210604.jar
+jetty-sslengine-6.1.26.jar
+jetty-util-6.1.26.jar
jetty-util-9.4.42.v20210604.jar
jetty-util-ajax-9.4.42.v20210604.jar
jetty-webapp-9.4.42.v20210604.jar
@@ -274,18 +304,20 @@ jline-2.14.6.jar
jna-5.6.0.jar
jna-platform-5.6.0.jar
joda-time-2.3.jar
-joda-time-2.5.jar
joda-time-2.8.1.jar
joda-time-2.9.3.jar
jol-core-0.2.jar
+joni-2.1.2.jar
jpam-1.1.jar
json-0.193.jar
json-1.8.jar
-json-20090211.jar
json4s-ast_2.11-3.5.3.jar
json4s-core_2.11-3.5.3.jar
json4s-jackson_2.11-3.5.3.jar
json4s-scalap_2.11-3.5.3.jar
+jsp-2.1-6.1.14.jar
+jsp-api-2.0.jar
+jsp-api-2.1-6.1.14.jar
jsp-api-2.1.jar
jsqlparser-1.0.jar
jsr305-1.3.9.jar
@@ -298,10 +330,8 @@ kafka-clients-2.5.1.jar
kafka-clients-2.7.0.jar
kryo-2.24.0.jar
leveldbjni-all-1.8.jar
-libfb303-0.9.2.jar
libfb303-0.9.3.jar
libthrift-0.15.0.pom
-libthrift-0.9.2.jar
libthrift-0.9.3.jar
listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar
log-0.193.jar
@@ -316,6 +346,7 @@ lz4-java-1.6.0.jar
lz4-java-1.7.1.jar
mail-1.4.1.jar
mchange-commons-java-0.2.15.jar
+metrics-core-2.2.0.jar
metrics-core-4.1.22.jar
metrics-json-4.1.22.jar
metrics-jvm-4.1.22.jar
@@ -361,7 +392,7 @@ oshi-core-5.3.4.jar
pagehelper-5.1.4.jar
paranamer-2.3.jar
paranamer-2.8.jar
-parquet-hadoop-bundle-1.6.0.jar
+parquet-hadoop-bundle-1.8.1.jar
poi-5.2.1.jar
poi-ooxml-5.2.1.jar
poi-ooxml-lite-5.2.1.jar
@@ -400,9 +431,12 @@ scala-xml_2.11-1.0.5.jar
scalap-2.11.12.jar
scopt_2.11-3.5.0.jar
security-0.193.jar
+servlet-api-2.4.jar
+servlet-api-2.5-6.1.14.jar
servo-core-0.12.21.jar
slf4j-api-1.7.30.jar
slice-0.38.jar
+slider-core-0.90.2-incubating.jar
snakeyaml-1.26.jar
snappy-java-1.0.4.1.jar
snappy-java-1.0.5.jar
@@ -465,8 +499,18 @@ spring-webmvc-5.2.15.RELEASE.jar
ssl-config-core_2.11-0.3.7.jar
stax2-api-4.2.1.jar
stringtemplate-3.2.1.jar
+tephra-api-0.6.0.jar
+tephra-core-0.6.0.jar
+tephra-hbase-compat-1.0-0.6.0.jar
tomcat-embed-core-9.0.46.jar
tomcat-embed-websocket-9.0.46.jar
+transaction-api-1.1.jar
+twill-api-0.6.0-incubating.jar
+twill-common-0.6.0-incubating.jar
+twill-core-0.6.0-incubating.jar
+twill-discovery-api-0.6.0-incubating.jar
+twill-discovery-core-0.6.0-incubating.jar
+twill-zookeeper-0.6.0-incubating.jar
txw2-2.3.4.jar
units-1.3.jar
validation-api-2.0.1.Final.jar
@@ -482,8 +526,7 @@ xml-apis-1.4.01.jar
xmlbeans-5.0.3.jar
xmlenc-0.52.jar
xstream-1.4.19.jar
-xz-1.0.jar
zookeeper-3.5.9.jar
zookeeper-jute-3.5.9.jar
zstd-jni-1.4.4-7.jar
-zstd-jni-1.4.5-6.jar
+zstd-jni-1.4.5-6.jar
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 02/08: Bump hive-exec in /linkis-engineconn-plugins/engineconn-plugins/hive (#1948)
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 7cbf51f8b5ab0672fec0af358efbe3deafaaa48c
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Sat May 7 14:05:18 2022 +0800
Bump hive-exec in /linkis-engineconn-plugins/engineconn-plugins/hive (#1948)
Bumps hive-exec from 2.3.3 to 2.3.4.
---
updated-dependencies:
- dependency-name: org.apache.hive:hive-exec
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
---
linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml b/linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml
index 20003a749..c1444e4a1 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml
+++ b/linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml
@@ -30,7 +30,7 @@
<artifactId>linkis-engineplugin-hive</artifactId>
<properties>
- <hive.version>2.3.3</hive.version>
+ <hive.version>2.3.4</hive.version>
</properties>
<dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 01/08: Bump mysql-connector-java (#1947)
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit b37ec5d8ba9c7929397cef76a5603bd371982ca0
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Sat May 7 14:03:46 2022 +0800
Bump mysql-connector-java (#1947)
Bumps [mysql-connector-java](https://github.com/mysql/mysql-connector-j) from 5.1.34 to 8.0.16.
- [Release notes](https://github.com/mysql/mysql-connector-j/releases)
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.0/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/5.1.34...8.0.16)
---
updated-dependencies:
- dependency-name: mysql:mysql-connector-java
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
---
.../linkis-datasource/linkis-metadata-manager/service/mysql/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/pom.xml
index 596c9d87d..38bf09b5a 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/mysql/pom.xml
@@ -29,7 +29,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <mysql.version>5.1.34</mysql.version>
+ <mysql.version>8.0.16</mysql.version>
</properties>
<dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 07/08: set 2.3.3
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 97930c1259ac87cf0e24ca0193aa51c43af3d4e5
Author: casionone <ca...@gmail.com>
AuthorDate: Thu May 12 14:41:53 2022 +0800
set <hive.version>2.3.3</hive.version>
---
linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml | 2 +-
.../linkis-datasource/linkis-metadata-manager/service/hive/pom.xml | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml b/linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml
index ca1adc8bd..1af4eb571 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml
+++ b/linkis-engineconn-plugins/engineconn-plugins/hive/pom.xml
@@ -30,7 +30,7 @@
<artifactId>linkis-engineplugin-hive</artifactId>
<properties>
- <hive.version>2.3.4</hive.version>
+ <hive.version>2.3.3</hive.version>
</properties>
<dependencies>
diff --git a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/pom.xml b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/pom.xml
index 1f4379cc0..6c35211bf 100644
--- a/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/pom.xml
+++ b/linkis-public-enhancements/linkis-datasource/linkis-metadata-manager/service/hive/pom.xml
@@ -28,8 +28,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <hive.version>2.3.4</hive.version>
- <!-- <hive.version>1.2.1</hive.version>-->
+ <hive.version>2.3.3</hive.version>
<hadoop.version>2.7.2</hadoop.version>
<datanucleus-api-jdo.version>4.2.4</datanucleus-api-jdo.version>
</properties>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 04/08: Bump hive-jdbc in /linkis-engineconn-plugins/engineconn-plugins/jdbc (#1951)
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 420cff143cd2e6acb72309dbb20c10449b9192c7
Author: dependabot[bot] <49...@users.noreply.github.com>
AuthorDate: Sat May 7 14:07:42 2022 +0800
Bump hive-jdbc in /linkis-engineconn-plugins/engineconn-plugins/jdbc (#1951)
Bumps hive-jdbc from 1.2.1 to 2.3.4.
---
updated-dependencies:
- dependency-name: org.apache.hive:hive-jdbc
dependency-type: direct:production
...
Signed-off-by: dependabot[bot] <su...@github.com>
Co-authored-by: dependabot[bot] <49...@users.noreply.github.com>
---
linkis-engineconn-plugins/engineconn-plugins/jdbc/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/linkis-engineconn-plugins/engineconn-plugins/jdbc/pom.xml b/linkis-engineconn-plugins/engineconn-plugins/jdbc/pom.xml
index c1f4c3976..c282a0475 100644
--- a/linkis-engineconn-plugins/engineconn-plugins/jdbc/pom.xml
+++ b/linkis-engineconn-plugins/engineconn-plugins/jdbc/pom.xml
@@ -71,7 +71,7 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-jdbc</artifactId>
- <version>1.2.1</version>
+ <version>2.3.4</version>
<exclusions>
<exclusion>
<groupId>org.apache.hive</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org
[incubator-linkis] 06/08: feat(dependency): unify the json4s dependency, and add spark's version commont (#2018)
Posted by pe...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
peacewong pushed a commit to branch dev-1.1.2
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
commit 33b1979378b7a6eb5815427db78ac5397787ca9b
Author: Jack Xu <xu...@126.com>
AuthorDate: Sat May 7 14:18:07 2022 +0800
feat(dependency): unify the json4s dependency, and add spark's version commont (#2018)
---
linkis-commons/linkis-rpc/pom.xml | 9 ---------
pom.xml | 29 ++++++++++++++++++++++++++++-
2 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/linkis-commons/linkis-rpc/pom.xml b/linkis-commons/linkis-rpc/pom.xml
index 76c56f2db..32adcd572 100644
--- a/linkis-commons/linkis-rpc/pom.xml
+++ b/linkis-commons/linkis-rpc/pom.xml
@@ -48,10 +48,6 @@
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
<exclusions>
- <exclusion>
- <artifactId>spring-boot-autoconfigure</artifactId>
- <groupId>org.springframework.boot</groupId>
- </exclusion>
<exclusion>
<artifactId>spring-boot-starter-aop</artifactId>
<groupId>org.springframework.boot</groupId>
@@ -84,10 +80,6 @@
<artifactId>spring-cloud-commons</artifactId>
<groupId>org.springframework.cloud</groupId>
</exclusion>
- <exclusion>
- <artifactId>spring-cloud-starter-openfeign</artifactId>
- <groupId>org.springframework.cloud</groupId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -100,7 +92,6 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>io.protostuff</groupId>
<artifactId>protostuff-core</artifactId>
diff --git a/pom.xml b/pom.xml
index 072ba0a20..bfce04d0d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,12 +105,13 @@
<spring.boot.version>2.3.12.RELEASE</spring.boot.version>
<guava.version>30.0-jre</guava.version>
<gson.version>2.8.5</gson.version>
- <jackson-bom.version>2.13.2.1</jackson-bom.version>
<scala.version>2.11.12</scala.version>
<jdk.compile.version>1.8</jdk.compile.version>
<plugin.scala.version>2.15.2</plugin.scala.version>
<scala.binary.version>2.11</scala.binary.version>
<netty.version>4.1.68.Final</netty.version>
+ <jackson-bom.version>2.13.2.1</jackson-bom.version>
+ <!-- spark2.4 use 3.5.3, spark3.2 use 3.7.0-M11 -->
<json4s.version>3.5.3</json4s.version>
<jersey.version>1.19.4</jersey.version>
<jersey.servlet.version>2.23.1</jersey.servlet.version>
@@ -270,6 +271,32 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>org.json4s</groupId>
+ <artifactId>json4s-core_${scala.binary.version}</artifactId>
+ <version>${json4s.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.json4s</groupId>
+ <artifactId>json4s-jackson_${scala.binary.version}</artifactId>
+ <version>${json4s.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.json4s</groupId>
+ <artifactId>json4s-ast_${scala.binary.version}</artifactId>
+ <version>${json4s.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.json4s</groupId>
+ <artifactId>json4s-scalap_${scala.binary.version}</artifactId>
+ <version>${json4s.version}</version>
+ </dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org