更改打包方式

30f43110 · xiaonannet · d3bb056b · 30f43110 · 30f43110 · 30f43110
12 changed file
--- a/pom.xml
+++ b/pom.xml
@@ -38,9 +38,6 @@
        <poi.version>4.1.2</poi.version>
        <common-pool.version>2.11.1</common-pool.version>
        <commons-collections.version>3.2.2</commons-collections.version>
-        <!--lib打包目录-->
-        <!--suppress UnresolvedMavenProperty -->
-        <thinglinks.lib.package.url>${project.basedir}\doc\dockerfile\thinglinks\lib\</thinglinks.lib.package.url>
        <!-- 文件拷贝时的编码 -->
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

--- a/thinglinks-auth/pom.xml
+++ b/thinglinks-auth/pom.xml
@@ -15,7 +15,11 @@
    </description>

    <properties>
+        <!--lib打包目录-->
+        <!--suppress UnresolvedMavenProperty -->
+        <thinglinks.lib.package.url>${project.parent.basedir}\doc\dockerfile\thinglinks\lib\</thinglinks.lib.package.url>
        <!--打包目录-->
+        <!--suppress UnresolvedMavenProperty -->
        <thinglinks.package.url>${project.parent.basedir}\doc\dockerfile\thinglinks\auth\jar</thinglinks.package.url>
        <!--启动类目录-->
        <thinglinks.mainClass.url>com.mqttsnet.thinglinks.auth.ThingLinksAuthApplication</thinglinks.mainClass.url>
@@ -96,7 +100,7 @@
                        <manifest>
                            <addClasspath>true</addClasspath>
                            <!--MANIFEST.MF 中 Class-Path 加入前缀-->
-                            <classpathPrefix>../lib/</classpathPrefix>
+                            <classpathPrefix>../../lib/</classpathPrefix>
                            <!--jar包不包含唯一版本标识-->
                            <useUniqueVersions>false</useUniqueVersions>
                            <!--指定入口类-->

--- a/thinglinks-gateway/pom.xml
+++ b/thinglinks-gateway/pom.xml
@@ -15,7 +15,10 @@
    </description>

    <properties>
+        <!--suppress UnresolvedMavenProperty -->
+        <thinglinks.lib.package.url>${project.parent.basedir}\doc\dockerfile\thinglinks\lib\</thinglinks.lib.package.url>
        <!--打包目录-->
+        <!--suppress UnresolvedMavenProperty -->
        <thinglinks.package.url>${project.parent.basedir}\doc\dockerfile\thinglinks\gateway\jar</thinglinks.package.url>
        <!--启动类目录-->
        <thinglinks.mainClass.url>com.mqttsnet.thinglinks.gateway.ThingLinksGatewayApplication</thinglinks.mainClass.url>
@@ -126,7 +129,7 @@
                        <manifest>
                            <addClasspath>true</addClasspath>
                            <!--MANIFEST.MF 中 Class-Path 加入前缀-->
-                            <classpathPrefix>../lib/</classpathPrefix>
+                            <classpathPrefix>../../lib/</classpathPrefix>
                            <!--jar包不包含唯一版本标识-->
                            <useUniqueVersions>false</useUniqueVersions>
                            <!--指定入口类-->

--- a/thinglinks-modules/thinglinks-modules-broker/pom.xml
+++ b/thinglinks-modules/thinglinks-modules-broker/pom.xml
@@ -16,7 +16,10 @@
    </description>

    <properties>
+        <!--suppress UnresolvedMavenProperty -->
+        <thinglinks.lib.package.url>${project.parent.parent.basedir}\doc\dockerfile\thinglinks\lib\</thinglinks.lib.package.url>
        <!--打包目录-->
+        <!--suppress UnresolvedMavenProperty -->
        <thinglinks.package.url>${project.parent.parent.basedir}\doc\dockerfile\thinglinks\broker\jar</thinglinks.package.url>
        <!--启动类目录-->
        <thinglinks.mainClass.url>com.mqttsnet.thinglinks.broker.ThingLinksBrokerApplication</thinglinks.mainClass.url>
@@ -118,7 +121,7 @@
                        <manifest>
                            <addClasspath>true</addClasspath>
                            <!--MANIFEST.MF 中 Class-Path 加入前缀-->
