From 2a7ec83cd11b811db884e215f94c5ed83fc92bc6 Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Wed, 12 Aug 2020 14:51:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-commons/kidgrow-common-spring-boot-starter/pom.xml | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 51 insertions(+), 7 deletions(-)
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/pom.xml b/kidgrow-commons/kidgrow-common-spring-boot-starter/pom.xml
index a5c8617..0b61cbf 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/pom.xml
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/pom.xml
@@ -18,10 +18,10 @@
<groupId>com.kidgrow</groupId>
<artifactId>kidgrow-log-spring-boot-starter</artifactId>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>com.kidgrow</groupId>-->
-<!-- <artifactId>kidgrow-swagger2-spring-boot-starter</artifactId>-->
-<!-- </dependency>-->
+ <!-- <dependency>-->
+ <!-- <groupId>com.kidgrow</groupId>-->
+ <!-- <artifactId>kidgrow-swagger2-spring-boot-starter</artifactId>-->
+ <!-- </dependency>-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
@@ -114,7 +114,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
-<!-- <optional>true</optional>-->
+ <!-- <optional>true</optional>-->
</dependency>
<!-- hystrix断路器 -->
<dependency>
@@ -132,9 +132,53 @@
<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
</dependency>
<!-- 消息总线rabbitMQ -->
+<!-- <dependency>-->
+<!-- <groupId>org.springframework.cloud</groupId>-->
+<!-- <artifactId>spring-cloud-starter-bus-amqp</artifactId>-->
+<!-- </dependency>-->
+ <!-- https://mvnrepository.com/artifact/com.google.zxing/core -->
<dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-starter-bus-amqp</artifactId>
+ <groupId>com.google.zxing</groupId>
+ <artifactId>core</artifactId>
+ <version>3.4.0</version>
+ </dependency>
+ <!-- https://mvnrepository.com/artifact/com.google.zxing/javase -->
+ <dependency>
+ <groupId>com.google.zxing</groupId>
+ <artifactId>javase</artifactId>
+ <version>3.4.0</version>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!--跳过项目运行测试用例-->
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>com.spotify</groupId>
+ <artifactId>dockerfile-maven-plugin</artifactId>
+ <configuration>
+ <!-- Dockerfile目录指定 -->
+ <dockerfile>Dockerfile</dockerfile>
+ <repository>${docker.repostory}/${docker.image.prefix}/${project.artifactId}</repository>
+ <!-- 生成镜像标签 如不指定 默认为latest -->
+ <tag>1.0.1</tag>
+ <!--<tag>${project.version}</tag>-->
+ <buildArgs>
+ <JAR_FILE>./target/${project.build.finalName}.jar</JAR_FILE>
+ </buildArgs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
--
Gitblit v1.8.0