Skip to content
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.

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

[INLONG-760] standardize the directories name for the sort sub-module #562

Merged
merged 2 commits into from
Jul 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions inlong-manager/manager-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@

<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-common</artifactId>
<artifactId>sort-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-api</artifactId>
<artifactId>sort-api</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
10 changes: 5 additions & 5 deletions inlong-sort/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@
</properties>

<modules>
<module>api</module>
<module>common</module>
<module>core</module>
<module>dist</module>
<module>formats</module>
<module>sort-api</module>
<module>sort-common</module>
<module>sort-core</module>
<module>sort-dist</module>
<module>sort-formats</module>
</modules>

<dependencies>
Expand Down
4 changes: 2 additions & 2 deletions inlong-sort/api/pom.xml → inlong-sort/sort-api/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>inlong-sort-api</artifactId>
<artifactId>sort-api</artifactId>
<name>Apache InLong - Sort Api</name>
<packaging>jar</packaging>

Expand All @@ -40,7 +40,7 @@
<dependencies>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-common</artifactId>
<artifactId>sort-common</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>inlong-sort-common</artifactId>
<artifactId>sort-common</artifactId>
<name>Apache InLong - Sort Common</name>
<packaging>jar</packaging>

Expand All @@ -50,7 +50,7 @@

<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-format-common</artifactId>
<artifactId>sort-format-common</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down
18 changes: 9 additions & 9 deletions inlong-sort/core/pom.xml → inlong-sort/sort-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>inlong-sort-core</artifactId>
<artifactId>sort-core</artifactId>
<name>Apache InLong - Sort Core</name>
<packaging>jar</packaging>

<dependencies>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-common</artifactId>
<artifactId>sort-common</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down Expand Up @@ -102,37 +102,37 @@

<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-format-base</artifactId>
<artifactId>sort-format-base</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-format-common</artifactId>
<artifactId>sort-format-common</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-format-csv</artifactId>
<artifactId>sort-format-csv</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-format-kv</artifactId>
<artifactId>sort-format-kv</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-format-tdmsg-base</artifactId>
<artifactId>sort-format-tdmsg-base</artifactId>
<version>${project.version}</version>
</dependency>

<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-format-tdmsg-csv</artifactId>
<artifactId>sort-format-tdmsg-csv</artifactId>
<version>${project.version}</version>
</dependency>

Expand Down Expand Up @@ -164,7 +164,7 @@

<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-api</artifactId>
<artifactId>sort-api</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Expand Down
8 changes: 4 additions & 4 deletions inlong-sort/dist/pom.xml → inlong-sort/sort-dist/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>inlong-sort-dist</artifactId>
<artifactId>sort-dist</artifactId>
<name>Apache InLong - Sort Dist</name>

<dependencies>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-common</artifactId>
<artifactId>sort-common</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-core</artifactId>
<artifactId>sort-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-api</artifactId>
<artifactId>sort-api</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,20 +23,20 @@

<parent>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-formats</artifactId>
<artifactId>sort-formats</artifactId>
<version>0.9.0-incubating</version>
<relativePath>..</relativePath>
</parent>

<artifactId>inlong-sort-format-base</artifactId>
<artifactId>sort-format-base</artifactId>
<name>Apache InLong - Sort Format-base</name>
<packaging>jar</packaging>

<dependencies>

<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-format-common</artifactId>
<artifactId>sort-format-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@

<parent>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-formats</artifactId>
<artifactId>sort-formats</artifactId>
<version>0.9.0-incubating</version>
<relativePath>..</relativePath>
</parent>

<artifactId>inlong-sort-format-common</artifactId>
<artifactId>sort-format-common</artifactId>
<name>Apache InLong - Sort Format-common</name>
<packaging>jar</packaging>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@

<parent>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-formats</artifactId>
<artifactId>sort-formats</artifactId>
<version>0.9.0-incubating</version>
<relativePath>..</relativePath>
</parent>

<artifactId>inlong-sort-format-csv</artifactId>
<artifactId>sort-format-csv</artifactId>
<name>Apache InLong - Sort Format-csv</name>
<packaging>jar</packaging>

Expand All @@ -38,14 +38,14 @@

<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-format-common</artifactId>
<artifactId>sort-format-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-format-base</artifactId>
<artifactId>sort-format-base</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@

<parent>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-formats</artifactId>
<artifactId>sort-formats</artifactId>
<version>0.9.0-incubating</version>
<relativePath>..</relativePath>
</parent>

<artifactId>inlong-sort-format-kv</artifactId>
<artifactId>sort-format-kv</artifactId>
<name>Apache InLong - Sort Format-kv</name>
<packaging>jar</packaging>

Expand All @@ -38,14 +38,14 @@

<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-format-common</artifactId>
<artifactId>sort-format-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-format-base</artifactId>
<artifactId>sort-format-base</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@

<parent>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-formats</artifactId>
<artifactId>sort-formats</artifactId>
<version>0.9.0-incubating</version>
<relativePath>..</relativePath>
</parent>

<artifactId>inlong-sort-format-tdmsg-base</artifactId>
<artifactId>sort-format-tdmsg-base</artifactId>
<name>Apache InLong - Sort Format-tdmsg-base</name>
<packaging>jar</packaging>

Expand Down Expand Up @@ -62,14 +62,14 @@

<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-format-common</artifactId>
<artifactId>sort-format-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-format-base</artifactId>
<artifactId>sort-format-base</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@

<parent>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-formats</artifactId>
<artifactId>sort-formats</artifactId>
<version>0.9.0-incubating</version>
<relativePath>..</relativePath>
</parent>

<artifactId>inlong-sort-format-tdmsg-csv</artifactId>
<artifactId>sort-format-tdmsg-csv</artifactId>
<name>Apache InLong - Sort Format-tdmsg-csv</name>
<packaging>jar</packaging>

Expand All @@ -38,21 +38,21 @@

<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-format-common</artifactId>
<artifactId>sort-format-common</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-format-base</artifactId>
<artifactId>sort-format-base</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>

<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-format-tdmsg-base</artifactId>
<artifactId>sort-format-tdmsg-base</artifactId>
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
<relativePath>../pom.xml</relativePath>
</parent>

<artifactId>inlong-sort-formats</artifactId>
<artifactId>sort-formats</artifactId>
<name>Apache InLong - Sort Formats</name>
<packaging>pom</packaging>

Expand Down