-                            <classpathPrefix>../lib/</classpathPrefix>
+                            <classpathPrefix>../../lib/</classpathPrefix>
                            <!--jar包不包含唯一版本标识-->
                            <useUniqueVersions>false</useUniqueVersions>
                            <!--指定入口类-->

--- a/thinglinks-modules/thinglinks-modules-file/pom.xml
+++ b/thinglinks-modules/thinglinks-modules-file/pom.xml
@@ -16,7 +16,10 @@
    </description>

    <properties>
+        <!--suppress UnresolvedMavenProperty -->
+        <thinglinks.lib.package.url>${project.parent.parent.basedir}\doc\dockerfile\thinglinks\lib\</thinglinks.lib.package.url>
        <!--打包目录-->
+        <!--suppress UnresolvedMavenProperty -->
        <thinglinks.package.url>${project.parent.parent.basedir}\doc\dockerfile\thinglinks\file\jar</thinglinks.package.url>
        <!--启动类目录-->
        <thinglinks.mainClass.url>com.mqttsnet.thinglinks.file.ThingLinksFileApplication</thinglinks.mainClass.url>
@@ -111,7 +114,7 @@
                        <manifest>
                            <addClasspath>true</addClasspath>
                            <!--MANIFEST.MF 中 Class-Path 加入前缀-->
-                            <classpathPrefix>../lib/</classpathPrefix>
+                            <classpathPrefix>../../lib/</classpathPrefix>
                            <!--jar包不包含唯一版本标识-->
                            <useUniqueVersions>false</useUniqueVersions>
                            <!--指定入口类-->

--- a/thinglinks-modules/thinglinks-modules-gen/pom.xml
+++ b/thinglinks-modules/thinglinks-modules-gen/pom.xml
@@ -16,7 +16,10 @@
    </description>

    <properties>
+        <!--suppress UnresolvedMavenProperty -->
+        <thinglinks.lib.package.url>${project.parent.parent.basedir}\doc\dockerfile\thinglinks\lib\</thinglinks.lib.package.url>
        <!--打包目录-->
+        <!--suppress UnresolvedMavenProperty -->
        <thinglinks.package.url>${project.parent.parent.basedir}\doc\dockerfile\thinglinks\gen\jar</thinglinks.package.url>
        <!--启动类目录-->
        <thinglinks.mainClass.url>com.mqttsnet.thinglinks.gen.ThingLinksGenApplication</thinglinks.mainClass.url>
@@ -123,7 +126,7 @@
                        <manifest>
                            <addClasspath>true</addClasspath>
                            <!--MANIFEST.MF 中 Class-Path 加入前缀-->
-                            <classpathPrefix>../lib/</classpathPrefix>
+                            <classpathPrefix>../../lib/</classpathPrefix>
                            <!--jar包不包含唯一版本标识-->
                            <useUniqueVersions>false</useUniqueVersions>
                            <!--指定入口类-->

--- a/thinglinks-modules/thinglinks-modules-job/pom.xml
+++ b/thinglinks-modules/thinglinks-modules-job/pom.xml
@@ -16,7 +16,10 @@
    </description>

    <properties>
+        <!--suppress UnresolvedMavenProperty -->
+        <thinglinks.lib.package.url>${project.parent.parent.basedir}\doc\dockerfile\thinglinks\lib\</thinglinks.lib.package.url>
        <!--打包目录-->
+        <!--suppress UnresolvedMavenProperty -->
        <thinglinks.package.url>${project.parent.parent.basedir}\doc\dockerfile\thinglinks\job\jar</thinglinks.package.url>
        <!--启动类目录-->
        <thinglinks.mainClass.url>com.mqttsnet.thinglinks.job.ThingLinksJobApplication</thinglinks.mainClass.url>
@@ -123,7 +126,7 @@
                        <manifest>
                            <addClasspath>true</addClasspath>
                            <!--MANIFEST.MF 中 Class-Path 加入前缀-->
-                            <classpathPrefix>../lib/</classpathPrefix>
+                            <classpathPrefix>../../lib/</classpathPrefix>
                            <!--jar包不包含唯一版本标识-->
                            <useUniqueVersions>false</useUniqueVersions>
                            <!--指定入口类-->

--- a/thinglinks-modules/thinglinks-modules-link/pom.xml
+++ b/thinglinks-modules/thinglinks-modules-link/pom.xml
@@ -16,7 +16,10 @@
    </description>

    <properties>
