|
|
@@ -1,140 +1,136 @@
|
|
|
-<?xml version="1.0" encoding="UTF-8"?>
|
|
|
-<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>
|
|
|
-
|
|
|
- <groupId>net.mingsoft</groupId>
|
|
|
- <artifactId>mcms</artifactId>
|
|
|
- <version>4.7.0-SNAPSHOT</version>
|
|
|
- <name>ms-mcms</name>
|
|
|
- <packaging>war</packaging>
|
|
|
- <properties>
|
|
|
- <java.version>1.8</java.version>
|
|
|
- </properties>
|
|
|
- <repositories>
|
|
|
- <repository>
|
|
|
- <id>sonatype-nexus-snapshots</id>
|
|
|
- <name>Sonatype Nexus Snapshots</name>
|
|
|
- <url>http://repo1.maven.org/maven2/</url>
|
|
|
- <releases>
|
|
|
- <enabled>true</enabled>
|
|
|
- </releases>
|
|
|
- <snapshots>
|
|
|
- <enabled>true</enabled>
|
|
|
- </snapshots>
|
|
|
- </repository>
|
|
|
- <repository>
|
|
|
- <id>sonatype</id>
|
|
|
- <name>Sonatype Snapshots</name>
|
|
|
- <url>https://oss.sonatype.org/content/groups/public/</url>
|
|
|
- <releases>
|
|
|
- <enabled>true</enabled>
|
|
|
- </releases>
|
|
|
- <snapshots>
|
|
|
- <enabled>true</enabled>
|
|
|
- </snapshots>
|
|
|
- </repository>
|
|
|
- </repositories>
|
|
|
- <dependencies>
|
|
|
- <dependency>
|
|
|
- <groupId>net.mingsoft</groupId>
|
|
|
- <artifactId>ms-base</artifactId>
|
|
|
- <version>1.0.8.boot</version>
|
|
|
- </dependency>
|
|
|
- <dependency>
|
|
|
- <groupId>net.mingsoft</groupId>
|
|
|
- <artifactId>ms-basic</artifactId>
|
|
|
- <version>1.0.8.1-SNAPSHOT</version>
|
|
|
- <classifier>classes</classifier>
|
|
|
- </dependency>
|
|
|
- <dependency>
|
|
|
- <groupId>net.mingsoft</groupId>
|
|
|
- <artifactId>ms-mdiy</artifactId>
|
|
|
- <version>1.0.7-SNAPSHOT</version>
|
|
|
- <classifier>classes</classifier>
|
|
|
- </dependency>
|
|
|
- <dependency>
|
|
|
- <groupId>net.mingsoft</groupId>
|
|
|
- <artifactId>ms-mpeople</artifactId>
|
|
|
- <version>1.0.7-SNAPSHOT</version>
|
|
|
- <classifier>classes</classifier>
|
|
|
- </dependency>
|
|
|
- <dependency>
|
|
|
- <groupId>net.mingsoft</groupId>
|
|
|
- <artifactId>ms-upgrader</artifactId>
|
|
|
- <version>1.0.5-SNAPSHOT</version>
|
|
|
- </dependency>
|
|
|
- <dependency>
|
|
|
- <groupId>javax.servlet</groupId>
|
|
|
- <artifactId>javax.servlet-api</artifactId>
|
|
|
- <version>3.1.0</version>
|
|
|
- <scope>test</scope>
|
|
|
- </dependency>
|
|
|
- <dependency>
|
|
|
- <groupId>org.apache.tomcat.embed</groupId>
|
|
|
- <artifactId>tomcat-embed-jasper</artifactId>
|
|
|
- <version>9.0.16</version>
|
|
|
- </dependency>
|
|
|
- </dependencies>
|
|
|
- <build>
|
|
|
- <finalName>ms-mcms</finalName>
|
|
|
- <plugins>
|
|
|
- <!-- docker部署 <plugin> <groupId>com.spotify</groupId> <artifactId>docker-maven-plugin</artifactId>
|
|
|
- <version>1.2.0</version> <configuration> <dockerHost>http://localhost</dockerHost>
|
|
|
- <imageName>ms-mcms</imageName> <baseImage>java</baseImage> <entryPoint>["java",
|
|
|
- "-jar", "/${project.build.finalName}.jar"]</entryPoint> <resources> <resource>
|
|
|
- <targetPath>/</targetPath> <directory>${project.build.directory}</directory>
|
|
|
- <include>${project.build.finalName}.jar</include> </resource> </resources>
|
|
|
- </configuration> </plugin> -->
|
|
|
- <plugin>
|
|
|
- <groupId>org.apache.maven.plugins</groupId>
|
|
|
- <artifactId>maven-compiler-plugin</artifactId>
|
|
|
- <version>3.1</version>
|
|
|
- <configuration>
|
|
|
- <source>${java.version}</source>
|
|
|
- <target>${java.version}</target>
|
|
|
- </configuration>
|
|
|
- </plugin>
|
|
|
- <plugin>
|
|
|
- <groupId>org.springframework.boot</groupId>
|
|
|
- <artifactId>spring-boot-maven-plugin</artifactId>
|
|
|
- <executions>
|
|
|
- <execution>
|
|
|
- <goals>
|
|
|
- <goal>repackage</goal>
|
|
|
- </goals>
|
|
|
- </execution>
|
|
|
- </executions>
|
|
|
- <configuration>
|
|
|
- <fork>true</fork>
|
|
|
- </configuration>
|
|
|
- </plugin>
|
|
|
- <plugin>
|
|
|
- <groupId>org.springframework.boot</groupId>
|
|
|
- <artifactId>spring-boot-maven-plugin</artifactId>
|
|
|
- </plugin>
|
|
|
- <plugin>
|
|
|
- <groupId>org.apache.maven.plugins</groupId>
|
|
|
- <artifactId>maven-war-plugin</artifactId>
|
|
|
- <configuration>
|
|
|
- <failOnMissingWebXml>false</failOnMissingWebXml>
|
|
|
- <!-- 打包时候需需要启用,注意避免快照依赖的冗余jar包 -->
|
|
|
- <!-- outputFileNameMapping>@{artifactId}@- @{baseVersion}@. @{extension}@</outputFileNameMapping -->
|
|
|
- </configuration>
|
|
|
- </plugin>
|
|
|
- </plugins>
|
|
|
- <resources>
|
|
|
- <resource>
|
|
|
- <directory>src/main/webapp</directory>
|
|
|
- </resource>
|
|
|
- <resource>
|
|
|
- <directory>src/main/resources</directory>
|
|
|
- </resource>
|
|
|
- <resource>
|
|
|
- <directory>src/main/java</directory>
|
|
|
- </resource>
|
|
|
- </resources>
|
|
|
- <defaultGoal>compile</defaultGoal>
|
|
|
- </build>
|
|
|
+<?xml version="1.0" encoding="UTF-8"?>
|
|
|
+<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>
|
|
|
+
|
|
|
+ <groupId>net.mingsoft</groupId>
|
|
|
+ <artifactId>mcms</artifactId>
|
|
|
+ <version>4.7.0-SNAPSHOT</version>
|
|
|
+ <name>ms-mcms</name>
|
|
|
+ <properties>
|
|
|
+ <java.version>1.8</java.version>
|
|
|
+ </properties>
|
|
|
+ <repositories>
|
|
|
+ <repository>
|
|
|
+ <id>sonatype-nexus-snapshots</id>
|
|
|
+ <name>Sonatype Nexus Snapshots</name>
|
|
|
+ <url>http://repo1.maven.org/maven2/</url>
|
|
|
+ <releases>
|
|
|
+ <enabled>true</enabled>
|
|
|
+ </releases>
|
|
|
+ <snapshots>
|
|
|
+ <enabled>true</enabled>
|
|
|
+ </snapshots>
|
|
|
+ </repository>
|
|
|
+ <repository>
|
|
|
+ <id>sonatype</id>
|
|
|
+ <name>Sonatype Snapshots</name>
|
|
|
+ <url>https://oss.sonatype.org/content/groups/public/</url>
|
|
|
+ <releases>
|
|
|
+ <enabled>true</enabled>
|
|
|
+ </releases>
|
|
|
+ <snapshots>
|
|
|
+ <enabled>true</enabled>
|
|
|
+ </snapshots>
|
|
|
+ </repository>
|
|
|
+ </repositories>
|
|
|
+ <dependencies>
|
|
|
+ <dependency>
|
|
|
+ <groupId>net.mingsoft</groupId>
|
|
|
+ <artifactId>ms-base</artifactId>
|
|
|
+ <version>1.0.8.boot</version>
|
|
|
+ </dependency>
|
|
|
+ <dependency>
|
|
|
+ <groupId>net.mingsoft</groupId>
|
|
|
+ <artifactId>ms-basic</artifactId>
|
|
|
+ <version>1.0.8</version>
|
|
|
+ </dependency>
|
|
|
+ <dependency>
|
|
|
+ <groupId>net.mingsoft</groupId>
|
|
|
+ <artifactId>ms-mdiy</artifactId>
|
|
|
+ <version>1.0.7</version>
|
|
|
+ </dependency>
|
|
|
+ <dependency>
|
|
|
+ <groupId>net.mingsoft</groupId>
|
|
|
+ <artifactId>ms-mpeople</artifactId>
|
|
|
+ <version>1.0.7</version>
|
|
|
+ </dependency>
|
|
|
+ <dependency>
|
|
|
+ <groupId>net.mingsoft</groupId>
|
|
|
+ <artifactId>ms-upgrader</artifactId>
|
|
|
+ <version>1.0.5-SNAPSHOT</version>
|
|
|
+ </dependency>
|
|
|
+ <dependency>
|
|
|
+ <groupId>javax.servlet</groupId>
|
|
|
+ <artifactId>javax.servlet-api</artifactId>
|
|
|
+ <version>3.1.0</version>
|
|
|
+ <scope>test</scope>
|
|
|
+ </dependency>
|
|
|
+ <dependency>
|
|
|
+ <groupId>org.apache.tomcat.embed</groupId>
|
|
|
+ <artifactId>tomcat-embed-jasper</artifactId>
|
|
|
+ <version>9.0.16</version>
|
|
|
+ </dependency>
|
|
|
+ </dependencies>
|
|
|
+ <build>
|
|
|
+ <finalName>ms-mcms</finalName>
|
|
|
+ <plugins>
|
|
|
+ <!-- docker部署 <plugin> <groupId>com.spotify</groupId> <artifactId>docker-maven-plugin</artifactId>
|
|
|
+ <version>1.2.0</version> <configuration> <dockerHost>http://localhost</dockerHost>
|
|
|
+ <imageName>ms-mcms</imageName> <baseImage>java</baseImage> <entryPoint>["java",
|
|
|
+ "-jar", "/${project.build.finalName}.jar"]</entryPoint> <resources> <resource>
|
|
|
+ <targetPath>/</targetPath> <directory>${project.build.directory}</directory>
|
|
|
+ <include>${project.build.finalName}.jar</include> </resource> </resources>
|
|
|
+ </configuration> </plugin> -->
|
|
|
+ <plugin>
|
|
|
+ <groupId>org.apache.maven.plugins</groupId>
|
|
|
+ <artifactId>maven-compiler-plugin</artifactId>
|
|
|
+ <version>3.1</version>
|
|
|
+ <configuration>
|
|
|
+ <source>${java.version}</source>
|
|
|
+ <target>${java.version}</target>
|
|
|
+ </configuration>
|
|
|
+ </plugin>
|
|
|
+ <plugin>
|
|
|
+ <groupId>org.springframework.boot</groupId>
|
|
|
+ <artifactId>spring-boot-maven-plugin</artifactId>
|
|
|
+ <executions>
|
|
|
+ <execution>
|
|
|
+ <goals>
|
|
|
+ <goal>repackage</goal>
|
|
|
+ </goals>
|
|
|
+ </execution>
|
|
|
+ </executions>
|
|
|
+ <configuration>
|
|
|
+ <fork>true</fork>
|
|
|
+ </configuration>
|
|
|
+ </plugin>
|
|
|
+ <plugin>
|
|
|
+ <groupId>org.springframework.boot</groupId>
|
|
|
+ <artifactId>spring-boot-maven-plugin</artifactId>
|
|
|
+ </plugin>
|
|
|
+ <plugin>
|
|
|
+ <groupId>org.apache.maven.plugins</groupId>
|
|
|
+ <artifactId>maven-war-plugin</artifactId>
|
|
|
+ <configuration>
|
|
|
+ <failOnMissingWebXml>false</failOnMissingWebXml>
|
|
|
+ <!-- 打包时候需需要启用,注意避免快照依赖的冗余jar包 -->
|
|
|
+ <!-- outputFileNameMapping>@{artifactId}@- @{baseVersion}@. @{extension}@</outputFileNameMapping -->
|
|
|
+ </configuration>
|
|
|
+ </plugin>
|
|
|
+ </plugins>
|
|
|
+ <resources>
|
|
|
+ <resource>
|
|
|
+ <directory>src/main/webapp</directory>
|
|
|
+ </resource>
|
|
|
+ <resource>
|
|
|
+ <directory>src/main/resources</directory>
|
|
|
+ </resource>
|
|
|
+ <resource>
|
|
|
+ <directory>src/main/java</directory>
|
|
|
+ </resource>
|
|
|
+ </resources>
|
|
|
+ <defaultGoal>compile</defaultGoal>
|
|
|
+ </build>
|
|
|
</project>
|