Change to boot 2.x

- disable PropertyPlaceholderAutoConfiguration in NoAutoConf
- Remove shell1 deps
- Update README
This commit is contained in:
Janne Valkealahti
2018-11-14 09:24:32 +00:00
parent 4f0dc203af
commit 31c7462ee3
15 changed files with 5 additions and 1107 deletions

15
pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.8.RELEASE</version>
<version>2.0.6.RELEASE</version>
<relativePath />
</parent>
<scm>
@@ -26,7 +26,6 @@
<assertj.version>3.8.0</assertj.version>
<java.version>1.8</java.version>
<jcommander.version>1.48</jcommander.version>
<shell1.version>1.2.0.RELEASE</shell1.version>
</properties>
<modules>
@@ -35,7 +34,6 @@
<module>spring-shell-standard</module>
<module>spring-shell-standard-commands</module>
<module>spring-shell-jcommander-adapter</module>
<module>spring-shell-shell1-adapter</module>
<module>spring-shell-starter</module>
<module>spring-shell-table</module>
<module>spring-shell-docs</module>
@@ -64,11 +62,6 @@
<artifactId>spring-shell-standard-commands</artifactId>
<version>3.0.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.shell</groupId>
<artifactId>spring-shell-shell1-adapter</artifactId>
<version>3.0.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.shell</groupId>
<artifactId>spring-shell-jcommander-adapter</artifactId>
@@ -108,12 +101,6 @@
<version>${assertj.version}</version>
<scope>test</scope>
</dependency>
<!-- The following dependency is Spring Shell 1. Note the spring-shell artifactId is not used by Shell 2-->
<dependency>
<groupId>org.springframework.shell</groupId>
<artifactId>spring-shell</artifactId>
<version>${shell1.version}</version>
</dependency>
</dependencies>
</dependencyManagement>