[BAEL-15990] - Moved org.baeldung to com.baeldung

spring-boot-properties/extra.properties

@@ -1 +1 @@
-application.theme.color=blue
+application.theme.color=red

spring-boot-properties/src/main/java/com/baeldung/properties/core/ComponentInXmlUsingProperties.java

@@ -1,4 +1,4 @@
-package org.baeldung.properties.core;
+package com.baeldung.properties.core;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;

spring-boot-properties/src/main/java/com/baeldung/properties/core/ComponentUsingProperties.java

@@ -1,4 +1,4 @@
-package org.baeldung.properties.core;
+package com.baeldung.properties.core;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;

spring-boot-properties/src/main/java/com/baeldung/properties/external/ExternalPropertiesWithJavaConfig.java

@@ -1,4 +1,4 @@
-package org.baeldung.properties.external;
+package com.baeldung.properties.external;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;

spring-boot-properties/src/main/java/com/baeldung/properties/external/ExternalPropertiesWithXmlConfig.java

@@ -1,4 +1,4 @@
-package org.baeldung.properties.external;
+package com.baeldung.properties.external;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;

spring-boot-properties/src/main/java/com/baeldung/properties/external/ExternalPropertiesWithXmlConfigOne.java

@@ -1,4 +1,4 @@
-package org.baeldung.properties.external;
+package com.baeldung.properties.external;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;

spring-boot-properties/src/main/java/com/baeldung/properties/external/ExternalPropertiesWithXmlConfigTwo.java

@@ -1,4 +1,4 @@
-package org.baeldung.properties.external;
+package com.baeldung.properties.external;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;

spring-boot-properties/src/main/java/com/baeldung/properties/spring/BasicPropertiesWithJavaConfig.java

@@ -1,4 +1,4 @@
-package org.baeldung.properties.spring;
+package com.baeldung.properties.spring;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;

spring-boot-properties/src/main/java/com/baeldung/properties/spring/PropertiesWithJavaConfig.java

@@ -1,4 +1,4 @@
-package org.baeldung.properties.spring;
+package com.baeldung.properties.spring;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-boot-properties/src/main/java/com/baeldung/properties/spring/PropertiesWithJavaConfigOther.java

@@ -1,4 +1,4 @@
-package org.baeldung.properties.spring;
+package com.baeldung.properties.spring;
 
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;

spring-boot-properties/src/main/java/com/baeldung/properties/spring/PropertiesWithPlaceHolderConfigurer.java

@@ -1,4 +1,4 @@
-package org.baeldung.properties.spring;
+package com.baeldung.properties.spring;
 
 import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.context.annotation.Bean;

spring-boot-properties/src/main/resources/application.properties

@@ -1,3 +1,4 @@
 management.endpoints.web.exposure.include=refresh
 spring.properties.refreshDelay=1000
 spring.config.location=file:extra.properties
+spring.main.allow-bean-definition-overriding=true

spring-boot-properties/src/main/resources/configForProperties.xml

@@ -9,7 +9,7 @@
 
     <context:property-placeholder location="classpath:foo.properties,classpath:bar.properties"/>
 
-    <bean id="componentInXmlUsingProperties" class="org.baeldung.properties.core.ComponentInXmlUsingProperties">
+    <bean id="componentInXmlUsingProperties" class="com.baeldung.properties.core.ComponentInXmlUsingProperties">
         <constructor-arg value="${key.something}"/>
     </bean>
 

spring-boot-properties/src/main/resources/configForPropertiesOne.xml

@@ -9,7 +9,7 @@
 
     <context:property-placeholder location="classpath:foo.properties" ignore-unresolvable="true" order="1"/>
 
-    <bean id="componentInXmlUsingProperties" class="org.baeldung.properties.core.ComponentInXmlUsingProperties">
+    <bean id="componentInXmlUsingProperties" class="com.baeldung.properties.core.ComponentInXmlUsingProperties">
         <constructor-arg value="${key.something2}"/>
     </bean>
 

spring-boot-properties/src/test/java/com/baeldung/properties/basic/BasicPropertiesWithJavaIntegrationTest.java

@@ -1,6 +1,5 @@
-package org.baeldung.properties.basic;
+package com.baeldung.properties.basic;
 
