Merge branch 'master' of https://gitee.com/xiandafu/springboot-plus

admin-core/src/main/resources/codeTemplate/maven/pomTemplate.xml

@@ -3,36 +3,31 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>${group}</groupId>
 	<artifactId>${project}</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>1.0</version>
 	<properties>
 		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<commons-lang3.version>3.3.2</commons-lang3.version>
 	</properties>
+	
 	<parent>
 		<groupId>com.ibeetl</groupId>
-		<artifactId>admin-cloud</artifactId>
-		<version>1.1.3</version>
+		<artifactId>admin</artifactId>
+		<version>1.1.4</version>
 	</parent>
 	<dependencies>
 		<dependency>
 			<groupId>com.ibeetl</groupId>
 			<artifactId>admin-core</artifactId>
-			<version>1.1.3</version>
+			<version>1.1.4</version>
 		</dependency>
 		<!--  admin-console 包含了系统管理管理的所有功能，子系统可以不使用这部分 -->
 		<dependency>
 			<groupId>com.ibeetl</groupId>
 			<artifactId>admin-console</artifactId>
-			<version>1.1.3</version>
+			<version>1.1.4</version>
 		</dependency>
 
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-		</dependency>
-		
-<!-- 		重新覆盖mysql的版本，原因：虽然admin-core更新过mysql版本，但由于parent是admin-cloud，导致更新的版本失效 -->
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>

pom.xml

-<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>
 	<groupId>com.ibeetl</groupId>
@@ -15,10 +16,10 @@
 		<module>admin-console</module>
 	</modules>
 	<parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.3.RELEASE</version>
-    </parent>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot-starter-parent</artifactId>
+		<version>2.0.3.RELEASE</version>
+	</parent>
 	<!-- Add typical dependencies for a web application -->
 	<dependencies>
 		<dependency>
@@ -32,6 +33,19 @@
 		</dependency>
 
 	</dependencies>
-
+	<build>
+		<finalName></finalName>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+					<parameters>true</parameters>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
 
 </project>