From 62dcc43444c160d0d10915e0d643e39be5c8359b Mon Sep 17 00:00:00 2001
From: noear <noear@live.cn>
Date: Mon, 3 Apr 2023 20:28:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=20solon=20=E4=B8=BA=202.2.8?=
 =?UTF-8?q?=EF=BC=8C=E9=A1=BA=E5=B8=A6=E7=AE=80=E5=8C=96=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 neutrino-proxy-core/pom.xml   |  2 +-
 neutrino-proxy-server/pom.xml | 57 +++--------------------------------
 pom.xml                       |  2 +-
 3 files changed, 6 insertions(+), 55 deletions(-)

diff --git a/neutrino-proxy-core/pom.xml b/neutrino-proxy-core/pom.xml
index 040eb360..b13b8acf 100644
--- a/neutrino-proxy-core/pom.xml
+++ b/neutrino-proxy-core/pom.xml
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-core</artifactId>
-            <version>${hutool.ver}</version>
+            <version>${hutool.version}</version>
         </dependency>
         <!--lombok-->
         <dependency>
diff --git a/neutrino-proxy-server/pom.xml b/neutrino-proxy-server/pom.xml
index 5930693d..e93cb1a9 100644
--- a/neutrino-proxy-server/pom.xml
+++ b/neutrino-proxy-server/pom.xml
@@ -61,64 +61,15 @@
         </dependency>
     </dependencies>
 
-<!--    <build>-->
-<!--        <finalName>${artifactId}</finalName>-->
-<!--        <plugins>-->
-<!--            <plugin>-->
-<!--                <groupId>org.springframework.boot</groupId>-->
-<!--                <artifactId>spring-boot-maven-plugin</artifactId>-->
-<!--                <version>2.1.3.RELEASE</version>-->
-<!--                <configuration>-->
-<!--                    <mainClass>org.dromara.neutrinoproxy.server.ProxyServer</mainClass>-->
-<!--                </configuration>-->
-<!--                <executions>-->
-<!--                    <execution>-->
-<!--                        <goals>-->
-<!--                            <goal>repackage</goal>-->
-<!--                        </goals>-->
-<!--                    </execution>-->
-<!--                </executions>-->
-<!--            </plugin>-->
-<!--        </plugins>-->
-<!--    </build>-->
 
     <build>
-        <resources>
-            <resource>
-                <directory>${project.basedir}/src/main/resources</directory>
-                <filtering>false</filtering>
+        <finalName>${project.artifactId}</finalName>
 
-                <excludes>
-                    <exclude>app-*.yml</exclude>
-                </excludes>
-            </resource>
-        </resources>
         <plugins>
+            <!-- 配置打包插件（并打包成胖包） -->
             <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <finalName>${artifactId}</finalName>
-                    <archive>
-                        <manifest>
-                            <!--这里指定要运行的main类-->
-                            <mainClass>org.dromara.neutrinoproxy.server.ProxyServer</mainClass>
-                        </manifest>
-                    </archive>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
+                <groupId>org.noear</groupId>
+                <artifactId>solon-maven-plugin</artifactId>
             </plugin>
         </plugins>
     </build>
diff --git a/pom.xml b/pom.xml
index eca2b474..79d40881 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.noear</groupId>
         <artifactId>solon-parent</artifactId>
-        <version>2.2.2</version>
+        <version>2.2.8</version>
         <relativePath />
     </parent>