iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9200 from sampada07/JAVA-913

Browse Source 
JAVA-913: migrate parent-boot-1 articles to parent-boot-2
This commit is contained in:
Dhawal Kapil 2020-04-28 20:59:58 +05:30 committed by GitHub
commit 148d9fd6c6
6 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-modules/spring-boot-custom-starter/greeter-spring-boot-autoconfigure/pom.xml
View File

@ -63,7 +63,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring-boot.version>1.5.2.RELEASE</spring-boot.version> <spring-boot.version>2.2.6.RELEASE</spring-boot.version>
<greeter.version>0.0.1-SNAPSHOT</greeter.version> <greeter.version>0.0.1-SNAPSHOT</greeter.version>
</properties> </properties>

2
spring-boot-modules/spring-boot-custom-starter/greeter-spring-boot-starter/pom.xml
View File

@ -51,7 +51,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<greeter.version>0.0.1-SNAPSHOT</greeter.version> <greeter.version>0.0.1-SNAPSHOT</greeter.version>
<spring-boot.version>1.5.2.RELEASE</spring-boot.version> <spring-boot.version>2.2.6.RELEASE</spring-boot.version>
</properties> </properties>
</project> </project>

8
spring-boot-modules/spring-boot-property-exp/property-exp-custom-config/pom.xml
View File

@ -24,6 +24,12 @@
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<version>${spring-boot.version}</version> <version>${spring-boot.version}</version>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
@ -72,7 +78,7 @@
</build> </build>
<properties> <properties>
<spring-boot.version>1.5.10.RELEASE</spring-boot.version> <spring-boot.version>2.2.6.RELEASE</spring-boot.version>
<custom.property>Custom Property Value</custom.property> <custom.property>Custom Property Value</custom.property>
<apache-maven.version>2.7</apache-maven.version> <apache-maven.version>2.7</apache-maven.version>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version> <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>

0
spring-boot-modules/spring-boot-property-exp/property-exp-custom-config/src/test/java/org/baeldung/SpringContextTest.java → spring-boot-modules/spring-boot-property-exp/property-exp-custom-config/src/test/java/com/baeldung/SpringContextTest.java
View File

4
spring-boot-modules/spring-boot-property-exp/property-exp-default-config/pom.xml
View File

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

0
spring-boot-modules/spring-boot-property-exp/property-exp-default-config/src/test/java/org/baeldung/SpringContextTest.java → spring-boot-modules/spring-boot-property-exp/property-exp-default-config/src/test/java/com/baeldung/SpringContextTest.java
View File