Merge pull request #31 from eugenp/master

update
This commit is contained in:
Maiklins 2020-02-02 15:11:40 +01:00 committed by GitHub
commit 3e26f588fc
34 changed files with 5 additions and 7 deletions

View File

@ -16,7 +16,7 @@
<repositories>
<repository>
<id>jcenter</id>
<url>http://jcenter.bintray.com</url>
<url>https://jcenter.bintray.com</url>
</repository>
<repository>
<id>kotlin-ktor</id>

View File

@ -645,13 +645,11 @@
<!-- <module>spring-boot-cli</module> --> <!-- Not a maven project -->
<module>spring-boot-client</module>
<module>spring-boot-config-jpa-error</module>
<module>spring-boot-ctx-fluent</module>
<module>spring-boot-deployment</module>
<module>spring-boot-di</module>
<module>spring-boot-environment</module>
<module>spring-boot-flowable</module>
<module>spring-boot-jasypt</module>
<module>spring-boot-kotlin</module>
<module>spring-boot-libraries</module>
<module>spring-boot-mvc-2</module>
<module>spring-boot-parent</module>
@ -1169,13 +1167,11 @@
<!-- <module>spring-boot-cli</module> --> <!-- Not a maven project -->
<module>spring-boot-client</module>
<module>spring-boot-config-jpa-error</module>
<module>spring-boot-ctx-fluent</module>
<module>spring-boot-deployment</module>
<module>spring-boot-di</module>
<module>spring-boot-environment</module>
<module>spring-boot-flowable</module>
<module>spring-boot-jasypt</module>
<module>spring-boot-kotlin</module>
<module>spring-boot-libraries</module>
<module>spring-boot-mvc</module>
<module>spring-boot-mvc-2</module>

View File

@ -16,6 +16,7 @@
<modules>
<module>spring-boot-admin</module>
<module>spring-boot-artifacts</module>
<module>spring-boot-ctx-fluent</module>
<module>spring-boot-autoconfiguration</module>
<module>spring-boot-camel</module>
<module>spring-boot-custom-starter</module>
@ -24,6 +25,7 @@
<!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
<module>spring-boot-keycloak</module>
<module>spring-boot-logging-log4j2</module>
<module>spring-boot-kotlin</module>
<module>spring-boot-mvc-birt</module>
<module>spring-boot-nashorn</module>
<module>spring-boot-properties</module>

View File

@ -11,7 +11,7 @@
<groupId>com.baeldung</groupId>
<artifactId>parent-boot-2</artifactId>
<version>0.0.1-SNAPSHOT</version>
<relativePath>../parent-boot-2</relativePath>
<relativePath>../../parent-boot-2</relativePath>
</parent>
<dependencies>

View File

@ -11,7 +11,7 @@
<groupId>com.baeldung</groupId>
<artifactId>parent-kotlin</artifactId>
<version>1.0.0-SNAPSHOT</version>
<relativePath>../parent-kotlin</relativePath>
<relativePath>../../parent-kotlin</relativePath>
</parent>
<repositories>