From 690fb244b2a437ec16cf3ffb6b4182c390ce2475 Mon Sep 17 00:00:00 2001 From: mikr Date: Mon, 27 Jan 2020 07:36:10 +0100 Subject: [PATCH 1/2] BAEL-20855 Move Spring Boot Artifacts module to Spring Boot modules --- pom.xml | 2 -- spring-boot-modules/pom.xml | 1 + .../spring-boot-artifacts}/README.md | 0 .../spring-boot-artifacts}/pom.xml | 2 +- .../src/main/java/com/baeldung/webjar/TestController.java | 0 .../main/java/com/baeldung/webjar/WebjarsdemoApplication.java | 0 .../src/main/resources/application.properties | 0 .../spring-boot-artifacts}/src/main/resources/logback.xml | 0 .../src/main/resources/templates/index.html | 0 .../baeldung/webjar/WebjarsdemoApplicationIntegrationTest.java | 0 10 files changed, 2 insertions(+), 3 deletions(-) rename {spring-boot-artifacts => spring-boot-modules/spring-boot-artifacts}/README.md (100%) rename {spring-boot-artifacts => spring-boot-modules/spring-boot-artifacts}/pom.xml (99%) rename {spring-boot-artifacts => spring-boot-modules/spring-boot-artifacts}/src/main/java/com/baeldung/webjar/TestController.java (100%) rename {spring-boot-artifacts => spring-boot-modules/spring-boot-artifacts}/src/main/java/com/baeldung/webjar/WebjarsdemoApplication.java (100%) rename {spring-boot-artifacts => spring-boot-modules/spring-boot-artifacts}/src/main/resources/application.properties (100%) rename {spring-boot-artifacts => spring-boot-modules/spring-boot-artifacts}/src/main/resources/logback.xml (100%) rename {spring-boot-artifacts => spring-boot-modules/spring-boot-artifacts}/src/main/resources/templates/index.html (100%) rename {spring-boot-artifacts => spring-boot-modules/spring-boot-artifacts}/src/test/java/com/baeldung/webjar/WebjarsdemoApplicationIntegrationTest.java (100%) diff --git a/pom.xml b/pom.xml index 1a111546fa..be81cdbb75 100644 --- a/pom.xml +++ b/pom.xml @@ -642,7 +642,6 @@ spring-boot-modules spring-boot-admin spring-boot-angular - spring-boot-artifacts spring-boot-autoconfiguration spring-boot-bootstrap spring-boot-camel @@ -1180,7 +1179,6 @@ spring-boot-modules spring-boot-admin spring-boot-angular - spring-boot-artifacts spring-boot-autoconfiguration spring-boot-bootstrap spring-boot-camel diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml index 0af6fe449f..bfe5882270 100644 --- a/spring-boot-modules/pom.xml +++ b/spring-boot-modules/pom.xml @@ -14,6 +14,7 @@ + spring-boot-artifacts spring-boot-mvc-birt spring-boot-vue diff --git a/spring-boot-artifacts/README.md b/spring-boot-modules/spring-boot-artifacts/README.md similarity index 100% rename from spring-boot-artifacts/README.md rename to spring-boot-modules/spring-boot-artifacts/README.md diff --git a/spring-boot-artifacts/pom.xml b/spring-boot-modules/spring-boot-artifacts/pom.xml similarity index 99% rename from spring-boot-artifacts/pom.xml rename to spring-boot-modules/spring-boot-artifacts/pom.xml index 97d3c53b49..d6d3886c3e 100644 --- a/spring-boot-artifacts/pom.xml +++ b/spring-boot-modules/spring-boot-artifacts/pom.xml @@ -11,7 +11,7 @@ com.baeldung parent-boot-2 0.0.1-SNAPSHOT - ../parent-boot-2 + ../../parent-boot-2 diff --git a/spring-boot-artifacts/src/main/java/com/baeldung/webjar/TestController.java b/spring-boot-modules/spring-boot-artifacts/src/main/java/com/baeldung/webjar/TestController.java similarity index 100% rename from spring-boot-artifacts/src/main/java/com/baeldung/webjar/TestController.java rename to spring-boot-modules/spring-boot-artifacts/src/main/java/com/baeldung/webjar/TestController.java diff --git a/spring-boot-artifacts/src/main/java/com/baeldung/webjar/WebjarsdemoApplication.java b/spring-boot-modules/spring-boot-artifacts/src/main/java/com/baeldung/webjar/WebjarsdemoApplication.java similarity index 100% rename from spring-boot-artifacts/src/main/java/com/baeldung/webjar/WebjarsdemoApplication.java rename to spring-boot-modules/spring-boot-artifacts/src/main/java/com/baeldung/webjar/WebjarsdemoApplication.java diff --git a/spring-boot-artifacts/src/main/resources/application.properties b/spring-boot-modules/spring-boot-artifacts/src/main/resources/application.properties similarity index 100% rename from spring-boot-artifacts/src/main/resources/application.properties rename to spring-boot-modules/spring-boot-artifacts/src/main/resources/application.properties diff --git a/spring-boot-artifacts/src/main/resources/logback.xml b/spring-boot-modules/spring-boot-artifacts/src/main/resources/logback.xml similarity index 100% rename from spring-boot-artifacts/src/main/resources/logback.xml rename to spring-boot-modules/spring-boot-artifacts/src/main/resources/logback.xml diff --git a/spring-boot-artifacts/src/main/resources/templates/index.html b/spring-boot-modules/spring-boot-artifacts/src/main/resources/templates/index.html similarity index 100% rename from spring-boot-artifacts/src/main/resources/templates/index.html rename to spring-boot-modules/spring-boot-artifacts/src/main/resources/templates/index.html diff --git a/spring-boot-artifacts/src/test/java/com/baeldung/webjar/WebjarsdemoApplicationIntegrationTest.java b/spring-boot-modules/spring-boot-artifacts/src/test/java/com/baeldung/webjar/WebjarsdemoApplicationIntegrationTest.java similarity index 100% rename from spring-boot-artifacts/src/test/java/com/baeldung/webjar/WebjarsdemoApplicationIntegrationTest.java rename to spring-boot-modules/spring-boot-artifacts/src/test/java/com/baeldung/webjar/WebjarsdemoApplicationIntegrationTest.java From e9daf73125a6e45d468889600ecd59dfaf9ffca6 Mon Sep 17 00:00:00 2001 From: Ali Dehghani Date: Mon, 27 Jan 2020 23:34:21 +0330 Subject: [PATCH 2/2] Fixing Yet Another Date & Time Problem --- .../offsetdatetime/ConvertToOffsetDateTimeUnitTest.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/offsetdatetime/ConvertToOffsetDateTimeUnitTest.java b/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/offsetdatetime/ConvertToOffsetDateTimeUnitTest.java index a6fd6c03c2..fa9ceca173 100644 --- a/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/offsetdatetime/ConvertToOffsetDateTimeUnitTest.java +++ b/core-java-modules/core-java-date-operations-2/src/test/java/com/baeldung/offsetdatetime/ConvertToOffsetDateTimeUnitTest.java @@ -4,6 +4,7 @@ import org.junit.Test; import java.time.OffsetDateTime; import java.util.Date; +import java.util.TimeZone; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -18,12 +19,19 @@ public class ConvertToOffsetDateTimeUnitTest { @Test public void givenDate_whenHasOffset_thenConvertWithOffset() { + TimeZone prevTimezone = TimeZone.getDefault(); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + Date date = new Date(); date.setHours(6); date.setMinutes(30); + OffsetDateTime odt = ConvertToOffsetDateTime.convert(date, 3, 30); assertEquals(10, odt.getHour()); assertEquals(0, odt.getMinute()); + + // Reset the timezone to its original value to prevent side effects + TimeZone.setDefault(prevTimezone); } }