Merge remote-tracking branch 'origin/master'

pom.xml

@@ -218,6 +218,19 @@
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
         </plugins>
+                <resources>
+                    <resource>
+                        <directory>${project.basedir}/lib</directory>
+                        <targetPath>BOOT-INF/lib/</targetPath>
+                        <includes>
+                            <include>**/*.jar</include>
+                        </includes>
+                    </resource>
+                    <resource>
+                        <directory>src/main/resources</directory>
+                        <filtering>true</filtering>
+                    </resource>
+                </resources>
     </build>
     <repositories>
         <repository>