+        <!--suppress UnresolvedMavenProperty -->
+        <thinglinks.lib.package.url>${project.parent.parent.basedir}\doc\dockerfile\thinglinks\lib\</thinglinks.lib.package.url>
        <!--打包目录-->
+        <!--suppress UnresolvedMavenProperty -->
        <thinglinks.package.url>${project.parent.parent.basedir}\doc\dockerfile\thinglinks\link\jar</thinglinks.package.url>
        <!--启动类目录-->
        <thinglinks.mainClass.url>com.mqttsnet.thinglinks.link.ThingLinksLinkApplication</thinglinks.mainClass.url>
@@ -135,7 +138,7 @@
                        <manifest>
                            <addClasspath>true</addClasspath>
                            <!--MANIFEST.MF 中 Class-Path 加入前缀-->
-                            <classpathPrefix>../lib/</classpathPrefix>
+                            <classpathPrefix>../../lib/</classpathPrefix>
                            <!--jar包不包含唯一版本标识-->
                            <useUniqueVersions>false</useUniqueVersions>
                            <!--指定入口类-->

--- a/thinglinks-modules/thinglinks-modules-system/pom.xml
+++ b/thinglinks-modules/thinglinks-modules-system/pom.xml
@@ -16,7 +16,10 @@
    </description>

    <properties>
+        <!--suppress UnresolvedMavenProperty -->
+        <thinglinks.lib.package.url>${project.parent.parent.basedir}\doc\dockerfile\thinglinks\lib\</thinglinks.lib.package.url>
        <!--打包目录-->
+        <!--suppress UnresolvedMavenProperty -->
        <thinglinks.package.url>${project.parent.parent.basedir}\doc\dockerfile\thinglinks\system\jar</thinglinks.package.url>
        <!--启动类目录-->
        <thinglinks.mainClass.url>com.mqttsnet.thinglinks.system.ThingLinksSystemApplication</thinglinks.mainClass.url>
@@ -125,7 +128,7 @@
                        <manifest>
                            <addClasspath>true</addClasspath>
                            <!--MANIFEST.MF 中 Class-Path 加入前缀-->
-                            <classpathPrefix>../lib/</classpathPrefix>
+                            <classpathPrefix>../../lib/</classpathPrefix>
                            <!--jar包不包含唯一版本标识-->
                            <useUniqueVersions>false</useUniqueVersions>
                            <!--指定入口类-->

--- a/thinglinks-modules/thinglinks-modules-tdengine/pom.xml
+++ b/thinglinks-modules/thinglinks-modules-tdengine/pom.xml
@@ -16,7 +16,10 @@
    </description>

    <properties>
+        <!--suppress UnresolvedMavenProperty -->
+        <thinglinks.lib.package.url>${project.parent.parent.basedir}\doc\dockerfile\thinglinks\lib\</thinglinks.lib.package.url>
        <!--打包目录-->
+        <!--suppress UnresolvedMavenProperty -->
        <thinglinks.package.url>${project.parent.parent.basedir}\doc\dockerfile\thinglinks\tdengine\jar</thinglinks.package.url>
        <!--启动类目录-->
        <thinglinks.mainClass.url>com.mqttsnet.thinglinks.tdengine.ThingLinksTdengineApplication</thinglinks.mainClass.url>
@@ -79,7 +82,7 @@
        <dependency>
            <groupId>com.taosdata.jdbc</groupId>
            <artifactId>taos-jdbcdriver</artifactId>
-            <version>2.0.34</version>
+            <version>2.0.35</version>
        </dependency>

        <!-- thinglinks Common Datasource -->
@@ -154,7 +157,7 @@
                        <manifest>
                            <addClasspath>true</addClasspath>
                            <!--MANIFEST.MF 中 Class-Path 加入前缀-->
-                            <classpathPrefix>../lib/</classpathPrefix>
+                            <classpathPrefix>../../lib/</classpathPrefix>
                            <!--jar包不包含唯一版本标识-->
                            <useUniqueVersions>false</useUniqueVersions>
                            <!--指定入口类-->

--- a/thinglinks-visual/thinglinks-visual-collection/pom.xml
+++ b/thinglinks-visual/thinglinks-visual-collection/pom.xml
@@ -16,7 +16,10 @@
    </description>

    <properties>
