[Optimize][pom] Optimize pom comments and structure (DataLinkDC#1530)

* image fix * mv Dockerfile position * 0.7 upgrade 0.8 * 0.7 upgrade 0.8
zhaopufeng · Jan 11, 2023 · 7372d91 · 7372d91
1 parent 0d0a8d1
commit 7372d91
Show file tree

Hide file tree

Showing 75 changed files with 454 additions and 548 deletions.
diff --git a/.github/workflows/docker_build.yaml b/.github/workflows/docker_build.yaml
@@ -76,6 +76,9 @@ jobs:
             namespace: dinkydocker
     steps:
       - uses: actions/checkout@v3
+      - name: Move Dockerfile
+        run: |
+          cp ./docker/Dockerfile* ./
       - name: Log in to the Container registry,url -> ${{ matrix.url }}
         if: ${{ matrix.url == 'registry.cn-hangzhou.aliyuncs.com'}}
         uses: docker/login-action@v2
@@ -114,6 +117,9 @@ jobs:
             namespace: dinkydocker
     steps:
       - uses: actions/checkout@v3
+      - name: Move Dockerfile
+        run: |
+          cp ./docker/Dockerfile* ./
       - name: Download math result for job 1
         uses: actions/download-artifact@v3
         with:

diff --git a/dinky-admin/pom.xml b/dinky-admin/pom.xml
@@ -21,11 +21,15 @@
     <parent>
         <groupId>org.dinky</groupId>
         <artifactId>dinky</artifactId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
+        <relativePath>..</relativePath>
     </parent>
-
     <artifactId>dinky-admin</artifactId>
 
+    <packaging>jar</packaging>
+
+    <name>Dinky : Admin</name>
+
     <dependencies>
         <dependency>
             <groupId>com.alibaba</groupId>

diff --git a/dinky-alert/dinky-alert-base/pom.xml b/dinky-alert/dinky-alert-base/pom.xml
@@ -21,15 +21,13 @@
     <parent>
         <groupId>org.dinky</groupId>
         <artifactId>dinky-alert</artifactId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
-
     <artifactId>dinky-alert-base</artifactId>
 
-    <properties>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
+    <packaging>jar</packaging>
+
+    <name>Dinky : Alter : Base</name>
 
     <dependencies>
         <dependency>

diff --git a/dinky-alert/dinky-alert-dingtalk/pom.xml b/dinky-alert/dinky-alert-dingtalk/pom.xml
@@ -21,15 +21,14 @@
     <parent>
         <groupId>org.dinky</groupId>
         <artifactId>dinky-alert</artifactId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
-
     <artifactId>dinky-alert-dingtalk</artifactId>
 
-    <properties>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
+    <packaging>jar</packaging>
+
+    <name>Dinky : Alter : DingTalk</name>
+
     <dependencies>
         <dependency>
             <groupId>org.dinky</groupId>

diff --git a/dinky-alert/dinky-alert-email/pom.xml b/dinky-alert/dinky-alert-email/pom.xml
@@ -21,15 +21,13 @@
     <parent>
         <groupId>org.dinky</groupId>
         <artifactId>dinky-alert</artifactId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
     <artifactId>dinky-alert-email</artifactId>
+
     <packaging>jar</packaging>
 
-    <properties>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
+    <name>Dinky : Alter : Email</name>
 
     <dependencies>
         <dependency>

diff --git a/dinky-alert/dinky-alert-feishu/pom.xml b/dinky-alert/dinky-alert-feishu/pom.xml
@@ -21,15 +21,12 @@
     <parent>
         <groupId>org.dinky</groupId>
         <artifactId>dinky-alert</artifactId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
     <artifactId>dinky-alert-feishu</artifactId>
     <packaging>jar</packaging>
 
-    <properties>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
+    <name>Dinky : Alter : FeiShu</name>
 
     <dependencies>
         <dependency>

diff --git a/dinky-alert/dinky-alert-wechat/pom.xml b/dinky-alert/dinky-alert-wechat/pom.xml
@@ -21,15 +21,13 @@
     <parent>
         <groupId>org.dinky</groupId>
         <artifactId>dinky-alert</artifactId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
-
     <artifactId>dinky-alert-wechat</artifactId>
 
-    <properties>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
+    <packaging>jar</packaging>
+
+    <name>Dinky : Alter : Wechat</name>
 
     <dependencies>
         <dependency>

diff --git a/dinky-alert/pom.xml b/dinky-alert/pom.xml
@@ -21,11 +21,14 @@
     <parent>
         <groupId>org.dinky</groupId>
         <artifactId>dinky</artifactId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
-
     <artifactId>dinky-alert</artifactId>
+
     <packaging>pom</packaging>
+
+    <name>Dinky : Alert</name>
+
     <modules>
         <module>dinky-alert-base</module>
         <module>dinky-alert-dingtalk</module>
@@ -34,8 +37,4 @@
         <module>dinky-alert-email</module>
     </modules>
 
-    <properties>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
 </project>
diff --git a/dinky-app/dinky-app-1.11/pom.xml b/dinky-app/dinky-app-1.11/pom.xml
@@ -21,16 +21,16 @@
     <parent>
         <groupId>org.dinky</groupId>
         <artifactId>dinky-app</artifactId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
-
     <artifactId>dinky-app-1.11</artifactId>
 
+    <packaging>jar</packaging>
+
+    <name>Dinky : App 1.11</name>
+
     <properties>
         <mainClass>org.dinky.app.MainApp</mainClass>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
     </properties>
 
     <dependencies>

diff --git a/dinky-app/dinky-app-1.12/pom.xml b/dinky-app/dinky-app-1.12/pom.xml
@@ -21,16 +21,16 @@
     <parent>
         <groupId>org.dinky</groupId>
         <artifactId>dinky-app</artifactId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
-
     <artifactId>dinky-app-1.12</artifactId>
 
+    <packaging>jar</packaging>
+
+    <name>Dinky : App 1.12</name>
+
     <properties>
         <mainClass>org.dinky.app.MainApp</mainClass>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
     </properties>
 
     <dependencies>

diff --git a/dinky-app/dinky-app-1.13/pom.xml b/dinky-app/dinky-app-1.13/pom.xml
@@ -21,16 +21,16 @@
     <parent>
         <groupId>org.dinky</groupId>
         <artifactId>dinky-app</artifactId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
-
     <artifactId>dinky-app-1.13</artifactId>
 
+    <packaging>jar</packaging>
+
+    <name>Dinky : App 1.13</name>
+
     <properties>
         <mainClass>org.dinky.app.MainApp</mainClass>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
     </properties>
 
     <dependencies>

diff --git a/dinky-app/dinky-app-1.14/pom.xml b/dinky-app/dinky-app-1.14/pom.xml
@@ -21,16 +21,16 @@
     <parent>
         <groupId>org.dinky</groupId>
         <artifactId>dinky-app</artifactId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
-
     <artifactId>dinky-app-1.14</artifactId>
 
+    <packaging>jar</packaging>
+
+    <name>Dinky : App 1.14</name>
+
     <properties>
         <mainClass>org.dinky.app.MainApp</mainClass>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
     </properties>
 
     <dependencies>

diff --git a/dinky-app/dinky-app-1.15/pom.xml b/dinky-app/dinky-app-1.15/pom.xml
@@ -21,16 +21,16 @@
     <parent>
         <groupId>org.dinky</groupId>
         <artifactId>dinky-app</artifactId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
-
     <artifactId>dinky-app-1.15</artifactId>
 
+    <packaging>jar</packaging>
+
+    <name>Dinky : App 1.15</name>
+
     <properties>
         <mainClass>org.dinky.app.MainApp</mainClass>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
     </properties>
 
     <dependencies>

diff --git a/dinky-app/dinky-app-1.16/pom.xml b/dinky-app/dinky-app-1.16/pom.xml
@@ -5,16 +5,16 @@
     <parent>
         <groupId>org.dinky</groupId>
         <artifactId>dinky-app</artifactId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
-
     <artifactId>dinky-app-1.16</artifactId>
 
+    <packaging>jar</packaging>
+
+    <name>Dinky : App 1.16</name>
+
     <properties>
         <mainClass>org.dinky.app.MainApp</mainClass>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
     </properties>
 
     <dependencies>

diff --git a/dinky-app/dinky-app-base/pom.xml b/dinky-app/dinky-app-base/pom.xml
@@ -21,15 +21,13 @@
     <parent>
         <groupId>org.dinky</groupId>
         <artifactId>dinky-app</artifactId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
-
     <artifactId>dinky-app-base</artifactId>
 
-    <properties>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
+    <packaging>jar</packaging>
+
+    <name>Dinky : App : Base</name>
 
     <dependencies>
         <dependency>

diff --git a/dinky-app/pom.xml b/dinky-app/pom.xml
@@ -5,22 +5,18 @@
     <parent>
         <groupId>org.dinky</groupId>
         <artifactId>dinky</artifactId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
-
     <artifactId>dinky-app</artifactId>
 
     <packaging>pom</packaging>
 
+    <name>Dinky : App</name>
+
     <modules>
         <module>dinky-app-base</module>
     </modules>
 
-    <properties>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
-
     <profiles>
         <profile>
             <id>flink-1.11</id>

diff --git a/dinky-assembly/pom.xml b/dinky-assembly/pom.xml
@@ -21,12 +21,14 @@
     <parent>
         <groupId>org.dinky</groupId>
         <artifactId>dinky</artifactId>
-        <version>0.7.0</version>
+        <version>0.8.0</version>
     </parent>
-
     <artifactId>dinky-assembly</artifactId>
+
     <packaging>pom</packaging>
 
+    <name>Dinky : Assembly</name>
+
     <build>
         <plugins>
             <plugin>

diff --git a/dinky-catalog/dinky-catalog-mysql/dinky-catalog-mysql-1.13/pom.xml b/dinky-catalog/dinky-catalog-mysql/dinky-catalog-mysql-1.13/pom.xml
@@ -15,23 +15,19 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <artifactId>dinky-catalog-mysql</artifactId>
         <groupId>org.dinky</groupId>
-        <version>0.7.0</version>
+        <artifactId>dinky-catalog-mysql</artifactId>
+        <version>0.8.0</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
-
     <artifactId>dinky-catalog-mysql-1.13</artifactId>
 
-    <properties>
-        <maven.compiler.source>${target.java.version}</maven.compiler.source>
-        <maven.compiler.target>${target.java.version}</maven.compiler.target>
-    </properties>
+    <packaging>jar</packaging>
+
+    <name>Dinky : Catalog : Mysql 1.13</name>
 
     <dependencies>
         <dependency>