This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 67c35ff0d9f HDDS-14112. Remove jakarta.validation-api (#9467)
67c35ff0d9f is described below
commit 67c35ff0d9f08b9cee43ab5b7303c62552e469ff
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Wed Dec 10 10:16:05 2025 +0100
HDDS-14112. Remove jakarta.validation-api (#9467)
---
hadoop-hdds/framework/pom.xml | 4 ----
.../java/org/apache/hadoop/hdds/utils/db/RocksDBCheckpoint.java | 4 ++--
hadoop-ozone/recon/pom.xml | 4 ----
.../ozone/recon/spi/impl/StorageContainerServiceProviderImpl.java | 4 ++--
pom.xml | 7 +------
5 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/hadoop-hdds/framework/pom.xml b/hadoop-hdds/framework/pom.xml
index 7f4f0070cae..c30cde6de28 100644
--- a/hadoop-hdds/framework/pom.xml
+++ b/hadoop-hdds/framework/pom.xml
@@ -112,10 +112,6 @@
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
- <dependency>
- <groupId>jakarta.validation</groupId>
- <artifactId>jakarta.validation-api</artifactId>
- </dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
diff --git
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RocksDBCheckpoint.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RocksDBCheckpoint.java
index dfa1bd9c3e9..2e881035a24 100644
---
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RocksDBCheckpoint.java
+++
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RocksDBCheckpoint.java
@@ -17,9 +17,9 @@
package org.apache.hadoop.hdds.utils.db;
+import jakarta.annotation.Nonnull;
import java.io.IOException;
import java.nio.file.Path;
-import javax.validation.constraints.NotNull;
import org.apache.commons.io.FileUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -52,7 +52,7 @@ public RocksDBCheckpoint(Path checkpointLocation,
}
@Override
- @NotNull
+ @Nonnull
public Path getCheckpointLocation() {
return this.checkpointLocation;
}
diff --git a/hadoop-ozone/recon/pom.xml b/hadoop-ozone/recon/pom.xml
index 9a0936ebf19..13b39d5c91a 100644
--- a/hadoop-ozone/recon/pom.xml
+++ b/hadoop-ozone/recon/pom.xml
@@ -70,10 +70,6 @@
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>
- <dependency>
- <groupId>jakarta.validation</groupId>
- <artifactId>jakarta.validation-api</artifactId>
- </dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/StorageContainerServiceProviderImpl.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/StorageContainerServiceProviderImpl.java
index 3b6164447b3..edd1c1f702b 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/StorageContainerServiceProviderImpl.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/StorageContainerServiceProviderImpl.java
@@ -21,6 +21,7 @@
import static
org.apache.hadoop.ozone.recon.ReconConstants.RECON_SCM_SNAPSHOT_DB;
import static org.apache.hadoop.security.UserGroupInformation.getCurrentUser;
+import jakarta.annotation.Nonnull;
import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
@@ -29,7 +30,6 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.inject.Inject;
-import javax.validation.constraints.NotNull;
import org.apache.commons.io.FileUtils;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
@@ -175,7 +175,7 @@ public DBCheckpoint getSCMDBSnapshot() {
return null;
}
- @NotNull
+ @Nonnull
private RocksDBCheckpoint getRocksDBCheckpoint(String snapshotFileName, File
targetFile) throws IOException {
Path untarredDbDir = Paths.get(scmSnapshotDBParentDir.getAbsolutePath(),
snapshotFileName);
diff --git a/pom.xml b/pom.xml
index 975e4efdf69..d763f74300e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,7 +108,6 @@
<jacoco.version>0.8.14</jacoco.version>
<jakarta.annotation.version>2.1.1</jakarta.annotation.version>
<jakarta.inject.version>2.6.1</jakarta.inject.version>
- <jakarta.validation.version>2.0.2</jakarta.validation.version>
<jakarta.ws.rs-api.version>2.1.6</jakarta.ws.rs-api.version>
<java.dev.jna.version>5.2.0</java.dev.jna.version>
<java.security.egd>file:///dev/urandom</java.security.egd>
@@ -607,11 +606,6 @@
<artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta.annotation.version}</version>
</dependency>
- <dependency>
- <groupId>jakarta.validation</groupId>
- <artifactId>jakarta.validation-api</artifactId>
- <version>${jakarta.validation.version}</version>
- </dependency>
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
@@ -2079,6 +2073,7 @@
<bannedImports>
<bannedImport>javax.annotation.Nonnull</bannedImport>
<bannedImport>javax.annotation.Nullable</bannedImport>
+
<bannedImport>javax.validation.constraints.NotNull</bannedImport>
<bannedImport>org.checkerframework.checker.nullness.qual.NonNull</bannedImport>
<bannedImport>org.checkerframework.checker.nullness.qual.Nullable</bannedImport>
<bannedImport>org.jetbrains.annotations.NotNull</bannedImport>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
