Skip to content

Commit

Permalink
fix conflicts in poms
Browse files Browse the repository at this point in the history
  • Loading branch information
zhoujinsong committed Aug 10, 2023
1 parent 3ae528e commit 281c391
Show file tree
Hide file tree
Showing 31 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion ams/api/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>com.netease.amoro</groupId>
<artifactId>amoro-ams</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
</parent>

<artifactId>amoro-ams-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ams/dashboard/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.netease.amoro</groupId>
<artifactId>amoro-ams</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
</parent>

<artifactId>amoro-ams-dashboard</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ams/optimizer/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>amoro-ams</artifactId>
<groupId>com.netease.amoro</groupId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand Down
2 changes: 1 addition & 1 deletion ams/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.netease.amoro</groupId>
<artifactId>amoro-parent</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
</parent>

<artifactId>amoro-ams</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ams/server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<parent>
<groupId>com.netease.amoro</groupId>
<artifactId>amoro-ams</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
</parent>

<artifactId>amoro-ams-server</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.netease.amoro</groupId>
<artifactId>amoro-parent</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion dist/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.netease.amoro</groupId>
<artifactId>amoro-parent</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
</parent>

<artifactId>dist</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion flink/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>com.netease.amoro</groupId>
<artifactId>amoro-parent</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink/v1.12/arctic-flink-1.12-iceberg-bridge/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>amoro-parent</artifactId>
<groupId>com.netease.amoro</groupId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink/v1.12/arctic-flink-1.12-pulsar-bridge/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>amoro-parent</artifactId>
<groupId>com.netease.amoro</groupId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink/v1.12/flink-format/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.netease.amoro</groupId>
<artifactId>amoro-flink</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink/v1.12/flink-runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.netease.amoro</groupId>
<artifactId>amoro-flink</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink/v1.12/flink/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.netease.amoro</groupId>
<artifactId>amoro-flink</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink/v1.14/arctic-flink-1.14-iceberg-bridge/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>amoro-parent</artifactId>
<groupId>com.netease.amoro</groupId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink/v1.14/flink-format/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.netease.amoro</groupId>
<artifactId>amoro-flink</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink/v1.14/flink-runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.netease.amoro</groupId>
<artifactId>amoro-flink</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink/v1.14/flink/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.netease.amoro</groupId>
<artifactId>amoro-flink</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink/v1.15/arctic-flink-1.15-iceberg-bridge/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<artifactId>amoro-parent</artifactId>
<groupId>com.netease.amoro</groupId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink/v1.15/flink-format/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.netease.amoro</groupId>
<artifactId>amoro-flink</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink/v1.15/flink-runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.netease.amoro</groupId>
<artifactId>amoro-flink</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion flink/v1.15/flink/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.netease.amoro</groupId>
<artifactId>amoro-flink</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion hive/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.netease.amoro</groupId>
<artifactId>amoro-parent</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

<groupId>com.netease.amoro</groupId>
<artifactId>amoro-parent</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
<packaging>pom</packaging>

<name>Amoro Project Parent</name>
Expand Down
2 changes: 1 addition & 1 deletion spark/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.netease.amoro</groupId>
<artifactId>amoro-parent</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
</parent>

<artifactId>amoro-spark</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion spark/v3.1/spark-runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.netease.amoro</groupId>
<artifactId>amoro-spark</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion spark/v3.1/spark/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.netease.amoro</groupId>
<artifactId>amoro-spark</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion spark/v3.2/spark-runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>amoro-spark</artifactId>
<groupId>com.netease.amoro</groupId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion spark/v3.2/spark/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>amoro-spark</artifactId>
<groupId>com.netease.amoro</groupId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion spark/v3.3/spark-runtime/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>amoro-spark</artifactId>
<groupId>com.netease.amoro</groupId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion spark/v3.3/spark/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<artifactId>amoro-spark</artifactId>
<groupId>com.netease.amoro</groupId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Expand Down
2 changes: 1 addition & 1 deletion trino/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<parent>
<groupId>com.netease.amoro</groupId>
<artifactId>amoro-parent</artifactId>
<version>0.5.0-SNAPSHOT</version>
<version>0.5.0</version>
</parent>

<artifactId>amoro-trino</artifactId>
Expand Down

0 comments on commit 281c391

Please sign in to comment.