+        <!--suppress UnresolvedMavenProperty -->
+        <thinglinks.lib.package.url>${project.parent.parent.basedir}\doc\dockerfile\thinglinks\lib\</thinglinks.lib.package.url>
        <!--打包目录-->
+        <!--suppress UnresolvedMavenProperty -->
        <thinglinks.package.url>${project.parent.parent.basedir}\doc\dockerfile\thinglinks\collection\jar</thinglinks.package.url>
        <!--启动类目录-->
        <thinglinks.mainClass.url>com.mqttsnet.thinglinks.collection.ThingLinksCollectionApplication</thinglinks.mainClass.url>
@@ -118,7 +121,7 @@
                        <manifest>
                            <addClasspath>true</addClasspath>
                            <!--MANIFEST.MF 中 Class-Path 加入前缀-->
-                            <classpathPrefix>../lib/</classpathPrefix>
+                            <classpathPrefix>../../lib/</classpathPrefix>
                            <!--jar包不包含唯一版本标识-->
                            <useUniqueVersions>false</useUniqueVersions>
                            <!--指定入口类-->

--- a/thinglinks-visual/thinglinks-visual-monitor/pom.xml
+++ b/thinglinks-visual/thinglinks-visual-monitor/pom.xml
@@ -16,7 +16,10 @@
    </description>

    <properties>
+        <!--suppress UnresolvedMavenProperty -->
+        <thinglinks.lib.package.url>${project.parent.parent.basedir}\doc\dockerfile\thinglinks\lib\</thinglinks.lib.package.url>
        <!--打包目录-->
+        <!--suppress UnresolvedMavenProperty -->
        <thinglinks.package.url>${project.parent.parent.basedir}\doc\dockerfile\thinglinks\monitor\jar</thinglinks.package.url>
        <!--启动类目录-->
        <thinglinks.mainClass.url>com.mqttsnet.thinglinks.collection.ThingLinksCollectionApplication</thinglinks.mainClass.url>
@@ -132,5 +135,111 @@
        </dependency>

    </dependencies>
-
+    <build>
+        <plugins>
+            <!--打包jar-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <!--                    &lt;!&ndash;不打包资源文件&ndash;&gt;-->
+                    <excludes>
+                        <exclude>*.**</exclude>
+                        <exclude>*/*.xml</exclude>
+                    </excludes>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <!--MANIFEST.MF 中 Class-Path 加入前缀-->
+                            <classpathPrefix>../../lib/</classpathPrefix>
+                            <!--jar包不包含唯一版本标识-->
+                            <useUniqueVersions>false</useUniqueVersions>
+                            <!--指定入口类-->
+                            <mainClass>${thinglinks.mainClass.url}</mainClass>
+                        </manifest>
+                        <manifestEntries>
+                            <!--MANIFEST.MF 中 Class-Path 加入资源文件目录-->
+                            <Class-Path>./resources/</Class-Path>
+                        </manifestEntries>
+                    </archive>
+                    <outputDirectory>${thinglinks.package.url}</outputDirectory>
+                </configuration>
+            </plugin>
+
+            <!--拷贝依赖 copy-dependencies-->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.2.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>
+                                ${thinglinks.lib.package.url}
+                            </outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!--拷贝资源文件 copy-resources-->
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>src/main/resources</directory>
+                                </resource>
+                            </resources>
+                            <outputDirectory>${thinglinks.package.url}/resources</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!--spring boot repackage，依赖 maven-jar-plugin 打包的jar包 重新打包成 spring boot 的jar包-->
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.5.5</version>
+                <configuration>
+                    <!--重写包含依赖，包含不存在的依赖，jar里没有pom里的依赖-->
+                    <includes>
+                        <include>
+                            <groupId>null</groupId>
+                            <artifactId>null</artifactId>
+                        </include>
+                    </includes>
+                    <layout>ZIP</layout>
+                    <!--使用外部配置文件，jar包里没有资源文件-->
+                    <addResources>true</addResources>
+                    <outputDirectory>${thinglinks.package.url}</outputDirectory>
+                </configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                        <configuration>
+                            <!--配置jar包特殊标识 配置后，保留原文件，生成新文件 *-run.jar -->
+                            <!--配置jar包特殊标识 不配置，原文件命名为 *.jar.original，生成新文件 *.jar -->
+                            <!--<classifier>run</classifier>-->
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
\ No newline at end of file