This is an automated email from the ASF dual-hosted git repository.
MartijnVisser pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-connector-jdbc.git
The following commit(s) were added to refs/heads/main by this push:
new cd4572b1 [FLINK-40061][build] Bump flink-connector-parent to 2.0.0 and
Flink to 2.1.3 (#240)
cd4572b1 is described below
commit cd4572b1383a7eaa361c6c57647081abc172f700
Author: Martijn Visser <[email protected]>
AuthorDate: Tue Sep 22 20:13:02 2026 +0200
[FLINK-40061][build] Bump flink-connector-parent to 2.0.0 and Flink to
2.1.3 (#240)
---
.github/workflows/push_pr.yml | 2 +-
.../flink/connector/jdbc/core/database/JdbcFactory.java | 4 +++-
.../jdbc/core/database/catalog/AbstractJdbcCatalog.java | 12 ++++++++----
.../jdbc/core/datastream/source/JdbcSourceBuilder.java | 4 +++-
.../connector/jdbc/core/table/JdbcConnectorOptions.java | 17 +++++++++++++----
.../jdbc/datasource/transactions/xa/XaTransaction.java | 4 +++-
.../datasource/transactions/xa/exceptions/XaError.java | 4 +++-
pom.xml | 8 ++++----
tools/maven/checkstyle.xml | 8 +-------
9 files changed, 39 insertions(+), 24 deletions(-)
diff --git a/.github/workflows/push_pr.yml b/.github/workflows/push_pr.yml
index 409b72a4..fccc2977 100644
--- a/.github/workflows/push_pr.yml
+++ b/.github/workflows/push_pr.yml
@@ -28,7 +28,7 @@ jobs:
compile_and_test:
strategy:
matrix:
- flink: [2.0.1, 2.1.1, 2.3.0]
+ flink: [2.1.3, 2.2.1, 2.3.0]
jdk: [ '17' ]
uses: apache/flink-connector-shared-utils/.github/workflows/ci.yml@ci_utils
with:
diff --git
a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/JdbcFactory.java
b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/JdbcFactory.java
index 65fc1f05..82d55d1b 100644
---
a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/JdbcFactory.java
+++
b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/JdbcFactory.java
@@ -47,7 +47,9 @@ public interface JdbcFactory {
*/
boolean acceptsURL(String url);
- /** @return a new instance of the {@link JdbcDialect}. */
+ /**
+ * @return a new instance of the {@link JdbcDialect}.
+ */
JdbcDialect createDialect();
/**
diff --git
a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/AbstractJdbcCatalog.java
b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/AbstractJdbcCatalog.java
index 857176fe..92797f32 100644
---
a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/AbstractJdbcCatalog.java
+++
b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/database/catalog/AbstractJdbcCatalog.java
@@ -374,8 +374,10 @@ public abstract class AbstractJdbcCatalog extends
AbstractCatalog implements Jdb
@Override
public List<CatalogPartitionSpec> listPartitions(
ObjectPath tablePath, CatalogPartitionSpec partitionSpec)
- throws TableNotExistException, TableNotPartitionedException,
- PartitionSpecInvalidException, CatalogException {
+ throws TableNotExistException,
+ TableNotPartitionedException,
+ PartitionSpecInvalidException,
+ CatalogException {
return Collections.emptyList();
}
@@ -404,8 +406,10 @@ public abstract class AbstractJdbcCatalog extends
AbstractCatalog implements Jdb
CatalogPartitionSpec partitionSpec,
CatalogPartition partition,
boolean ignoreIfExists)
- throws TableNotExistException, TableNotPartitionedException,
- PartitionSpecInvalidException,
PartitionAlreadyExistsException,
+ throws TableNotExistException,
+ TableNotPartitionedException,
+ PartitionSpecInvalidException,
+ PartitionAlreadyExistsException,
CatalogException {
throw new UnsupportedOperationException();
}
diff --git
a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/JdbcSourceBuilder.java
b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/JdbcSourceBuilder.java
index fbd171fe..5671ac38 100644
---
a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/JdbcSourceBuilder.java
+++
b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/datastream/source/JdbcSourceBuilder.java
@@ -140,7 +140,9 @@ public class JdbcSourceBuilder<OUT> {
return this;
}
- /** @deprecated Use {@link #setSplitter(SplitterEnumerator)} instead. */
+ /**
+ * @deprecated Use {@link #setSplitter(SplitterEnumerator)} instead.
+ */
@Deprecated
public JdbcSourceBuilder<OUT> setSql(@Nonnull String sql) {
Preconditions.checkArgument(
diff --git
a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcConnectorOptions.java
b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcConnectorOptions.java
index 37d5362c..990a8c5e 100644
---
a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcConnectorOptions.java
+++
b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/core/table/JdbcConnectorOptions.java
@@ -123,7 +123,9 @@ public class JdbcConnectorOptions {
// Lookup options
//
-----------------------------------------------------------------------------------------
- /** @deprecated please use {@link LookupOptions#PARTIAL_CACHE_MAX_ROWS}
instead. */
+ /**
+ * @deprecated please use {@link LookupOptions#PARTIAL_CACHE_MAX_ROWS}
instead.
+ */
@Deprecated
public static final ConfigOption<Long> LOOKUP_CACHE_MAX_ROWS =
ConfigOptions.key("lookup.cache.max-rows")
@@ -133,7 +135,10 @@ public class JdbcConnectorOptions {
"The max number of rows of lookup cache, over this
value, the oldest rows will "
+ "be eliminated. \"cache.max-rows\" and
\"cache.ttl\" options must all be specified if any of them is "
+ "specified.");
- /** @deprecated please use {@link
LookupOptions#PARTIAL_CACHE_EXPIRE_AFTER_WRITE} instead. */
+
+ /**
+ * @deprecated please use {@link
LookupOptions#PARTIAL_CACHE_EXPIRE_AFTER_WRITE} instead.
+ */
@Deprecated
public static final ConfigOption<Duration> LOOKUP_CACHE_TTL =
ConfigOptions.key("lookup.cache.ttl")
@@ -141,7 +146,9 @@ public class JdbcConnectorOptions {
.defaultValue(Duration.ofSeconds(10))
.withDescription("The cache time to live.");
- /** @deprecated please use {@link LookupOptions#MAX_RETRIES} instead. */
+ /**
+ * @deprecated please use {@link LookupOptions#MAX_RETRIES} instead.
+ */
@Deprecated
public static final ConfigOption<Integer> LOOKUP_MAX_RETRIES =
ConfigOptions.key("lookup.max-retries")
@@ -149,7 +156,9 @@ public class JdbcConnectorOptions {
.defaultValue(3)
.withDescription("The max retry times if lookup database
failed.");
- /** @deprecated please use {@link
LookupOptions#PARTIAL_CACHE_CACHE_MISSING_KEY} instead. */
+ /**
+ * @deprecated please use {@link
LookupOptions#PARTIAL_CACHE_CACHE_MISSING_KEY} instead.
+ */
@Deprecated
public static final ConfigOption<Boolean> LOOKUP_CACHE_MISSING_KEY =
ConfigOptions.key("lookup.cache.caching-missing-key")
diff --git
a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/XaTransaction.java
b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/XaTransaction.java
index 669c336c..793621c0 100644
---
a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/XaTransaction.java
+++
b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/XaTransaction.java
@@ -141,7 +141,9 @@ public class XaTransaction implements Serializable,
AutoCloseable {
"inconsistent internal state");
}
- /** @param checkpointId to associate with the new transaction. */
+ /**
+ * @param checkpointId to associate with the new transaction.
+ */
public void createTx(long checkpointId) throws IOException {
try {
Preconditions.checkState(currentTid == null, "currentXid not
null");
diff --git
a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/XaError.java
b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/XaError.java
index a1096685..5fa45299 100644
---
a/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/XaError.java
+++
b/flink-connector-jdbc-core/src/main/java/org/apache/flink/connector/jdbc/datasource/transactions/xa/exceptions/XaError.java
@@ -128,7 +128,9 @@ public class XaError {
return Arrays.toString(more);
}
- /** @return error description from {@link XAException} javadoc from to
ease debug. */
+ /**
+ * @return error description from {@link XAException} javadoc from to ease
debug.
+ */
private static String translateCode(int code) {
switch (code) {
case XAException.XA_HEURCOM:
diff --git a/pom.xml b/pom.xml
index 81d5b8bd..5194d44e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@ under the License.
<parent>
<groupId>org.apache.flink</groupId>
<artifactId>flink-connector-parent</artifactId>
- <version>1.1.0</version>
+ <version>2.0.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -56,7 +56,7 @@ under the License.
</modules>
<properties>
- <flink.version>2.0.0</flink.version>
+ <flink.version>2.1.3</flink.version>
<scala.binary.version>2.12</scala.binary.version>
<scala-library.version>2.12.7</scala-library.version>
<jackson-bom.version>2.22.2</jackson-bom.version>
@@ -66,7 +66,7 @@ under the License.
<postgres.version>42.7.13</postgres.version>
<openlineage.version>1.53.0</openlineage.version>
- <japicmp.referenceVersion>3.0.0-1.16</japicmp.referenceVersion>
+ <japicmp.referenceVersion>4.1.0-2.1</japicmp.referenceVersion>
<slf4j.version>1.7.36</slf4j.version>
<log4j.version>2.26.1</log4j.version>
@@ -359,7 +359,7 @@ under the License.
<plugin>
<!-- activate API compatibility checks -->
- <groupId>io.github.zentol.japicmp</groupId>
+ <groupId>com.github.siom79.japicmp</groupId>
<artifactId>japicmp-maven-plugin</artifactId>
</plugin>
diff --git a/tools/maven/checkstyle.xml b/tools/maven/checkstyle.xml
index 5b94140f..d0c3fb6b 100644
--- a/tools/maven/checkstyle.xml
+++ b/tools/maven/checkstyle.xml
@@ -259,16 +259,10 @@ This file is based on the checkstyle file of Apache Beam.
<!-- Checks for Javadoc comments. -->
<!-- See http://checkstyle.sf.net/config_javadoc.html -->
<module name="JavadocMethod">
- <property name="scope" value="protected"/>
+ <property name="accessModifiers" value="protected"/>
<property name="severity" value="error"/>
- <property name="allowMissingJavadoc" value="true"/>
<property name="allowMissingParamTags" value="true"/>
<property name="allowMissingReturnTag" value="true"/>
- <property name="allowMissingThrowsTags" value="true"/>
- <property name="allowThrowsTagsForSubclasses"
value="true"/>
- <property name="allowUndeclaredRTE" value="true"/>
- <!-- This check sometimes failed for with "Unable to
get class information for @throws tag" for custom exceptions -->
- <property name="suppressLoadErrors" value="true"/>
</module>
<!-- Check that paragraph tags are used correctly in Javadoc.
-->
