Skip to content

Commit a1f2215

Browse files
committed
HADOOP-19861. Migrate hadoop-cos from javax.annotation to jakarta.
1 parent f6182e5 commit a1f2215

6 files changed

Lines changed: 18 additions & 3 deletions

File tree

hadoop-cloud-storage-project/hadoop-cos/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,11 @@
113113
<scope>compile</scope>
114114
</dependency>
115115

116+
<dependency>
117+
<groupId>jakarta.annotation</groupId>
118+
<artifactId>jakarta.annotation-api</artifactId>
119+
</dependency>
120+
116121
<dependency>
117122
<groupId>org.assertj</groupId>
118123
<artifactId>assertj-core</artifactId>

hadoop-cloud-storage-project/hadoop-cos/src/main/java/org/apache/hadoop/fs/cosn/auth/AbstractCOSCredentialsProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.qcloud.cos.auth.COSCredentialsProvider;
2121
import org.apache.hadoop.conf.Configuration;
2222

23-
import javax.annotation.Nullable;
23+
import jakarta.annotation.Nullable;
2424
import java.net.URI;
2525

2626
/**

hadoop-cloud-storage-project/hadoop-cos/src/main/java/org/apache/hadoop/fs/cosn/auth/EnvironmentVariableCredentialsProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.apache.hadoop.conf.Configuration;
2525
import org.apache.hadoop.fs.cosn.Constants;
2626

27-
import javax.annotation.Nullable;
27+
import jakarta.annotation.Nullable;
2828
import java.net.URI;
2929

3030
/**

hadoop-cloud-storage-project/hadoop-cos/src/main/java/org/apache/hadoop/fs/cosn/auth/SimpleCredentialsProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.apache.hadoop.conf.Configuration;
2525
import org.apache.hadoop.fs.cosn.CosNConfigKeys;
2626

27-
import javax.annotation.Nullable;
27+
import jakarta.annotation.Nullable;
2828
import java.net.URI;
2929

3030
/**

hadoop-project/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2055,6 +2055,11 @@
20552055
<artifactId>jakarta.activation-api</artifactId>
20562056
<version>1.2.1</version>
20572057
</dependency>
2058+
<dependency>
2059+
<groupId>jakarta.annotation</groupId>
2060+
<artifactId>jakarta.annotation-api</artifactId>
2061+
<version>2.1.1</version>
2062+
</dependency>
20582063
<dependency>
20592064
<groupId>javax.annotation</groupId>
20602065
<artifactId>javax.annotation-api</artifactId>

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-csi/pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@
4242
<version>${hadoop.protobuf.version}</version>
4343
<scope>${transient.protobuf2.scope}</scope>
4444
</dependency>
45+
<dependency>
46+
<groupId>javax.annotation</groupId>
47+
<artifactId>javax.annotation-api</artifactId>
48+
<scope>provided</scope>
49+
</dependency>
4550
<dependency>
4651
<groupId>io.netty</groupId>
4752
<artifactId>netty-all</artifactId>

0 commit comments

Comments
 (0)