adjust pom (#462)

Signed-off-by: chenxu <[email protected]> Co-authored-by: chenxu <[email protected]>
lakesoul-io · Mar 29, 2024 · e053387 · e053387
1 parent 505f754
commit e053387
Show file tree

Hide file tree

Showing 30 changed files with 144 additions and 87 deletions.
diff --git a/lakesoul-common/pom.xml b/lakesoul-common/pom.xml
@@ -15,6 +15,7 @@ SPDX-License-Identifier: Apache-2.0
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
+    <name>LakeSoul Common</name>
 
     <artifactId>lakesoul-common</artifactId>
     <version>${revision}</version>
@@ -176,9 +177,18 @@ SPDX-License-Identifier: Apache-2.0
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>flatten-maven-plugin</artifactId>
-                <!--<version>1.6.0</version>-->
+                <version>1.6.0</version>
                 <configuration>
                     <flattenMode>oss</flattenMode>
+                    <pomElements>
+                        <dependencyManagement>keep</dependencyManagement>
+                        <dependencies>keep</dependencies>
+                        <description>resolve</description>
+                        <profiles>remove</profiles>
+                        <distributionManagement>remove</distributionManagement>
+                        <pluginManagement>remove</pluginManagement>
+                        <build>remove</build>
+                    </pomElements>
                 </configuration>
                 <executions>
                     <!-- enable flattening -->

diff --git a/lakesoul-flink/pom.xml b/lakesoul-flink/pom.xml
@@ -15,9 +15,10 @@ SPDX-License-Identifier: Apache-2.0
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
+    <name>LakeSoul Flink</name>
 
     <artifactId>lakesoul-flink</artifactId>
-    <version>flink-1.17-${revision}</version>
+    <version>1.17-${revision}</version>
     <properties>
         <flink.version>1.17.1</flink.version>
         <scala.binary.version>2.12</scala.binary.version>
@@ -694,6 +695,15 @@ SPDX-License-Identifier: Apache-2.0
                 <!--<version>1.6.0</version>-->
                 <configuration>
                     <flattenMode>oss</flattenMode>
+                    <pomElements>
+                        <dependencyManagement>keep</dependencyManagement>
+                        <dependencies>keep</dependencies>
+                        <description>resolve</description>
+                        <profiles>remove</profiles>
+                        <distributionManagement>remove</distributionManagement>
+                        <pluginManagement>remove</pluginManagement>
+                        <build>remove</build>
+                    </pomElements>
                 </configuration>
                 <executions>
                     <!-- enable flattening -->

diff --git a/lakesoul-presto/pom.xml b/lakesoul-presto/pom.xml
@@ -14,9 +14,10 @@
         <artifactId>lakesoul-parent</artifactId>
         <version>${revision}</version>
     </parent>
+    <name>LakeSoul Presto</name>
 
     <artifactId>lakesoul-presto</artifactId>
-    <version>presto-0.28-${revision}</version>
+    <version>0.28-${revision}</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -149,6 +150,15 @@
                 <!--<version>1.6.0</version>-->
                 <configuration>
                     <flattenMode>oss</flattenMode>
+                    <pomElements>
+                        <dependencyManagement>keep</dependencyManagement>
+                        <dependencies>keep</dependencies>
+                        <description>resolve</description>
+                        <profiles>remove</profiles>
+                        <distributionManagement>remove</distributionManagement>
+                        <pluginManagement>remove</pluginManagement>
+                        <build>remove</build>
+                    </pomElements>
                 </configuration>
                 <executions>
                     <!-- enable flattening -->

diff --git a/lakesoul-spark/pom.xml b/lakesoul-spark/pom.xml
@@ -15,9 +15,10 @@ SPDX-License-Identifier: Apache-2.0
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
+    <name>LakeSoul Spark</name>
 
     <artifactId>lakesoul-spark</artifactId>
-    <version>spark-3.3-${revision}</version>
+    <version>3.3-${revision}</version>
 
     <properties>
         <scalatest.version>3.2.14</scalatest.version>
@@ -31,6 +32,26 @@ SPDX-License-Identifier: Apache-2.0
         <test.fork.count>2</test.fork.count>
     </properties>
 
+    <repositories>
+        <repository>
+            <id>central</id>
+            <name>Maven Central</name>
+            <layout>default</layout>
+            <url>https://repo1.maven.org/maven2</url>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>confluent</id>
+            <name>Confluent</name>
+            <url>https://packages.confluent.io/maven/</url>
+        </repository>
+    </repositories>
+
     <dependencies>
         <!-- lakesoul deps -->
         <dependency>
@@ -540,6 +561,15 @@ SPDX-License-Identifier: Apache-2.0
                 <!--<version>1.6.0</version>-->
                 <configuration>
                     <flattenMode>oss</flattenMode>
+                    <pomElements>
+                        <dependencyManagement>keep</dependencyManagement>
+                        <dependencies>keep</dependencies>
+                        <description>resolve</description>
+                        <profiles>remove</profiles>
+                        <distributionManagement>remove</distributionManagement>
+                        <pluginManagement>remove</pluginManagement>
+                        <build>remove</build>
+                    </pomElements>
                 </configuration>
                 <executions>
                     <!-- enable flattening -->

diff --git a/native-io/lakesoul-io-java/pom.xml b/native-io/lakesoul-io-java/pom.xml
@@ -20,6 +20,7 @@ SPDX-License-Identifier: Apache-2.0
     <artifactId>lakesoul-io-java</artifactId>
     <version>${revision}</version>
     <packaging>jar</packaging>
+    <name>LakeSoul IO Java</name>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>
@@ -463,6 +464,15 @@ SPDX-License-Identifier: Apache-2.0
                 <!--<version>1.6.0</version>-->
                 <configuration>
                     <flattenMode>oss</flattenMode>
+                    <pomElements>
+                        <dependencyManagement>keep</dependencyManagement>
+                        <dependencies>keep</dependencies>
+                        <description>resolve</description>
+                        <profiles>remove</profiles>
+                        <distributionManagement>remove</distributionManagement>
+                        <pluginManagement>remove</pluginManagement>
+                        <build>remove</build>
+                    </pomElements>
                 </configuration>
                 <executions>
                     <!-- enable flattening -->

diff --git a/pom.xml b/pom.xml
@@ -19,7 +19,7 @@ SPDX-License-Identifier: Apache-2.0
         <module>lakesoul-presto</module>
     </modules>
     <packaging>pom</packaging>
-    <name>LakeSoul POM</name>
+    <name>LakeSoul</name>
     <description>A Table Structure Storage to Unify Batch and Streaming Data Processing</description>
     <url>https://github.com/lakesoul-io/LakeSoul</url>
     <licenses>
@@ -73,26 +73,6 @@ SPDX-License-Identifier: Apache-2.0
         </snapshotRepository>
     </distributionManagement>
 
-    <repositories>
-        <repository>
-            <id>central</id>
-            <name>Maven Central</name>
-            <layout>default</layout>
-            <url>https://repo1.maven.org/maven2</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>confluent</id>
-            <name>Confluent</name>
-            <url>https://packages.confluent.io/maven/</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -223,9 +203,16 @@ SPDX-License-Identifier: Apache-2.0
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>flatten-maven-plugin</artifactId>
-                <!--<version>1.6.0</version>-->
+                <version>1.6.0</version>
                 <configuration>
                     <flattenMode>oss</flattenMode>
+                    <pomElements>
+                        <dependencyManagement>keep</dependencyManagement>
+                        <dependencies>keep</dependencies>
+                        <name>keep</name>
+                        <description>resolve</description>
+                        <profiles>remove</profiles>
+                    </pomElements>
                 </configuration>
                 <executions>
                     <!-- enable flattening -->

diff --git a/website/docs/01-Getting Started/01-setup-local-env.md b/website/docs/01-Getting Started/01-setup-local-env.md
@@ -91,7 +91,7 @@ spark.sql.catalog.lakesoul | org.apache.spark.sql.lakesoul.catalog.LakeSoulCatal
 spark.sql.defaultCatalog | lakesoul | set default catalog for spark
 
 ### 1.5 Setup Flink environment
-Download LakeSoul Flink jar: https://github.com/lakesoul-io/LakeSoul/releases/download/vVAR::VERSION/lakesoul-flink-flink-1.17-VAR::VERSION.jar
+Download LakeSoul Flink jar: https://github.com/lakesoul-io/LakeSoul/releases/download/vVAR::VERSION/lakesoul-flink-1.17-VAR::VERSION.jar
 
 Download Flink: https://dlcdn.apache.org/flink/flink-1.17.2/flink-1.17.2-bin-scala_2.12.tgz
 
@@ -101,7 +101,7 @@ Enter the Flink installation directory and execute the following command:
 ```shell
 export lakesoul_home=/opt/soft/pg.property && ./bin/start-cluster.sh
 
-export lakesoul_home=/opt/soft/pg.property && ./bin/sql-client.sh embedded -j lakesoul-flink-flink-1.17-VAR::VERSION.jar
+export lakesoul_home=/opt/soft/pg.property && ./bin/sql-client.sh embedded -j lakesoul-flink-1.17-VAR::VERSION.jar
 ```
 
 #### 1.5.2 Write data to object storage service

diff --git a/website/docs/01-Getting Started/02-spark-guide.mdx b/website/docs/01-Getting Started/02-spark-guide.mdx
@@ -62,8 +62,8 @@ Include maven dependencies in your project:
 ```xml
 <dependency>
     <groupId>com.dmetasoul</groupId>
-    <artifactId>lakesoul</artifactId>
-    <version>spark-3.3-VAR::VERSION</version>
+    <artifactId>lakesoul-spark</artifactId>
+    <version>3.3-VAR::VERSION</version>
 </dependency>
 ```
 

diff --git a/website/docs/02-Tutorials/02-flink-cdc-sink/index.md b/website/docs/02-Tutorials/02-flink-cdc-sink/index.md
@@ -90,7 +90,7 @@ Submit a LakeSoul Flink CDC Sink job to the Flink cluster started above:
 ```bash
 ./bin/flink run -ys 1 -yjm 1G -ytm 2G \
    -c org.apache.flink.lakesoul.entry.MysqlCdc\
-   lakesoul-flink-flink-1.17-VAR::VERSION.jar \
+   lakesoul-flink-1.17-VAR::VERSION.jar \
    --source_db.host localhost \
    --source_db.port 3306 \
    --source_db.db_name test_cdc \

diff --git a/website/docs/02-Tutorials/07-kafka-topics-data-to-lakesoul.md b/website/docs/02-Tutorials/07-kafka-topics-data-to-lakesoul.md
@@ -80,7 +80,7 @@ export lakesoul_home=./pg.properties && ./bin/spark-submit \
 --driver-memory 4g \
 --executor-memory 4g \
 --master local[4] \
-./jars/lakesoul-spark-spark-3.3-VAR::VERSION.jar \
+./jars/lakesoul-spark-3.3-VAR::VERSION.jar \
 localhost:9092 test.* /tmp/kafka/data /tmp/kafka/checkpoint/ kafka earliest false
 ```
 
@@ -157,6 +157,6 @@ export lakesoul_home=./pg.properties && ./bin/spark-submit \
 --driver-memory 4g \
 --executor-memory 4g \
 --master local[4] \
-./jars/lakesoul-spark-spark-3.3-VAR::VERSION.jar \
+./jars/lakesoul-spark-3.3-VAR::VERSION.jar \
 localhost:9092 test.* /tmp/kafka/data /tmp/kafka/checkpoint/ kafka earliest false http://localhost:8081
 ```
diff --git a/website/docs/03-Usage Docs/02-setup-spark.md b/website/docs/03-Usage Docs/02-setup-spark.md
@@ -16,14 +16,14 @@ To use `spark-shell`, `pyspark` or `spark-sql` shells, you should include LakeSo
 
 #### Use Maven Coordinates via --packages
 ```bash
-spark-shell --packages com.dmetasoul:lakesoul-spark:spark-3.3-VAR::VERSION
+spark-shell --packages com.dmetasoul:lakesoul-spark:3.3-VAR::VERSION
 ```
 
 #### Use Local Packages
 You can find the LakeSoul packages from our release page: [Releases](https://github.com/lakesoul-io/LakeSoul/releases).
 Download the jar file and pass it to `spark-submit`.
 ```bash
-spark-submit --jars "lakesoul-spark-spark-3.3-VAR::VERSION.jar"
+spark-submit --jars "lakesoul-spark-3.3-VAR::VERSION.jar"
 ```
 
 Or you could directly put the jar into `$SPARK_HOME/jars`
@@ -33,8 +33,8 @@ Include maven dependencies in your project:
 ```xml
 <dependency>
     <groupId>com.dmetasoul</groupId>
-    <artifactId>lakesoul</artifactId>
-    <version>spark-3.3-VAR::VERSION</version>
+    <artifactId>lakesoul-spark</artifactId>
+    <version>3.3-VAR::VERSION</version>
 </dependency>
 ```
 
@@ -144,7 +144,7 @@ taskmanager.memory.task.off-heap.size: 3000m
 :::
 
 ### Add LakeSoul Jar to Flink's directory
-Download LakeSoul Flink Jar from: https://github.com/lakesoul-io/LakeSoul/releases/download/vVAR::VERSION/lakesoul-flink-flink-1.17-VAR::VERSION.jar
+Download LakeSoul Flink Jar from: https://github.com/lakesoul-io/LakeSoul/releases/download/vVAR::VERSION/lakesoul-flink-1.17-VAR::VERSION.jar
 
 And put the jar file under `$FLINK_HOME/lib`. After this, you could start flink session cluster or application as usual.
 
@@ -155,6 +155,6 @@ Add the following to your project's pom.xml
 <dependency>
     <groupId>com.dmetasoul</groupId>
     <artifactId>lakesoul</artifactId>
-    <version>flink-1.17-VAR::VERSION</version>
+    <version>1.17-VAR::VERSION</version>
 </dependency>
 ```