This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch refactor/migrate-jakarta
in repository https://gitbox.apache.org/repos/asf/iotdb-extras.git
The following commit(s) were added to refs/heads/refactor/migrate-jakarta by
this push:
new 681c5ee chore: Continued migrating to Jakarta (Mainly the Nullable
annotations)
681c5ee is described below
commit 681c5ee01cec7af94664a8ea09bfbf5d0ba30b71
Author: Christofer Dutz <[email protected]>
AuthorDate: Thu May 16 09:17:19 2024 +0200
chore: Continued migrating to Jakarta (Mainly the Nullable annotations)
---
connectors/flink-sql-iotdb-connector/pom.xml | 4 ++--
.../src/main/java/org/apache/iotdb/flink/sql/common/Utils.java | 3 +--
connectors/flink-tsfile-connector/pom.xml | 4 ++--
.../main/java/org/apache/iotdb/flink/tsfile/TsFileInputFormat.java | 3 +--
.../main/java/org/apache/iotdb/flink/tsfile/TsFileOutputFormat.java | 3 +--
connectors/hadoop/pom.xml | 4 ++--
.../src/main/java/org/apache/iotdb/hadoop/fileSystem/HDFSFile.java | 3 +--
connectors/hive-connector/pom.xml | 4 ++--
.../src/main/java/org/apache/iotdb/hive/TsFileSerDe.java | 3 +--
pom.xml | 5 +++++
10 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/connectors/flink-sql-iotdb-connector/pom.xml
b/connectors/flink-sql-iotdb-connector/pom.xml
index 2656091..fe6a3fc 100644
--- a/connectors/flink-sql-iotdb-connector/pom.xml
+++ b/connectors/flink-sql-iotdb-connector/pom.xml
@@ -77,8 +77,8 @@
<artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
diff --git
a/connectors/flink-sql-iotdb-connector/src/main/java/org/apache/iotdb/flink/sql/common/Utils.java
b/connectors/flink-sql-iotdb-connector/src/main/java/org/apache/iotdb/flink/sql/common/Utils.java
index 03d1f33..8e3c29e 100644
---
a/connectors/flink-sql-iotdb-connector/src/main/java/org/apache/iotdb/flink/sql/common/Utils.java
+++
b/connectors/flink-sql-iotdb-connector/src/main/java/org/apache/iotdb/flink/sql/common/Utils.java
@@ -18,6 +18,7 @@
*/
package org.apache.iotdb.flink.sql.common;
+import jakarta.annotation.Nullable;
import org.apache.iotdb.flink.sql.exception.UnsupportedDataTypeException;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.exception.NullFieldException;
@@ -33,8 +34,6 @@ import org.apache.flink.table.data.RowData;
import org.apache.flink.table.data.StringData;
import org.apache.flink.table.types.DataType;
-import javax.annotation.Nullable;
-
import java.io.IOException;
import java.lang.reflect.Array;
import java.net.Socket;
diff --git a/connectors/flink-tsfile-connector/pom.xml
b/connectors/flink-tsfile-connector/pom.xml
index dfda4ff..e06ef45 100644
--- a/connectors/flink-tsfile-connector/pom.xml
+++ b/connectors/flink-tsfile-connector/pom.xml
@@ -93,8 +93,8 @@
<artifactId>flink-core</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git
a/connectors/flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/TsFileInputFormat.java
b/connectors/flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/TsFileInputFormat.java
index 47e97aa..48c72ef 100644
---
a/connectors/flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/TsFileInputFormat.java
+++
b/connectors/flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/TsFileInputFormat.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.flink.tsfile;
+import jakarta.annotation.Nullable;
import org.apache.iotdb.flink.tsfile.util.TSFileConfigUtil;
import org.apache.iotdb.hadoop.fileSystem.HDFSInput;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
@@ -40,8 +41,6 @@ import org.apache.flink.core.fs.Path;
import org.apache.flink.runtime.util.HadoopUtils;
import org.apache.flink.util.FlinkRuntimeException;
-import javax.annotation.Nullable;
-
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
diff --git
a/connectors/flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/TsFileOutputFormat.java
b/connectors/flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/TsFileOutputFormat.java
index 106e0ef..f1f2e7e 100644
---
a/connectors/flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/TsFileOutputFormat.java
+++
b/connectors/flink-tsfile-connector/src/main/java/org/apache/iotdb/flink/tsfile/TsFileOutputFormat.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.flink.tsfile;
+import jakarta.annotation.Nullable;
import org.apache.iotdb.flink.tsfile.util.TSFileConfigUtil;
import org.apache.iotdb.hadoop.fileSystem.HDFSOutput;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
@@ -33,8 +34,6 @@ import org.apache.flink.runtime.util.HadoopUtils;
import org.apache.flink.util.Preconditions;
import org.apache.hadoop.conf.Configuration;
-import javax.annotation.Nullable;
-
import java.io.FileOutputStream;
import java.io.IOException;
import java.lang.reflect.Field;
diff --git a/connectors/hadoop/pom.xml b/connectors/hadoop/pom.xml
index 883e193..7e5b220 100644
--- a/connectors/hadoop/pom.xml
+++ b/connectors/hadoop/pom.xml
@@ -57,8 +57,8 @@
<artifactId>hadoop-common</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
diff --git
a/connectors/hadoop/src/main/java/org/apache/iotdb/hadoop/fileSystem/HDFSFile.java
b/connectors/hadoop/src/main/java/org/apache/iotdb/hadoop/fileSystem/HDFSFile.java
index 31f7ee4..254c441 100644
---
a/connectors/hadoop/src/main/java/org/apache/iotdb/hadoop/fileSystem/HDFSFile.java
+++
b/connectors/hadoop/src/main/java/org/apache/iotdb/hadoop/fileSystem/HDFSFile.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.hadoop.fileSystem;
+import jakarta.annotation.Nullable;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.FileSystem;
@@ -28,8 +29,6 @@ import org.apache.hadoop.io.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nullable;
-
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
import java.io.BufferedReader;
diff --git a/connectors/hive-connector/pom.xml
b/connectors/hive-connector/pom.xml
index b38acae..3a618f8 100644
--- a/connectors/hive-connector/pom.xml
+++ b/connectors/hive-connector/pom.xml
@@ -68,8 +68,8 @@
<artifactId>hive-common</artifactId>
</dependency>
<dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git
a/connectors/hive-connector/src/main/java/org/apache/iotdb/hive/TsFileSerDe.java
b/connectors/hive-connector/src/main/java/org/apache/iotdb/hive/TsFileSerDe.java
index ea08127..6798a93 100644
---
a/connectors/hive-connector/src/main/java/org/apache/iotdb/hive/TsFileSerDe.java
+++
b/connectors/hive-connector/src/main/java/org/apache/iotdb/hive/TsFileSerDe.java
@@ -18,6 +18,7 @@
*/
package org.apache.iotdb.hive;
+import jakarta.annotation.Nullable;
import org.apache.iotdb.hadoop.tsfile.record.HDFSTSRecord;
import org.apache.hadoop.conf.Configuration;
@@ -35,8 +36,6 @@ import org.apache.hadoop.hive.serde2.typeinfo.TypeInfo;
import org.apache.hadoop.hive.serde2.typeinfo.TypeInfoUtils;
import org.apache.hadoop.io.Writable;
-import javax.annotation.Nullable;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
diff --git a/pom.xml b/pom.xml
index 06533db..9adef9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -349,6 +349,11 @@
<artifactId>jsr305</artifactId>
<version>${findbugs.jsr305.version}</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>3.0.0</version>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