-import org.baeldung.properties.spring.BasicPropertiesWithJavaConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +9,8 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.properties.spring.BasicPropertiesWithJavaConfig;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { BasicPropertiesWithJavaConfig.class }, loader = AnnotationConfigContextLoader.class)
 public class BasicPropertiesWithJavaIntegrationTest {

spring-boot-properties/src/test/java/com/baeldung/properties/basic/ExtendedPropertiesWithJavaIntegrationTest.java

@@ -1,7 +1,5 @@
-package org.baeldung.properties.basic;
+package com.baeldung.properties.basic;
 
-import org.baeldung.properties.spring.BasicPropertiesWithJavaConfig;
-import org.baeldung.properties.spring.PropertiesWithJavaConfigOther;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -11,6 +9,9 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.properties.spring.BasicPropertiesWithJavaConfig;
+import com.baeldung.properties.spring.PropertiesWithJavaConfigOther;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { BasicPropertiesWithJavaConfig.class, PropertiesWithJavaConfigOther.class }, loader = AnnotationConfigContextLoader.class)
 public class ExtendedPropertiesWithJavaIntegrationTest {

spring-boot-properties/src/test/java/com/baeldung/properties/basic/PropertiesWithJavaIntegrationTest.java

@@ -1,6 +1,5 @@
-package org.baeldung.properties.basic;
+package com.baeldung.properties.basic;
 
-import org.baeldung.properties.spring.PropertiesWithJavaConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -10,6 +9,8 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.properties.spring.PropertiesWithJavaConfig;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { PropertiesWithJavaConfig.class }, loader = AnnotationConfigContextLoader.class)
 public class PropertiesWithJavaIntegrationTest {

spring-boot-properties/src/test/java/com/baeldung/properties/basic/PropertiesWithMultipleXmlsIntegrationTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.properties.basic;
+package com.baeldung.properties.basic;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

spring-boot-properties/src/test/java/com/baeldung/properties/basic/PropertiesWithXmlIntegrationTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.properties.basic;
+package com.baeldung.properties.basic;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

spring-boot-properties/src/test/java/com/baeldung/properties/external/ExternalPropertiesWithJavaIntegrationTest.java

@@ -1,6 +1,5 @@
-package org.baeldung.properties.external;
+package com.baeldung.properties.external;
 
-import org.baeldung.properties.spring.PropertiesWithJavaConfigOther;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -11,6 +10,9 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.properties.external.ExternalPropertiesWithJavaConfig;
+import com.baeldung.properties.spring.PropertiesWithJavaConfigOther;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { ExternalPropertiesWithJavaConfig.class, PropertiesWithJavaConfigOther.class }, loader = AnnotationConfigContextLoader.class)
 @Ignore("manual only")

spring-boot-properties/src/test/java/com/baeldung/properties/external/ExternalPropertiesWithMultipleXmlsIntegrationTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.properties.external;
+package com.baeldung.properties.external;
 
 import org.junit.Ignore;
 import org.junit.Test;
@@ -10,6 +10,9 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.properties.external.ExternalPropertiesWithXmlConfigOne;
+import com.baeldung.properties.external.ExternalPropertiesWithXmlConfigTwo;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { ExternalPropertiesWithXmlConfigOne.class, ExternalPropertiesWithXmlConfigTwo.class }, loader = AnnotationConfigContextLoader.class)
 @Ignore("manual only")

spring-boot-properties/src/test/java/com/baeldung/properties/external/ExternalPropertiesWithXmlManualTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.properties.external;
+package com.baeldung.properties.external;
 
 import org.junit.Ignore;
 import org.junit.Test;
@@ -10,6 +10,8 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
+import com.baeldung.properties.external.ExternalPropertiesWithXmlConfig;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = { ExternalPropertiesWithXmlConfig.class }, loader = AnnotationConfigContextLoader.class)
 @Ignore("manual only")

spring-boot-properties/src/test/java/com/baeldung/properties/multiple/MultiplePropertiesJavaConfigIntegrationTest.java

@@ -1,10 +1,11 @@
-package org.baeldung.properties.multiple;
+package com.baeldung.properties.multiple;
 
-import org.baeldung.properties.spring.PropertiesWithJavaConfig;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.test.context.junit.jupiter.SpringJUnitConfig;
 
+import com.baeldung.properties.spring.PropertiesWithJavaConfig;
+
 import static org.assertj.core.api.Assertions.assertThat;
 
 @SpringJUnitConfig(PropertiesWithJavaConfig.class)

spring-boot-properties/src/test/java/com/baeldung/properties/multiple/MultiplePropertiesXmlConfigIntegrationTest.java

@@ -1,4 +1,4 @@
-package org.baeldung.properties.multiple;
+package com.baeldung.properties.multiple;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Value;

spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/ChildValueHolder.java

@@ -1,4 +1,4 @@
-package org.baeldung.properties.parentchild;
+package com.baeldung.properties.parentchild;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/ParentChildPropertyPlaceHolderPropertiesIntegrationTest.java

@@ -1,10 +1,8 @@
-package org.baeldung.properties.parentchild;
+package com.baeldung.properties.parentchild;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-import org.baeldung.properties.parentchild.config.ChildConfig2;
-import org.baeldung.properties.parentchild.config.ParentConfig2;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +13,9 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.web.context.WebApplicationContext;
 
