Skip to content

HDDS-12020. Enable sortpom in hdds-erasurecode, hdds-framework, hdds-hadoop-dependency-client. #7644

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
adoroszlai merged 3 commits into from
Jan 5, 2025
+259 −299
Merged

HDDS-12020. Enable sortpom in hdds-erasurecode, hdds-framework, hdds-hadoop-dependency-client. #7644

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b05fccc
HDDS-12020. Enable sortpom in hdds-erasurecode, hdds-framework, hdds-…
nandakumar131 Jan 4, 2025
d4b766a
Merge remote-tracking branch 'upstream/master' into HDDS-12020
nandakumar131 Jan 4, 2025
5921190
Removed empty lines between dependencies
nandakumar131 Jan 4, 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
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 @@ -27,12 +27,10 @@
<description>Apache Ozone Distributed Data Store Client Library</description>

<dependencies>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>

<dependency>
<groupId>io.opentracing</groupId>
<artifactId>opentracing-api</artifactId>
Expand All @@ -41,12 +39,10 @@
<groupId>io.opentracing</groupId>
<artifactId>opentracing-util</artifactId>
</dependency>

<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
Expand Down Expand Up @@ -87,7 +83,6 @@
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-thirdparty-misc</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion hadoop-hdds/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,10 +226,10 @@

<!-- Test dependencies -->
<dependency>
<!-- Needed for mocking RaftServerImpl -->
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-core</artifactId>
<scope>test</scope>
<!-- Needed for mocking RaftServerImpl -->
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
Expand Down
8 changes: 1 addition & 7 deletions hadoop-hdds/container-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
<packaging>jar</packaging>
<name>Apache Ozone HDDS Container Service</name>
<description>Apache Ozone Distributed Data Store Container Service</description>
<dependencies>

<dependencies>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
Expand Down Expand Up @@ -94,7 +94,6 @@
<groupId>io.opentracing</groupId>
<artifactId>opentracing-util</artifactId>
</dependency>

<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
Expand All @@ -103,7 +102,6 @@
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
</dependency>

<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
Expand Down Expand Up @@ -168,7 +166,6 @@
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-proto</artifactId>
</dependency>

<dependency>
<groupId>org.apache.ratis</groupId>
<artifactId>ratis-server</artifactId>
Expand All @@ -185,7 +182,6 @@
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-runtime</artifactId>
</dependency>

<dependency>
<groupId>org.rocksdb</groupId>
<artifactId>rocksdbjni</artifactId>
Expand All @@ -194,12 +190,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</dependency>

<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-docs</artifactId>
Expand Down
30 changes: 10 additions & 20 deletions hadoop-hdds/erasurecode/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
See the License for the specific language governing permissions and
limitations under the License. See accompanying LICENSE file.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
https://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.ozone</groupId>
Expand All @@ -24,29 +21,27 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
</parent>
<artifactId>hdds-erasurecode</artifactId>
<version>2.0.0-SNAPSHOT</version>
<description>Apache Ozone Distributed Data Store Earsurecode utils
</description>
<name>Apache Ozone HDDS Erasurecode</name>
<packaging>jar</packaging>

<properties>
<sort.skip>true</sort.skip>
</properties>
<name>Apache Ozone HDDS Erasurecode</name>
<description>Apache Ozone Distributed Data Store Earsurecode utils</description>

<dependencies>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-common</artifactId>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>

<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-config</artifactId>
<scope>test</scope>
</dependency>

<!-- Test dependencies -->
Comment on lines +42 to 47
Copy link
Contributor

@adoroszlai adoroszlai Jan 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can either remove <!-- Test dependencies -->, or move it before the first one with test scope.

Copy link
Contributor Author

@nandakumar131 nandakumar131 Jan 5, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad, I will fix (move it where the test dependencies start) this in the next PR.

Expand All @@ -60,11 +55,6 @@ https://maven.apache.org/xsd/maven-4.0.0.xsd">
<artifactId>hdds-test-utils</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.ozone</groupId>
<artifactId>hdds-config</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
Loading
Loading