diff --git a/pom.xml b/pom.xml index 5230a680fe..5adbbcb7e3 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,6 @@ spring-amqp spring-all spring-apache-camel - spring-autowire spring-batch spring-boot spring-cloud-data-flow diff --git a/spring-autowire/src/main/java/com/baeldung/autowire/sample/App.java b/spring-all/src/main/java/org/baeldung/sample/App.java similarity index 90% rename from spring-autowire/src/main/java/com/baeldung/autowire/sample/App.java rename to spring-all/src/main/java/org/baeldung/sample/App.java index 18ff11a49c..17fc49fc8c 100644 --- a/spring-autowire/src/main/java/com/baeldung/autowire/sample/App.java +++ b/spring-all/src/main/java/org/baeldung/sample/App.java @@ -1,4 +1,4 @@ -package com.baeldung.autowire.sample; +package org.baeldung.sample; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/spring-autowire/src/main/java/com/baeldung/autowire/sample/AppConfig.java b/spring-all/src/main/java/org/baeldung/sample/AppConfig.java similarity index 84% rename from spring-autowire/src/main/java/com/baeldung/autowire/sample/AppConfig.java rename to spring-all/src/main/java/org/baeldung/sample/AppConfig.java index f948e2bf8e..ffc792d9df 100644 --- a/spring-autowire/src/main/java/com/baeldung/autowire/sample/AppConfig.java +++ b/spring-all/src/main/java/org/baeldung/sample/AppConfig.java @@ -1,4 +1,4 @@ -package com.baeldung.autowire.sample; +package org.baeldung.sample; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; diff --git a/spring-all/src/main/java/org/baeldung/sample/Bar.java b/spring-all/src/main/java/org/baeldung/sample/Bar.java new file mode 100644 index 0000000000..54e8d54418 --- /dev/null +++ b/spring-all/src/main/java/org/baeldung/sample/Bar.java @@ -0,0 +1,5 @@ +package org.baeldung.sample; + +public class Bar { + +} diff --git a/spring-autowire/src/main/java/com/baeldung/autowire/sample/BarFormatter.java b/spring-all/src/main/java/org/baeldung/sample/BarFormatter.java similarity index 83% rename from spring-autowire/src/main/java/com/baeldung/autowire/sample/BarFormatter.java rename to spring-all/src/main/java/org/baeldung/sample/BarFormatter.java index e67a376d25..8396653970 100644 --- a/spring-autowire/src/main/java/com/baeldung/autowire/sample/BarFormatter.java +++ b/spring-all/src/main/java/org/baeldung/sample/BarFormatter.java @@ -1,4 +1,4 @@ -package com.baeldung.autowire.sample; +package org.baeldung.sample; import org.springframework.stereotype.Component; diff --git a/spring-all/src/main/java/org/baeldung/sample/Foo.java b/spring-all/src/main/java/org/baeldung/sample/Foo.java new file mode 100644 index 0000000000..562a00121a --- /dev/null +++ b/spring-all/src/main/java/org/baeldung/sample/Foo.java @@ -0,0 +1,5 @@ +package org.baeldung.sample; + +public class Foo { + +} diff --git a/spring-all/src/main/java/org/baeldung/sample/FooDAO.java b/spring-all/src/main/java/org/baeldung/sample/FooDAO.java new file mode 100644 index 0000000000..151c0c38de --- /dev/null +++ b/spring-all/src/main/java/org/baeldung/sample/FooDAO.java @@ -0,0 +1,5 @@ +package org.baeldung.sample; + +public class FooDAO { + +} diff --git a/spring-autowire/src/main/java/com/baeldung/autowire/sample/FooFormatter.java b/spring-all/src/main/java/org/baeldung/sample/FooFormatter.java similarity index 83% rename from spring-autowire/src/main/java/com/baeldung/autowire/sample/FooFormatter.java rename to spring-all/src/main/java/org/baeldung/sample/FooFormatter.java index 57f93a53d7..68cb7f81f2 100644 --- a/spring-autowire/src/main/java/com/baeldung/autowire/sample/FooFormatter.java +++ b/spring-all/src/main/java/org/baeldung/sample/FooFormatter.java @@ -1,4 +1,4 @@ -package com.baeldung.autowire.sample; +package org.baeldung.sample; import org.springframework.stereotype.Component; diff --git a/spring-autowire/src/main/java/com/baeldung/autowire/sample/FooService.java b/spring-all/src/main/java/org/baeldung/sample/FooService.java similarity index 88% rename from spring-autowire/src/main/java/com/baeldung/autowire/sample/FooService.java rename to spring-all/src/main/java/org/baeldung/sample/FooService.java index c55d93da11..711711f205 100644 --- a/spring-autowire/src/main/java/com/baeldung/autowire/sample/FooService.java +++ b/spring-all/src/main/java/org/baeldung/sample/FooService.java @@ -1,4 +1,4 @@ -package com.baeldung.autowire.sample; +package org.baeldung.sample; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/spring-autowire/src/main/java/com/baeldung/autowire/sample/Formatter.java b/spring-all/src/main/java/org/baeldung/sample/Formatter.java similarity index 59% rename from spring-autowire/src/main/java/com/baeldung/autowire/sample/Formatter.java rename to spring-all/src/main/java/org/baeldung/sample/Formatter.java index 59d718050a..ab29c2b848 100644 --- a/spring-autowire/src/main/java/com/baeldung/autowire/sample/Formatter.java +++ b/spring-all/src/main/java/org/baeldung/sample/Formatter.java @@ -1,4 +1,4 @@ -package com.baeldung.autowire.sample; +package org.baeldung.sample; public interface Formatter { diff --git a/spring-autowire/src/main/java/com/baeldung/autowire/sample/FormatterType.java b/spring-all/src/main/java/org/baeldung/sample/FormatterType.java similarity index 91% rename from spring-autowire/src/main/java/com/baeldung/autowire/sample/FormatterType.java rename to spring-all/src/main/java/org/baeldung/sample/FormatterType.java index f2961745b5..d4d82dd022 100644 --- a/spring-autowire/src/main/java/com/baeldung/autowire/sample/FormatterType.java +++ b/spring-all/src/main/java/org/baeldung/sample/FormatterType.java @@ -1,4 +1,4 @@ -package com.baeldung.autowire.sample; +package org.baeldung.sample; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-autowire/src/test/java/com/baeldung/autowire/sample/FooServiceIntegrationTest.java b/spring-all/src/test/java/org/baeldung/sample/FooServiceIntegrationTest.java similarity index 94% rename from spring-autowire/src/test/java/com/baeldung/autowire/sample/FooServiceIntegrationTest.java rename to spring-all/src/test/java/org/baeldung/sample/FooServiceIntegrationTest.java index 34ba7902ca..6b518395a1 100644 --- a/spring-autowire/src/test/java/com/baeldung/autowire/sample/FooServiceIntegrationTest.java +++ b/spring-all/src/test/java/org/baeldung/sample/FooServiceIntegrationTest.java @@ -1,4 +1,4 @@ -package com.baeldung.autowire.sample; +package org.baeldung.sample; import org.junit.Assert; import org.junit.Test; diff --git a/spring-autowire/README.md b/spring-autowire/README.md deleted file mode 100644 index d5b8221b25..0000000000 --- a/spring-autowire/README.md +++ /dev/null @@ -1,2 +0,0 @@ -### Relevant Articles: -- [Guide to Spring @Autowired](http://www.baeldung.com/spring-autowire) diff --git a/spring-autowire/pom.xml b/spring-autowire/pom.xml deleted file mode 100644 index 391cfc018e..0000000000 --- a/spring-autowire/pom.xml +++ /dev/null @@ -1,105 +0,0 @@ - - 4.0.0 - - com.baeldung - spring-autowire - 0.0.1-SNAPSHOT - jar - - spring-autowire - http://maven.apache.org - - - UTF-8 - 4.3.4.RELEASE - 4.12 - 3.6.0 - 2.19.1 - - - - - junit - junit - ${junit.version} - - - org.springframework - spring-core - ${org.springframework.version} - - - org.springframework - spring-context - ${org.springframework.version} - - - org.springframework - spring-test - ${org.springframework.version} - test - - - - - spring-autowire - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-surefire-plugin - ${maven-surefire-plugin.version} - - - **/*IntegrationTest.java - **/*LiveTest.java - - - - - - - - - integration - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration-test - - test - - - - **/*LiveTest.java - - - **/*IntegrationTest.java - - - - - - - json - - - - - - - - diff --git a/spring-autowire/src/main/java/com/baeldung/autowire/sample/Bar.java b/spring-autowire/src/main/java/com/baeldung/autowire/sample/Bar.java deleted file mode 100644 index 7aa820adef..0000000000 --- a/spring-autowire/src/main/java/com/baeldung/autowire/sample/Bar.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.baeldung.autowire.sample; - -public class Bar { - -} diff --git a/spring-autowire/src/main/java/com/baeldung/autowire/sample/Foo.java b/spring-autowire/src/main/java/com/baeldung/autowire/sample/Foo.java deleted file mode 100644 index b587ab38b8..0000000000 --- a/spring-autowire/src/main/java/com/baeldung/autowire/sample/Foo.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.baeldung.autowire.sample; - -public class Foo { - -} diff --git a/spring-autowire/src/main/java/com/baeldung/autowire/sample/FooDAO.java b/spring-autowire/src/main/java/com/baeldung/autowire/sample/FooDAO.java deleted file mode 100644 index aec26202ab..0000000000 --- a/spring-autowire/src/main/java/com/baeldung/autowire/sample/FooDAO.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.baeldung.autowire.sample; - -public class FooDAO { - -}