+import com.baeldung.properties.parentchild.config.ChildConfig2;
+import com.baeldung.properties.parentchild.config.ParentConfig2;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @ContextHierarchy({ @ContextConfiguration(classes = ParentConfig2.class), @ContextConfiguration(classes = ChildConfig2.class) })

spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/ParentChildPropertySourcePropertiesIntegrationTest.java

@@ -1,10 +1,8 @@
-package org.baeldung.properties.parentchild;
+package com.baeldung.properties.parentchild;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 
-import org.baeldung.properties.parentchild.config.ChildConfig;
-import org.baeldung.properties.parentchild.config.ParentConfig;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,6 +13,9 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.web.context.WebApplicationContext;
 
+import com.baeldung.properties.parentchild.config.ChildConfig;
+import com.baeldung.properties.parentchild.config.ParentConfig;
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @WebAppConfiguration
 @ContextHierarchy({ @ContextConfiguration(classes = ParentConfig.class), @ContextConfiguration(classes = ChildConfig.class) })

spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/ParentValueHolder.java

@@ -1,4 +1,4 @@
-package org.baeldung.properties.parentchild;
+package com.baeldung.properties.parentchild;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/config/ChildConfig.java

@@ -1,11 +1,12 @@
-package org.baeldung.properties.parentchild.config;
+package com.baeldung.properties.parentchild.config;
 
-import org.baeldung.properties.parentchild.ChildValueHolder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 
+import com.baeldung.properties.parentchild.ChildValueHolder;
+
 @Configuration
 @PropertySource("classpath:child.properties")
 public class ChildConfig {

spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/config/ChildConfig2.java

@@ -1,11 +1,12 @@
-package org.baeldung.properties.parentchild.config;
+package com.baeldung.properties.parentchild.config;
 
-import org.baeldung.properties.parentchild.ChildValueHolder;
 import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ClassPathResource;
 
+import com.baeldung.properties.parentchild.ChildValueHolder;
+
 @Configuration
 public class ChildConfig2 {
 

spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/config/ParentConfig.java

@@ -1,11 +1,12 @@
-package org.baeldung.properties.parentchild.config;
+package com.baeldung.properties.parentchild.config;
 
-import org.baeldung.properties.parentchild.ParentValueHolder;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 
+import com.baeldung.properties.parentchild.ParentValueHolder;
+
 @Configuration
 @PropertySource("classpath:parent.properties")
 public class ParentConfig {

spring-boot-properties/src/test/java/com/baeldung/properties/parentchild/config/ParentConfig2.java

@@ -1,11 +1,12 @@
-package org.baeldung.properties.parentchild.config;
+package com.baeldung.properties.parentchild.config;
 
-import org.baeldung.properties.parentchild.ParentValueHolder;
 import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.io.ClassPathResource;
 
+import com.baeldung.properties.parentchild.ParentValueHolder;
+
 @Configuration
 public class ParentConfig2 {
 

spring-boot-properties/src/test/java/com/baeldung/test/IntegrationTestSuite.java

@@ -1,15 +1,16 @@
-package org.baeldung.test;
+package com.baeldung.test;
 
-import org.baeldung.properties.basic.ExtendedPropertiesWithJavaIntegrationTest;
-import org.baeldung.properties.basic.PropertiesWithMultipleXmlsIntegrationTest;
-import org.baeldung.properties.basic.PropertiesWithXmlIntegrationTest;
-import org.baeldung.properties.external.ExternalPropertiesWithJavaIntegrationTest;
-import org.baeldung.properties.external.ExternalPropertiesWithMultipleXmlsIntegrationTest;
-import org.baeldung.properties.external.ExternalPropertiesWithXmlManualTest;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
+import com.baeldung.properties.basic.ExtendedPropertiesWithJavaIntegrationTest;
+import com.baeldung.properties.basic.PropertiesWithMultipleXmlsIntegrationTest;
+import com.baeldung.properties.basic.PropertiesWithXmlIntegrationTest;
+import com.baeldung.properties.external.ExternalPropertiesWithJavaIntegrationTest;
+import com.baeldung.properties.external.ExternalPropertiesWithMultipleXmlsIntegrationTest;
+import com.baeldung.properties.external.ExternalPropertiesWithXmlManualTest;
+
 @RunWith(Suite.class)
 @SuiteClasses({ //@formatter:off
     PropertiesWithXmlIntegrationTest.class,

spring-boot-properties/src/test/resources/application.properties

@@ -1,3 +1,4 @@
 management.endpoints.web.exposure.include=refresh
 spring.properties.refreshDelay=1000
-spring.config.location=file:extra.properties
+spring.config.location=file:extra.properties
+spring.main.allow-bean-definition-overriding=true