From 4ac12660c650d233f8a64e324b3d87b5dfd80fe5 Mon Sep 17 00:00:00 2001
From: Madhura Bhave <mbhave@pivotal.io>
Date: Fri, 14 Feb 2020 13:30:41 -0800
Subject: [PATCH] Explicitly enable config properties scan in java release
 scripts

This commit also upgrades the Spring Boot version used by the scripts
to 2.2.4 which is why the explicit annotation is required.

Closes gh-20174
---
 ci/images/releasescripts/pom.xml                              | 2 +-
 .../java/io/spring/concourse/releasescripts/Application.java  | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ci/images/releasescripts/pom.xml b/ci/images/releasescripts/pom.xml
index 05bd6dde8e9..94b08ffd23b 100644
--- a/ci/images/releasescripts/pom.xml
+++ b/ci/images/releasescripts/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.2.0.RELEASE</version>
+		<version>2.2.4.RELEASE</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>io.spring.concourse.releasescripts</groupId>
diff --git a/ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/Application.java b/ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/Application.java
index 7e6495b96c2..9a4c7cb9d46 100644
--- a/ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/Application.java
+++ b/ci/images/releasescripts/src/main/java/io/spring/concourse/releasescripts/Application.java
@@ -1,5 +1,5 @@
 /*
-* Copyright 2012-2019 the original author or authors.
+* Copyright 2012-2020 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -18,8 +18,10 @@ package io.spring.concourse.releasescripts;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 
 @SpringBootApplication
+@ConfigurationPropertiesScan
 public class Application {
 
 	public static void main(String[] args) {