Skip to content

C
cms_sys
Commit 6a75563e authored by wujj's avatar wujj
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 011ef90a db6ea623
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 24 deletions
assembly-upgrade.xml deleted 100644 → 0
View file @ 011ef90a
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
<id>upgrade</id>
<includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>zip</format>
</formats>
<fileSets>
<fileSet>
<directory>target${file.separator}classes</directory>
<outputDirectory>${file.separator}</outputDirectory>
<includes>
<include>**/upgrade/**</include>
</includes>
<excludes>
<exclude>**/upgrade/*.java</exclude>
</excludes>
</fileSet>
</fileSets>
</assembly>
pom-bin.xml
View file @ 6a75563e
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<dependency> <dependency>
<groupId>net.mingsoft</groupId> <groupId>net.mingsoft</groupId>
<artifactId>store-client</artifactId> <artifactId>store-client</artifactId>
<version>3.0</version> <version>5.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
<build> <build>
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
</executions> </executions>
<!--打包生产--> <!--打包生产-->
<configuration> <configuration>
<layout>ZIP</layout>
<fork>true</fork> <fork>true</fork>
</configuration> </configuration>
</plugin> </plugin>
......
pom-war.xml
View file @ 6a75563e
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
<dependency> <dependency>
<groupId>net.mingsoft</groupId> <groupId>net.mingsoft</groupId>
<artifactId>store-client</artifactId> <artifactId>store-client</artifactId>
<version>5.0</version> <version>5.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
pom.xml
View file @ 6a75563e
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<dependency> <dependency>
<groupId>net.mingsoft</groupId> <groupId>net.mingsoft</groupId>
<artifactId>store-client</artifactId> <artifactId>store-client</artifactId>
<version>5.0</version> <version>5.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment