Skip to content

HDDS-12178. Add direct test-scope dependencies, remove hdds-hadoop-dependency-test #7800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nandakumar131 merged 13 commits into from
Feb 13, 2025
Merged

HDDS-12178. Add direct test-scope dependencies, remove hdds-hadoop-dependency-test #7800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c9c6692
analyze dependencies during build
adoroszlai Jan 31, 2025
7ac33ee
HDDS-12178. Expand transitive test dependencies
adoroszlai Feb 3, 2025
437b1d5
remove unused hdds-hadoop-dependency-test and hdds-test-utils depende…
adoroszlai Feb 3, 2025
6ae98b2
remove unused hdds-hadoop-dependency-test module
adoroszlai Feb 3, 2025
155dc5d
add junit-jupiter-engine to test classpath
adoroszlai Feb 3, 2025
250f55f
add slf4j-reload4j
adoroszlai Feb 3, 2025
0f3d98a
add commons-compress for hdds-common (import FileUtil from Storage)
adoroszlai Feb 3, 2025
8c61b3d
add mockito-inline
adoroszlai Feb 3, 2025
449fb55
fix TestS3SDKV1
adoroszlai Feb 3, 2025
37927d0
Merge remote-tracking branch 'origin/master' into HDDS-12178
adoroszlai Feb 11, 2025
a5a4dbd
Revert "add commons-compress for hdds-common (import FileUtil from St…
adoroszlai Feb 11, 2025
9482227
remove dependency on Hadoop FileUtil in hdds-rocks-native
adoroszlai Feb 11, 2025
631b713
move common test dependencies to root POM
adoroszlai Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion dev-support/ci/selective_ci_checks.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,6 @@ function check_needs_native() {
"^hadoop-hdds/common"
"^hadoop-hdds/config"
"^hadoop-hdds/hadoop-dependency-client"
"^hadoop-hdds/hadoop-dependency-test"
"^hadoop-hdds/managed-rocksdb"
"^hadoop-hdds/test-utils"
"^pom.xml"
Expand Down
5 changes: 0 additions & 5 deletions hadoop-hdds/client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-test-utils</artifactId>
Expand Down
10 changes: 5 additions & 5 deletions hadoop-hdds/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,11 @@
<artifactId>jaxb-runtime</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-reload4j</artifactId>
<scope>runtime</scope>
</dependency>

<!-- Test dependencies -->
<dependency>
Expand All @@ -221,11 +226,6 @@
<artifactId>metrics-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-test-utils</artifactId>
Expand Down
9 changes: 2 additions & 7 deletions hadoop-hdds/config/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,8 @@

<!-- Test dependencies -->
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-test-utils</artifactId>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
7 changes: 4 additions & 3 deletions hadoop-hdds/container-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,14 +202,15 @@

<!-- Test dependencies -->
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-common</artifactId>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-test</artifactId>
<artifactId>hdds-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
10 changes: 0 additions & 10 deletions hadoop-hdds/erasurecode/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,16 +45,6 @@
<artifactId>hdds-config</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
7 changes: 4 additions & 3 deletions hadoop-hdds/framework/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,14 +267,15 @@

<!-- Test dependencies -->
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-common</artifactId>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-test</artifactId>
<artifactId>hdds-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
110 changes: 0 additions & 110 deletions hadoop-hdds/hadoop-dependency-test/pom.xml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions hadoop-hdds/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
<module>framework</module>
<module>hadoop-dependency-client</module>
<module>hadoop-dependency-server</module>
<module>hadoop-dependency-test</module>
<module>interface-admin</module>
<module>interface-client</module>
<module>interface-server</module>
Expand Down Expand Up @@ -110,11 +109,6 @@
<artifactId>hdds-hadoop-dependency-server</artifactId>
<version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-test</artifactId>
<version>${hdds.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-interface-admin</artifactId>
Expand Down
5 changes: 0 additions & 5 deletions hadoop-hdds/rocks-native/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,6 @@
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-test-utils</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions hadoop-hdds/rocks-native/src/main/java/org/apache/hadoop/hdds/utils/NativeLibraryLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
package org.apache.hadoop.hdds.utils;

import com.google.common.annotations.VisibleForTesting;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.hadoop.fs.FileUtil;
import org.apache.hadoop.ozone.util.ShutdownHookManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -201,7 +201,7 @@ private Pair<Optional<File>, List<File>> copyResourceFromJarToTemp(final String
dependentFiles.add(file);
}
ShutdownHookManager.get().addShutdownHook(
() -> FileUtil.fullyDelete(tempDir),
() -> FileUtils.deleteQuietly(tempDir),
LIBRARY_SHUTDOWN_HOOK_PRIORITY);
return Pair.of(Optional.of(libFile), dependentFiles);
} finally {
Expand Down
5 changes: 2 additions & 3 deletions ...hdds/rocks-native/src/test/java/org/apache/hadoop/hdds/utils/TestNativeLibraryLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
*/
package org.apache.hadoop.hdds.utils;


import org.apache.hadoop.fs.FileUtil;
import org.apache.commons.io.FileUtils;
import org.apache.hadoop.hdds.utils.db.managed.ManagedRawSSTFileReader;
import org.apache.ozone.test.tag.Native;
import org.junit.jupiter.api.io.TempDir;
Expand Down Expand Up @@ -107,7 +106,7 @@ public void testDummyLibrary(String nativeLibraryDirectoryLocation) {
.isFile();
dependencies.forEach(dep -> assertThat(new File(libPath[0], dep)).isFile());
} finally {
FileUtil.fullyDelete(libPath[0]);
FileUtils.deleteQuietly(libPath[0]);
}
}
}
Expand Down
5 changes: 0 additions & 5 deletions hadoop-hdds/rocksdb-checkpoint-differ/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,6 @@
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-rocks-native</artifactId>
Expand Down
15 changes: 11 additions & 4 deletions hadoop-hdds/server-scm/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,20 +187,27 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-common</artifactId>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-container-service</artifactId>
<artifactId>hdds-common</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-test</artifactId>
<artifactId>hdds-container-service</artifactId>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
10 changes: 0 additions & 10 deletions hadoop-hdds/tools/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,16 +140,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
12 changes: 0 additions & 12 deletions hadoop-ozone/cli-shell/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,18 +116,6 @@
<artifactId>slf4j-reload4j</artifactId>
<scope>runtime</scope>
</dependency>

<!-- Test dependencies -->
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
Expand Down
5 changes: 0 additions & 5 deletions hadoop-ozone/client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,6 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-test-utils</artifactId>
Expand Down
5 changes: 0 additions & 5 deletions hadoop-ozone/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,11 +152,6 @@
<artifactId>grpc-testing</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-hadoop-dependency-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-test-utils</artifactId>
Expand Down
Loading
Loading