Bläddra i källkod

发布 1.4.7 支持无 xml 可用

jobob 8 år sedan
förälder
incheckning
afc465748f

+ 13 - 39
mybatis-plus/pom.xml

@@ -7,7 +7,7 @@
 	<packaging>jar</packaging>
 
 	<name>mybatis-plus</name>
-	<description>mybatis-plus is an enhanced version of mybaits.</description>
+	<description>mybatis-plus is an enhanced version of mybaits. </description>
 	<url>http://maven.apache.org</url>
 
 	<licenses>
@@ -31,6 +31,7 @@
 	</scm>
 
 	<properties>
+		<gpg.keyname>F4B46FB9</gpg.keyname>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<mybatis-spring.version>1.3.0</mybatis-spring.version>
 		<mybatis.version>3.4.1</mybatis.version>
@@ -127,24 +128,6 @@
 		<!-- test end -->
 	</dependencies>
 
-	<build>
-		<plugins>
-			<!-- Source -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<version>2.2.1</version>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>jar-no-fork</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 	<profiles>
 		<profile>
 			<id>release</id>
@@ -155,9 +138,6 @@
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-source-plugin</artifactId>
 						<version>2.2.1</version>
-						<configuration>
-							<encoding>UTF-8</encoding>
-						</configuration>
 						<executions>
 							<execution>
 								<phase>package</phase>
@@ -167,26 +147,14 @@
 							</execution>
 						</executions>
 					</plugin>
-					<!-- compiler -->
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-compiler-plugin</artifactId>
-						<version>3.1</version>
-						<configuration>
-							<encoding>UTF-8</encoding>
-						</configuration>
-					</plugin>
 					<!-- Javadoc -->
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
 						<version>2.9.1</version>
-						<configuration>
-							<encoding>UTF-8</encoding>
-						</configuration>
 						<executions>
 							<execution>
-								<id>attach-javadocs</id>
+								<phase>package</phase>
 								<goals>
 									<goal>jar</goal>
 								</goals>
@@ -200,10 +168,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>1.5</version>
-						<configuration>
-							<skip>true</skip>
-						</configuration>
+						<version>1.6</version>
 						<executions>
 							<execution>
 								<phase>verify</phase>
@@ -213,6 +178,15 @@
 							</execution>
 						</executions>
 					</plugin>
+					<!-- skipJunitTest -->
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<version>2.19.1</version>
+						<configuration>
+							<skipTests>true</skipTests>
+						</configuration>
+					</plugin>
 				</plugins>
 			</build>
 			<distributionManagement>

+ 1 - 1
mybatis-plus/src/main/java/com/baomidou/mybatisplus/generator/AutoGenerator.java

@@ -391,7 +391,7 @@ public class AutoGenerator {
 			return "Float";
 		} else if (t.contains("double")) {
 			return "Double";
-		} else if (t.contains("json")) {
+		} else if (t.contains("json") || t.contains("enum")) {
 			return "String";
 		}
 		return null;