You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bahir.apache.org by es...@apache.org on 2022/01/03 14:31:40 UTC
[bahir-flink] branch master updated (a2bb55f -> ad22ec6)
This is an automated email from the ASF dual-hosted git repository.
eskabetxe pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/bahir-flink.git.
from a2bb55f [BAHIR-294] Bump log4j2 version to 2.17.0
new c6a0cf0 [BAHIR-296] Bump apache version to 24
new eebd786 [BAHIR-296] Unify log4j libs
new 2c55c38 BAHIR-296: Unify and bump testcontainers version to 1.16.2
new e138058 BAHIR-296: Unify mockito version to 1.10.19
new ad22ec6 BAHIR-296: Bump powermock to 1.7.4
The 5 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:
flink-connector-activemq/pom.xml | 4 ++--
flink-connector-akka/pom.xml | 4 ----
flink-connector-flume/pom.xml | 3 ---
flink-connector-influxdb2/pom.xml | 5 -----
flink-connector-kudu/pom.xml | 11 ++++------
flink-connector-netty/pom.xml | 6 ------
flink-connector-pinot/pom.xml | 4 ----
pom.xml | 44 ++++++++++++++++++++++++++++-----------
8 files changed, 38 insertions(+), 43 deletions(-)
[bahir-flink] 04/05: BAHIR-296: Unify mockito version to 1.10.19
Posted by es...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
eskabetxe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bahir-flink.git
commit e1380582d5b20ef96438b0a732f59255dc2a4ed0
Author: Joao Boto <jb...@idealista.com>
AuthorDate: Mon Dec 27 16:36:32 2021 +0100
BAHIR-296: Unify mockito version to 1.10.19
---
flink-connector-akka/pom.xml | 4 ----
flink-connector-kudu/pom.xml | 5 +----
pom.xml | 8 ++++++++
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/flink-connector-akka/pom.xml b/flink-connector-akka/pom.xml
index 766236a..df4e1c8 100644
--- a/flink-connector-akka/pom.xml
+++ b/flink-connector-akka/pom.xml
@@ -34,7 +34,6 @@ under the License.
<packaging>jar</packaging>
<properties>
- <mockito.version>1.10.19</mockito.version>
<akka.version>2.5.21</akka.version>
</properties>
@@ -59,9 +58,6 @@ under the License.
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>${mockito.version}</version>
- <type>jar</type>
- <scope>test</scope>
</dependency>
</dependencies>
diff --git a/flink-connector-kudu/pom.xml b/flink-connector-kudu/pom.xml
index 12fd9da..750929c 100644
--- a/flink-connector-kudu/pom.xml
+++ b/flink-connector-kudu/pom.xml
@@ -31,7 +31,6 @@
<properties>
<kudu.version>1.13.0</kudu.version>
- <mockito.version>1.10.19</mockito.version>
</properties>
<dependencies>
@@ -97,8 +96,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>${mockito.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
@@ -119,7 +116,7 @@
<version>${log4j.version}</version>
<scope>test</scope>
</dependency>
-</dependencies>
+ </dependencies>
<build>
<extensions>
diff --git a/pom.xml b/pom.xml
index 1307563..5986b5b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,6 +99,7 @@
<!-- General dependencies version -->
<log4j.version>2.17.0</log4j.version>
<junit.jupiter.version>5.4.1</junit.jupiter.version>
+ <mockito.version>1.10.19</mockito.version>
<scalacheck.version>1.14.0</scalacheck.version>
<scalatest.version>3.0.5</scalatest.version>
<testcontainers.version>1.16.2</testcontainers.version>
@@ -205,6 +206,13 @@
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-all</artifactId>
+ <version>${mockito.version}</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
[bahir-flink] 05/05: BAHIR-296: Bump powermock to 1.7.4
Posted by es...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
eskabetxe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bahir-flink.git
commit ad22ec65cd853258500c2ed92acbdd13bd02f987
Author: Joao Boto <jb...@idealista.com>
AuthorDate: Mon Dec 27 17:11:52 2021 +0100
BAHIR-296: Bump powermock to 1.7.4
---
flink-connector-activemq/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/flink-connector-activemq/pom.xml b/flink-connector-activemq/pom.xml
index cef4db0..3380e0c 100644
--- a/flink-connector-activemq/pom.xml
+++ b/flink-connector-activemq/pom.xml
@@ -101,14 +101,14 @@ under the License.
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
- <version>1.5.5</version>
+ <version>1.7.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
- <version>1.5.5</version>
+ <version>1.7.4</version>
<scope>test</scope>
</dependency>
[bahir-flink] 03/05: BAHIR-296: Unify and bump testcontainers version to 1.16.2
Posted by es...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
eskabetxe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bahir-flink.git
commit 2c55c3884c0b336dce841b6022ec9df4ad862851
Author: Joao Boto <jb...@idealista.com>
AuthorDate: Mon Dec 27 16:33:55 2021 +0100
BAHIR-296: Unify and bump testcontainers version to 1.16.2
---
flink-connector-flume/pom.xml | 3 ---
flink-connector-influxdb2/pom.xml | 5 -----
flink-connector-pinot/pom.xml | 4 ----
pom.xml | 14 ++++++++++++++
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/flink-connector-flume/pom.xml b/flink-connector-flume/pom.xml
index df288aa..c937086 100644
--- a/flink-connector-flume/pom.xml
+++ b/flink-connector-flume/pom.xml
@@ -36,7 +36,6 @@ under the License.
<!-- Allow users to pass custom connector versions -->
<properties>
<flume-ng.version>1.9.0</flume-ng.version>
- <testcontainers.version>1.15.3</testcontainers.version>
</properties>
<dependencies>
@@ -71,8 +70,6 @@ under the License.
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
- <version>${testcontainers.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
diff --git a/flink-connector-influxdb2/pom.xml b/flink-connector-influxdb2/pom.xml
index 5d114bf..99dbc5f 100644
--- a/flink-connector-influxdb2/pom.xml
+++ b/flink-connector-influxdb2/pom.xml
@@ -39,7 +39,6 @@ under the License.
<influxdbClient.version>2.0.0</influxdbClient.version>
<druid.version>0.13.0-incubating</druid.version>
<!-- Test Properties -->
- <testcontainers.version>1.15.2</testcontainers.version>
<google.http.client.version>1.39.0</google.http.client.version>
</properties>
@@ -97,15 +96,11 @@ under the License.
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
- <version>${testcontainers.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
- <version>${testcontainers.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
diff --git a/flink-connector-pinot/pom.xml b/flink-connector-pinot/pom.xml
index 85846bf..d88fbb7 100644
--- a/flink-connector-pinot/pom.xml
+++ b/flink-connector-pinot/pom.xml
@@ -127,14 +127,10 @@ under the License.
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
- <version>1.15.2</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>junit-jupiter</artifactId>
- <version>1.15.2</version>
- <scope>test</scope>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index a0f37f9..1307563 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,6 +101,7 @@
<junit.jupiter.version>5.4.1</junit.jupiter.version>
<scalacheck.version>1.14.0</scalacheck.version>
<scalatest.version>3.0.5</scalatest.version>
+ <testcontainers.version>1.16.2</testcontainers.version>
<!-- JvmArg execution -->
<PermGen>64m</PermGen>
@@ -203,6 +204,19 @@
<version>${scalacheck.version}</version>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>junit-jupiter</artifactId>
+ <version>${testcontainers.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>testcontainers</artifactId>
+ <version>${testcontainers.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
[bahir-flink] 02/05: [BAHIR-296] Unify log4j libs
Posted by es...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
eskabetxe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bahir-flink.git
commit eebd786b5a657e9ee65e003f08852fcbe684d8e9
Author: Joao Boto <jb...@idealista.com>
AuthorDate: Sun Dec 26 19:39:56 2021 +0100
[BAHIR-296] Unify log4j libs
---
flink-connector-kudu/pom.xml | 6 +++---
pom.xml | 15 ++++++---------
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/flink-connector-kudu/pom.xml b/flink-connector-kudu/pom.xml
index ac6cdc5..12fd9da 100644
--- a/flink-connector-kudu/pom.xml
+++ b/flink-connector-kudu/pom.xml
@@ -104,19 +104,19 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>${log4j2.version}</version>
+ <version>${log4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>${log4j2.version}</version>
+ <version>${log4j.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
- <version>${log4j2.version}</version>
+ <version>${log4j.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index fafa3e0..a0f37f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -91,21 +91,18 @@
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
- <scala.version>2.11.12</scala.version>
- <scala.binary.version>2.11</scala.binary.version>
-
- <slf4j.version>1.7.16</slf4j.version>
- <log4j.version>1.2.17</log4j.version>
- <log4j2.version>2.17.0</log4j2.version>
-
<!-- Flink version -->
<flink.version>1.14.2</flink.version>
+ <scala.binary.version>2.11</scala.binary.version>
+ <scala.version>2.11.12</scala.version>
+ <!-- General dependencies version -->
+ <log4j.version>2.17.0</log4j.version>
<junit.jupiter.version>5.4.1</junit.jupiter.version>
-
- <scalatest.version>3.0.5</scalatest.version>
<scalacheck.version>1.14.0</scalacheck.version>
+ <scalatest.version>3.0.5</scalatest.version>
+ <!-- JvmArg execution -->
<PermGen>64m</PermGen>
<MaxPermGen>512m</MaxPermGen>
<CodeCacheSize>512m</CodeCacheSize>
[bahir-flink] 01/05: [BAHIR-296] Bump apache version to 24
Posted by es...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
eskabetxe pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/bahir-flink.git
commit c6a0cf06ee8795a6767b940487726a7bf544b62d
Author: Joao Boto <jb...@idealista.com>
AuthorDate: Sun Dec 26 19:51:10 2021 +0100
[BAHIR-296] Bump apache version to 24
---
flink-connector-netty/pom.xml | 6 ------
pom.xml | 7 ++++---
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/flink-connector-netty/pom.xml b/flink-connector-netty/pom.xml
index eaff1dd..c2707ad 100644
--- a/flink-connector-netty/pom.xml
+++ b/flink-connector-netty/pom.xml
@@ -73,12 +73,6 @@
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-table-planner_${scala.binary.version}</artifactId>
- <version>${flink.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.flink</groupId>
<artifactId>flink-clients_${scala.binary.version}</artifactId>
<version>${flink.version}</version>
<scope>test</scope>
diff --git a/pom.xml b/pom.xml
index cf730ee..fafa3e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
- <version>21</version>
+ <version>24</version>
</parent>
<groupId>org.apache.bahir</groupId>
<artifactId>bahir-flink-parent_2.11</artifactId>
@@ -84,11 +84,12 @@
</modules>
<properties>
+ <project.build.outputTimestamp>10</project.build.outputTimestamp>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-
- <!-- General project dependencies version -->
<java.version>1.8</java.version>
+ <maven.compiler.source>${java.version}</maven.compiler.source>
+ <maven.compiler.target>${java.version}</maven.compiler.target>
<scala.version>2.11.12</scala.version>
<scala.binary.version>2.11</scala.binary.version>