diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml index 838b856b8814..2362a41742a5 100644 --- a/spring-boot-modules/pom.xml +++ b/spring-boot-modules/pom.xml @@ -33,6 +33,7 @@ spring-boot-caching-2 spring-boot-client spring-boot-config-jpa-error + spring-boot-core spring-boot-ctx-fluent spring-boot-deployment spring-boot-di diff --git a/spring-boot-modules/spring-boot-core/pom.xml b/spring-boot-modules/spring-boot-core/pom.xml new file mode 100644 index 000000000000..7e207385cfde --- /dev/null +++ b/spring-boot-modules/spring-boot-core/pom.xml @@ -0,0 +1,95 @@ + + + 4.0.0 + com.baeldung.spring-boot-core + spring-boot-core + 1.0.0-SNAPSHOT + spring-boot-core + war + + + org.springframework.boot + spring-boot-starter-parent + 3.5.4 + + + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-logging + + + + + org.springframework.boot + spring-boot-starter-security + + + org.springframework.boot + spring-boot-starter-validation + + + org.springframework.boot + spring-boot-starter-test + test + + + org.junit.vintage + junit-vintage-engine + + + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-webflux + + + org.springframework.boot + spring-boot-starter-log4j2 + + + org.apache.logging.log4j + log4j-spring-boot + + + org.projectlombok + lombok + provided + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + -parameters + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + + com.baeldung.actuator.Application + 3.5.4 + + + \ No newline at end of file diff --git a/spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/actuator/Application.java b/spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/actuator/Application.java similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/actuator/Application.java rename to spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/actuator/Application.java diff --git a/spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/actuator/DownstreamServiceHealthIndicator.java b/spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/actuator/DownstreamServiceHealthIndicator.java similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/actuator/DownstreamServiceHealthIndicator.java rename to spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/actuator/DownstreamServiceHealthIndicator.java diff --git a/spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/actuator/FeaturesEndpoint.java b/spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/actuator/FeaturesEndpoint.java similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/actuator/FeaturesEndpoint.java rename to spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/actuator/FeaturesEndpoint.java diff --git a/spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/actuator/InfoWebEndpointExtension.java b/spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/actuator/InfoWebEndpointExtension.java similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/actuator/InfoWebEndpointExtension.java rename to spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/actuator/InfoWebEndpointExtension.java diff --git a/spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/actuator/JobConfig.java b/spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/actuator/JobConfig.java similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/actuator/JobConfig.java rename to spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/actuator/JobConfig.java diff --git a/spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/actuator/SecurityConfig.java b/spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/actuator/SecurityConfig.java similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/actuator/SecurityConfig.java rename to spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/actuator/SecurityConfig.java diff --git a/spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/configurationproperties/ConfigProperties.java b/spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/configurationproperties/ConfigProperties.java similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/configurationproperties/ConfigProperties.java rename to spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/configurationproperties/ConfigProperties.java diff --git a/spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/configurationproperties/Employee.java b/spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/configurationproperties/Employee.java similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/configurationproperties/Employee.java rename to spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/configurationproperties/Employee.java diff --git a/spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/configurationproperties/EmployeeConverter.java b/spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/configurationproperties/EmployeeConverter.java similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/configurationproperties/EmployeeConverter.java rename to spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/configurationproperties/EmployeeConverter.java diff --git a/spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/configurationproperties/EnableConfigurationDemoApplication.java b/spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/configurationproperties/EnableConfigurationDemoApplication.java similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/configurationproperties/EnableConfigurationDemoApplication.java rename to spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/configurationproperties/EnableConfigurationDemoApplication.java diff --git a/spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/configurationproperties/ImmutableCredentials.java b/spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/configurationproperties/ImmutableCredentials.java similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/configurationproperties/ImmutableCredentials.java rename to spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/configurationproperties/ImmutableCredentials.java diff --git a/spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/configurationproperties/Item.java b/spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/configurationproperties/Item.java similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/configurationproperties/Item.java rename to spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/configurationproperties/Item.java diff --git a/spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/configurationproperties/PropertiesConversionApplication.java b/spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/configurationproperties/PropertiesConversionApplication.java similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/configurationproperties/PropertiesConversionApplication.java rename to spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/configurationproperties/PropertiesConversionApplication.java diff --git a/spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/configurationproperties/PropertyConversion.java b/spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/configurationproperties/PropertyConversion.java similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/configurationproperties/PropertyConversion.java rename to spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/configurationproperties/PropertyConversion.java diff --git a/spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/logging/LoggingController.java b/spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/logging/LoggingController.java similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/logging/LoggingController.java rename to spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/logging/LoggingController.java diff --git a/spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/logging/LombokLoggingController.java b/spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/logging/LombokLoggingController.java similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/logging/LombokLoggingController.java rename to spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/logging/LombokLoggingController.java diff --git a/spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/logging/SpringBootLoggingApplication.java b/spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/logging/SpringBootLoggingApplication.java similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/main/java/com/baeldung/logging/SpringBootLoggingApplication.java rename to spring-boot-modules/spring-boot-core/src/main/java/com/baeldung/logging/SpringBootLoggingApplication.java diff --git a/spring-boot-modules/spring-boot-core/src/main/resources/application.properties b/spring-boot-modules/spring-boot-core/src/main/resources/application.properties new file mode 100644 index 000000000000..d4a426270527 --- /dev/null +++ b/spring-boot-modules/spring-boot-core/src/main/resources/application.properties @@ -0,0 +1,18 @@ +server.port=${port:8080} + + +management.endpoint.health.group.custom.include=diskSpace,ping +management.endpoint.health.group.custom.show-components=always +management.endpoint.health.group.custom.show-details=always +management.endpoint.health.group.custom.status.http-mapping.up=207 +management.endpoints.web.exposure.include=* + +logging.file.name=logs/app.log +logging.file.path=logs + +spring.ssl.bundle.jks.server.keystore.location=classpath:ssl/baeldung.p12 +spring.ssl.bundle.jks.server.keystore.password=password +spring.ssl.bundle.jks.server.keystore.type=PKCS12 + +server.ssl.bundle=server +server.ssl.enabled=false \ No newline at end of file diff --git a/spring-boot-modules/spring-boot-simple/src/main/resources/configprops.properties b/spring-boot-modules/spring-boot-core/src/main/resources/configprops.properties similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/main/resources/configprops.properties rename to spring-boot-modules/spring-boot-core/src/main/resources/configprops.properties diff --git a/spring-boot-modules/spring-boot-simple/src/main/resources/conversion.properties b/spring-boot-modules/spring-boot-core/src/main/resources/conversion.properties similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/main/resources/conversion.properties rename to spring-boot-modules/spring-boot-core/src/main/resources/conversion.properties diff --git a/spring-boot-modules/spring-boot-simple/src/main/resources/log4j.xml b/spring-boot-modules/spring-boot-core/src/main/resources/log4j.xml similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/main/resources/log4j.xml rename to spring-boot-modules/spring-boot-core/src/main/resources/log4j.xml diff --git a/spring-boot-modules/spring-boot-simple/src/main/resources/log4j2-spring.xml b/spring-boot-modules/spring-boot-core/src/main/resources/log4j2-spring.xml similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/main/resources/log4j2-spring.xml rename to spring-boot-modules/spring-boot-core/src/main/resources/log4j2-spring.xml diff --git a/spring-boot-modules/spring-boot-simple/src/main/resources/ssl/baeldung.p12 b/spring-boot-modules/spring-boot-core/src/main/resources/ssl/baeldung.p12 similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/main/resources/ssl/baeldung.p12 rename to spring-boot-modules/spring-boot-core/src/main/resources/ssl/baeldung.p12 diff --git a/spring-boot-modules/spring-boot-simple/src/test/java/com/baeldung/actuator/ActuatorInfoIntegrationTest.java b/spring-boot-modules/spring-boot-core/src/test/java/com/baeldung/actuator/ActuatorInfoIntegrationTest.java similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/test/java/com/baeldung/actuator/ActuatorInfoIntegrationTest.java rename to spring-boot-modules/spring-boot-core/src/test/java/com/baeldung/actuator/ActuatorInfoIntegrationTest.java diff --git a/spring-boot-modules/spring-boot-simple/src/test/java/com/baeldung/configurationproperties/PropertiesConversionIntegrationTest.java b/spring-boot-modules/spring-boot-core/src/test/java/com/baeldung/configurationproperties/PropertiesConversionIntegrationTest.java similarity index 100% rename from spring-boot-modules/spring-boot-simple/src/test/java/com/baeldung/configurationproperties/PropertiesConversionIntegrationTest.java rename to spring-boot-modules/spring-boot-core/src/test/java/com/baeldung/configurationproperties/PropertiesConversionIntegrationTest.java diff --git a/spring-boot-modules/spring-boot-simple/pom.xml b/spring-boot-modules/spring-boot-simple/pom.xml index b2ab7f108f1a..0c88492321ae 100644 --- a/spring-boot-modules/spring-boot-simple/pom.xml +++ b/spring-boot-modules/spring-boot-simple/pom.xml @@ -48,10 +48,6 @@ rest-assured test - - org.springframework.boot - spring-boot-starter-validation - org.springframework.boot spring-boot-starter-test @@ -63,14 +59,6 @@ - - org.springframework.boot - spring-boot-starter-actuator - - - org.springframework.boot - spring-boot-starter-webflux - org.springframework.boot spring-boot-starter-mail @@ -82,17 +70,8 @@ test - org.springframework.boot - spring-boot-starter-log4j2 - - - org.apache.logging.log4j - log4j-spring-boot - - - org.projectlombok - lombok - provided + jakarta.validation + jakarta.validation-api diff --git a/spring-boot-modules/spring-boot-simple/src/main/resources/application.properties b/spring-boot-modules/spring-boot-simple/src/main/resources/application.properties index 7e4eaeac97d1..599b9bfcd702 100644 --- a/spring-boot-modules/spring-boot-simple/src/main/resources/application.properties +++ b/spring-boot-modules/spring-boot-simple/src/main/resources/application.properties @@ -11,23 +11,7 @@ server.error.whitelabel.enabled=false spring.jpa.generate-ddl=true spring.jpa.hibernate.ddl-auto=update -management.endpoint.health.group.custom.include=diskSpace,ping -management.endpoint.health.group.custom.show-components=always -management.endpoint.health.group.custom.show-details=always -management.endpoint.health.group.custom.status.http-mapping.up=207 -management.endpoints.web.exposure.include=* - spring.mail.host=localhost spring.mail.port=8025 -spring.jpa.properties.hibernate.globally_quoted_identifiers=true - -logging.file.name=logs/app.log -logging.file.path=logs - -spring.ssl.bundle.jks.server.keystore.location=classpath:ssl/baeldung.p12 -spring.ssl.bundle.jks.server.keystore.password=password -spring.ssl.bundle.jks.server.keystore.type=PKCS12 - -server.ssl.bundle=server -server.ssl.enabled=false \ No newline at end of file +spring.jpa.properties.hibernate.globally_quoted_identifiers=true \ No newline at end of file diff --git a/spring-boot-modules/spring-boot-simple/src/test/resources/application-integrationtest.properties b/spring-boot-modules/spring-boot-simple/src/test/resources/application-integrationtest.properties index 17258688b1f0..422a28cf235f 100644 --- a/spring-boot-modules/spring-boot-simple/src/test/resources/application-integrationtest.properties +++ b/spring-boot-modules/spring-boot-simple/src/test/resources/application-integrationtest.properties @@ -11,12 +11,6 @@ server.error.whitelabel.enabled=false spring.jpa.generate-ddl=true spring.jpa.hibernate.ddl-auto=update -management.endpoint.health.group.custom.include=diskSpace,ping -management.endpoint.health.group.custom.show-components=always -management.endpoint.health.group.custom.show-details=always -management.endpoint.health.group.custom.status.http-mapping.up=207 -management.endpoints.web.exposure.include=* - spring.jpa.properties.hibernate.globally_quoted_identifiers=true spring.mail.host=localhost