This is an automated email from the ASF dual-hosted git repository.
mcasters pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hop.git
The following commit(s) were added to refs/heads/master by this push:
new 387ee03 HOP-2133 : Update Apache Beam API to 2.26.0
new 154183c Merge pull request #466 from mattcasters/master
387ee03 is described below
commit 387ee0360b18837bde9fda9fabe232e454e5d0f4
Author: Matt Casters <[email protected]>
AuthorDate: Sat Dec 12 23:41:08 2020 +0100
HOP-2133 : Update Apache Beam API to 2.26.0
---
assemblies/plugins/engines/beam/pom.xml | 7 ++++---
core/pom.xml | 6 +++---
plugins/engines/beam/pom.xml | 7 ++++---
3 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/assemblies/plugins/engines/beam/pom.xml
b/assemblies/plugins/engines/beam/pom.xml
index 95964a0..3a46c60 100644
--- a/assemblies/plugins/engines/beam/pom.xml
+++ b/assemblies/plugins/engines/beam/pom.xml
@@ -23,7 +23,7 @@
<url>https://repo.maven.apache.org/maven2</url>
<layout>default</layout>
<snapshots>
- <enabled>false</enabled>
+ <enabled>true</enabled>
</snapshots>
</repository>
<repository>
@@ -33,8 +33,8 @@
</repositories>
<properties>
- <apache-beam-version>2.24.0</apache-beam-version>
- <spark-version>2.4.6</spark-version>
+ <apache-beam-version>2.26.0</apache-beam-version>
+ <spark-version>2.4.7</spark-version>
<flink-version>1.9.3</flink-version>
<json-simple.version>1.1.1</json-simple.version>
</properties>
@@ -82,6 +82,7 @@
<exclusion><groupId>com.fasterxml.jackson.core</groupId><artifactId>jackson-core</artifactId></exclusion>
<exclusion><groupId>com.fasterxml.jackson.module</groupId><artifactId>jackson-module-scala_2.11</artifactId></exclusion>
<exclusion><groupId>com.fasterxml.jackson.core</groupId><artifactId>jackson-databind</artifactId></exclusion>
+
<exclusion><groupId>io.grpc</groupId><artifactId>grpc-core</artifactId></exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/core/pom.xml b/core/pom.xml
index 7ca0ade..9f50430 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,8 +22,8 @@
<maven-surefire-plugin.reuseForks>true</maven-surefire-plugin.reuseForks>
<maven-surefire-plugin.argLine>-Duser.timezone=UTC -Dfile.encoding=UTF-8
-Duser.language=en -Duser.country=US</maven-surefire-plugin.argLine>
<!-- Third-party dependencies -->
- <slf4j-api.version>1.7.7</slf4j-api.version>
- <slf4j-log4j12.version>1.7.7</slf4j-log4j12.version>
+ <slf4j-api.version>1.7.30</slf4j-api.version>
+ <slf4j-log4j12.version>1.7.30</slf4j-log4j12.version>
<xml-apis-ext.version>1.3.04</xml-apis-ext.version>
<spring.framework.version>4.3.2.RELEASE</spring.framework.version>
<commons-collections.version>3.2.2</commons-collections.version>
@@ -43,7 +43,7 @@
<javassist.version>3.20.0-GA</javassist.version>
<json-simple.version>1.1.1</json-simple.version>
<gson.version>2.8.5</gson.version>
- <jackson.version>2.10.2</jackson.version>
+ <jackson.version>2.12.0</jackson.version>
<jandex.version>2.2.2.Final</jandex.version>
</properties>
diff --git a/plugins/engines/beam/pom.xml b/plugins/engines/beam/pom.xml
index 563a948..1404efb 100644
--- a/plugins/engines/beam/pom.xml
+++ b/plugins/engines/beam/pom.xml
@@ -10,7 +10,7 @@
<url>https://repo.maven.apache.org/maven2</url>
<layout>default</layout>
<snapshots>
- <enabled>false</enabled>
+ <enabled>true</enabled>
</snapshots>
</repository>
<repository>
@@ -32,8 +32,8 @@
</parent>
<properties>
- <apache-beam-version>2.24.0</apache-beam-version>
- <spark-version>2.4.6</spark-version>
+ <apache-beam-version>2.26.0</apache-beam-version>
+ <spark-version>2.4.7</spark-version>
<flink-version>1.9.3</flink-version>
<json-simple.version>1.1.1</json-simple.version>
</properties>
@@ -121,6 +121,7 @@
<exclusion><groupId>com.fasterxml.jackson.core</groupId><artifactId>jackson-core</artifactId></exclusion>
<exclusion><groupId>com.fasterxml.jackson.module</groupId><artifactId>jackson-module-scala_2.11</artifactId></exclusion>
<exclusion><groupId>com.fasterxml.jackson.core</groupId><artifactId>jackson-databind</artifactId></exclusion>
+
<exclusion><groupId>io.grpc</groupId><artifactId>grpc-core</artifactId></exclusion>
</exclusions>
</dependency>
<dependency>
