From 7caa3333119418e47e0dfc4b4d8d4fec717b2395 Mon Sep 17 00:00:00 2001 From: yyl Date: Thu, 7 Nov 2019 17:13:11 +0800 Subject: [PATCH] + --- pom.xml | 1 + spring-boot-example-activemq/pom.xml | 2 +- spring-boot-example-actuator/pom.xml | 2 +- .../pom.xml | 4 +- spring-boot-example-banner/pom.xml | 2 +- .../pom.xml | 2 +- spring-boot-example-elasticsearch/pom.xml | 2 +- spring-boot-example-hello/pom.xml | 2 +- spring-boot-example-jasypt/pom.xml | 2 +- spring-boot-example-jpa/pom.xml | 2 +- spring-boot-example-kafka/pom.xml | 2 +- spring-boot-example-mail/pom.xml | 2 +- spring-boot-example-mongodb/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- spring-boot-example-mybatis-plus/pom.xml | 2 +- spring-boot-example-mybatis/pom.xml | 2 +- .../.gitignore | 51 +++ .../pom.xml | 316 +++++++++--------- spring-boot-example-redis/pom.xml | 2 +- spring-boot-example-scheduler/pom.xml | 2 +- spring-boot-example-security-custom/pom.xml | 2 +- spring-boot-example-security/pom.xml | 2 +- spring-boot-example-session/pom.xml | 2 +- spring-boot-example-shiro/pom.xml | 2 +- spring-boot-example-starter/pom.xml | 2 +- .../pom.xml | 2 +- spring-boot-example-thymeleaf/pom.xml | 2 +- 28 files changed, 236 insertions(+), 184 deletions(-) create mode 100644 spring-boot-example-null-include-lib-pack/.gitignore diff --git a/pom.xml b/pom.xml index 7942e5a..84b5c85 100644 --- a/pom.xml +++ b/pom.xml @@ -7,5 +7,6 @@ UTF-8 1.8 + 2.1.2.RELEASE \ No newline at end of file diff --git a/spring-boot-example-activemq/pom.xml b/spring-boot-example-activemq/pom.xml index 208b176..1d3be7f 100644 --- a/spring-boot-example-activemq/pom.xml +++ b/spring-boot-example-activemq/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.1.2.RELEASE diff --git a/spring-boot-example-actuator/pom.xml b/spring-boot-example-actuator/pom.xml index e40da7f..cae2394 100644 --- a/spring-boot-example-actuator/pom.xml +++ b/spring-boot-example-actuator/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.1.2.RELEASE diff --git a/spring-boot-example-autoconfigure-exclude/pom.xml b/spring-boot-example-autoconfigure-exclude/pom.xml index 45a9baa..513dac2 100644 --- a/spring-boot-example-autoconfigure-exclude/pom.xml +++ b/spring-boot-example-autoconfigure-exclude/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.7.RELEASE + 2.1.2.RELEASE @@ -36,7 +36,7 @@ org.springframework.boot spring-boot-starter-data-jdbc - + org.springframework.boot diff --git a/spring-boot-example-banner/pom.xml b/spring-boot-example-banner/pom.xml index e4746c1..3097644 100644 --- a/spring-boot-example-banner/pom.xml +++ b/spring-boot-example-banner/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.1.2.RELEASE diff --git a/spring-boot-example-command-line-runner/pom.xml b/spring-boot-example-command-line-runner/pom.xml index 707ffc8..117f18e 100644 --- a/spring-boot-example-command-line-runner/pom.xml +++ b/spring-boot-example-command-line-runner/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.1.2.RELEASE diff --git a/spring-boot-example-elasticsearch/pom.xml b/spring-boot-example-elasticsearch/pom.xml index cda8555..a6cc65d 100644 --- a/spring-boot-example-elasticsearch/pom.xml +++ b/spring-boot-example-elasticsearch/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.1.2.RELEASE diff --git a/spring-boot-example-hello/pom.xml b/spring-boot-example-hello/pom.xml index 4539435..c316371 100644 --- a/spring-boot-example-hello/pom.xml +++ b/spring-boot-example-hello/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.7.RELEASE + 2.1.2.RELEASE diff --git a/spring-boot-example-jasypt/pom.xml b/spring-boot-example-jasypt/pom.xml index 195b357..2618ef3 100644 --- a/spring-boot-example-jasypt/pom.xml +++ b/spring-boot-example-jasypt/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.1.2.RELEASE diff --git a/spring-boot-example-jpa/pom.xml b/spring-boot-example-jpa/pom.xml index 9a00d63..88ffd75 100644 --- a/spring-boot-example-jpa/pom.xml +++ b/spring-boot-example-jpa/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.1.2.RELEASE diff --git a/spring-boot-example-kafka/pom.xml b/spring-boot-example-kafka/pom.xml index 890330b..3044827 100644 --- a/spring-boot-example-kafka/pom.xml +++ b/spring-boot-example-kafka/pom.xml @@ -10,7 +10,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.1.2.RELEASE diff --git a/spring-boot-example-mail/pom.xml b/spring-boot-example-mail/pom.xml index 58b237e..e7a14e9 100644 --- a/spring-boot-example-mail/pom.xml +++ b/spring-boot-example-mail/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.1.2.RELEASE diff --git a/spring-boot-example-mongodb/pom.xml b/spring-boot-example-mongodb/pom.xml index 1c46cb8..a97125e 100644 --- a/spring-boot-example-mongodb/pom.xml +++ b/spring-boot-example-mongodb/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.1.2.RELEASE diff --git a/spring-boot-example-mybatis-multi-source/pom.xml b/spring-boot-example-mybatis-multi-source/pom.xml index cde0ef3..b39bb71 100644 --- a/spring-boot-example-mybatis-multi-source/pom.xml +++ b/spring-boot-example-mybatis-multi-source/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.1.2.RELEASE diff --git a/spring-boot-example-mybatis-plus-dynamic-source/pom.xml b/spring-boot-example-mybatis-plus-dynamic-source/pom.xml index 4def7a0..8eccd30 100644 --- a/spring-boot-example-mybatis-plus-dynamic-source/pom.xml +++ b/spring-boot-example-mybatis-plus-dynamic-source/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.7.RELEASE + 2.1.2.RELEASE diff --git a/spring-boot-example-mybatis-plus/pom.xml b/spring-boot-example-mybatis-plus/pom.xml index 8c1dbe4..41c0840 100644 --- a/spring-boot-example-mybatis-plus/pom.xml +++ b/spring-boot-example-mybatis-plus/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.7.RELEASE + 2.1.2.RELEASE diff --git a/spring-boot-example-mybatis/pom.xml b/spring-boot-example-mybatis/pom.xml index ec0f461..bd9ab69 100644 --- a/spring-boot-example-mybatis/pom.xml +++ b/spring-boot-example-mybatis/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.1.2.RELEASE diff --git a/spring-boot-example-null-include-lib-pack/.gitignore b/spring-boot-example-null-include-lib-pack/.gitignore new file mode 100644 index 0000000..2e3cdc4 --- /dev/null +++ b/spring-boot-example-null-include-lib-pack/.gitignore @@ -0,0 +1,51 @@ +# Compile files +*.class + +# Package Files +*.jar +*.war +*.ear +*.nar +*.zip +*.tar +*.tar.gz +*.rar + +# Maven +target/ +*.ser +*.ec + +# J2ME +.mtj.tmp/ + +# Eclipse +.classpath +.project +.settings/ +.metadata/ +.factorypath +.springBeans + +# IntelliJ Idea +.idea/ +out/ +*.ipr +*.iws +*.iml + +# BlueJ Files +*.ctxt + +# OS X +.DS_Store + +# Window +Thumbs.db + +# Virtual Machine Crash Logs +hs_err_pid* + +# Log File +*.log +*.log.* diff --git a/spring-boot-example-null-include-lib-pack/pom.xml b/spring-boot-example-null-include-lib-pack/pom.xml index dd8dc3b..0e2a83d 100644 --- a/spring-boot-example-null-include-lib-pack/pom.xml +++ b/spring-boot-example-null-include-lib-pack/pom.xml @@ -1,158 +1,158 @@ - - - 4.0.0 - - yyl - spring-boot-example-null-include-lib-pack - 0.0.1-SNAPSHOT - war - - spring-boot-example-null-include-lib-pack - Demo project for Spring Boot - - - org.springframework.boot - spring-boot-starter-parent - 2.1.7.RELEASE - - - - - UTF-8 - UTF-8 - 1.8 - - - - - - - org.springframework.boot - spring-boot-starter-web - - - - org.springframework.boot - spring-boot-starter-tomcat - provided - - - - - org.springframework.boot - spring-boot-starter-test - test - - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - - - null - null - - - ZIP - - true - - ${project.build.directory} - - false - - - - - repackage - - - - - - - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - - true - - lib/ - - yyl.springboot.SpringBootNullIncludeLibPackApplication - - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - prepare-package - - copy-dependencies - - - ${project.build.directory}/lib - false - false - true - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + 4.0.0 + + yyl + spring-boot-example-null-include-lib-pack + 0.0.1-SNAPSHOT + jar + + spring-boot-example-null-include-lib-pack + Demo project for Spring Boot + + + org.springframework.boot + spring-boot-starter-parent + 2.1.2.RELEASE + + + + + UTF-8 + UTF-8 + 1.8 + + + + + + + org.springframework.boot + spring-boot-starter-web + + + + org.springframework.boot + spring-boot-starter-tomcat + provided + + + + + org.springframework.boot + spring-boot-starter-test + test + + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + null + null + + + ZIP + + true + + ${project.build.directory} + + false + + + + + repackage + + + + + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + + + + true + + lib/ + + yyl.springboot.SpringBootNullIncludeLibPackApplication + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + prepare-package + + copy-dependencies + + + ${project.build.directory}/lib + false + false + true + + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + false + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-boot-example-redis/pom.xml b/spring-boot-example-redis/pom.xml index 96691a0..ff07fb0 100644 --- a/spring-boot-example-redis/pom.xml +++ b/spring-boot-example-redis/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.1.2.RELEASE diff --git a/spring-boot-example-scheduler/pom.xml b/spring-boot-example-scheduler/pom.xml index bbd3335..99951b8 100644 --- a/spring-boot-example-scheduler/pom.xml +++ b/spring-boot-example-scheduler/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.1.2.RELEASE diff --git a/spring-boot-example-security-custom/pom.xml b/spring-boot-example-security-custom/pom.xml index 1958416..361539e 100644 --- a/spring-boot-example-security-custom/pom.xml +++ b/spring-boot-example-security-custom/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.1.2.RELEASE diff --git a/spring-boot-example-security/pom.xml b/spring-boot-example-security/pom.xml index e668706..6f8b6ea 100644 --- a/spring-boot-example-security/pom.xml +++ b/spring-boot-example-security/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.1.2.RELEASE diff --git a/spring-boot-example-session/pom.xml b/spring-boot-example-session/pom.xml index 8be8268..31e1fd0 100644 --- a/spring-boot-example-session/pom.xml +++ b/spring-boot-example-session/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.1.2.RELEASE diff --git a/spring-boot-example-shiro/pom.xml b/spring-boot-example-shiro/pom.xml index 556b0fc..67720f0 100644 --- a/spring-boot-example-shiro/pom.xml +++ b/spring-boot-example-shiro/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.1.2.RELEASE diff --git a/spring-boot-example-starter/pom.xml b/spring-boot-example-starter/pom.xml index bbc1708..844b366 100644 --- a/spring-boot-example-starter/pom.xml +++ b/spring-boot-example-starter/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.1.2.RELEASE diff --git a/spring-boot-example-starter/spring-boot-example-starter-sample/pom.xml b/spring-boot-example-starter/spring-boot-example-starter-sample/pom.xml index ae6b611..b270fb4 100644 --- a/spring-boot-example-starter/spring-boot-example-starter-sample/pom.xml +++ b/spring-boot-example-starter/spring-boot-example-starter-sample/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.1.2.RELEASE diff --git a/spring-boot-example-thymeleaf/pom.xml b/spring-boot-example-thymeleaf/pom.xml index 66c42b7..f464012 100644 --- a/spring-boot-example-thymeleaf/pom.xml +++ b/spring-boot-example-thymeleaf/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 2.0.1.RELEASE + 2.1.2.RELEASE