From dcaf1b35a049195e74c4a1c8b7ac719ce7f3f346 Mon Sep 17 00:00:00 2001
From: PranayJain <pranay.jain@acellere.com>
Date: Mon, 11 Mar 2019 13:04:19 +0530
Subject: [PATCH] BAEL-2719: Skipped conf.properties from packaging

---
 spring-boot-ops/pom.xml                                  | 9 +++++++++
 .../baeldung/properties/ExternalPropertyConfigurer.java  | 2 +-
 .../src/main/resources/external/conf.properties          | 4 ++++
 .../src/test/resources/external/conf.properties          | 3 ---
 4 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 spring-boot-ops/src/main/resources/external/conf.properties
 delete mode 100644 spring-boot-ops/src/test/resources/external/conf.properties

diff --git a/spring-boot-ops/pom.xml b/spring-boot-ops/pom.xml
index 6c49351820..f36434b682 100644
--- a/spring-boot-ops/pom.xml
+++ b/spring-boot-ops/pom.xml
@@ -95,6 +95,15 @@
 
     <build>
         <finalName>${project.artifactId}</finalName>
+        <resources>
+			<resource>
+				<directory>src/main/resources</directory>
+				<filtering>true</filtering>
+				<excludes>
+					<exclude>**/conf.properties</exclude>
+				</excludes>
+			</resource>
+		</resources>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>
diff --git a/spring-boot-ops/src/main/java/com/baeldung/properties/ExternalPropertyConfigurer.java b/spring-boot-ops/src/main/java/com/baeldung/properties/ExternalPropertyConfigurer.java
index 67890d717a..0cdbb452d5 100644
--- a/spring-boot-ops/src/main/java/com/baeldung/properties/ExternalPropertyConfigurer.java
+++ b/spring-boot-ops/src/main/java/com/baeldung/properties/ExternalPropertyConfigurer.java
@@ -11,7 +11,7 @@ public class ExternalPropertyConfigurer {
     @Bean
     public PropertySourcesPlaceholderConfigurer propertySourcesPlaceholderConfigurer() {
         PropertySourcesPlaceholderConfigurer properties = new PropertySourcesPlaceholderConfigurer();
-        properties.setLocation(new FileSystemResource("src/test/resources/external/conf.properties"));
+        properties.setLocation(new FileSystemResource("src/main/resources/external/conf.properties"));
         properties.setIgnoreResourceNotFound(false);
         return properties;
     }
diff --git a/spring-boot-ops/src/main/resources/external/conf.properties b/spring-boot-ops/src/main/resources/external/conf.properties
new file mode 100644
index 0000000000..cfcd23dc76
--- /dev/null
+++ b/spring-boot-ops/src/main/resources/external/conf.properties
@@ -0,0 +1,4 @@
+url=jdbc:postgresql://localhost:5432/
+username=admin
+password=root
+spring.main.allow-bean-definition-overriding=true
\ No newline at end of file
diff --git a/spring-boot-ops/src/test/resources/external/conf.properties b/spring-boot-ops/src/test/resources/external/conf.properties
deleted file mode 100644
index da9533fe1f..0000000000
--- a/spring-boot-ops/src/test/resources/external/conf.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-url=jdbc:postgresql://localhost:5432/
-username=admin
-password=root
\ No newline at end of file