From 528387e3b505d4173a3b2828c02e84cb7999e01d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Sebastian=20Ho=C3=9F?= <mail@shoss.de>
Date: Sun, 1 May 2016 17:31:32 +0200
Subject: [PATCH] use latest parent
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Sebastian Hoß <mail@shoss.de>
---
 pom.xml                                            | 36 ++-----------------
 .../sebhoss/time/FiscalDateImplementation.java     |  8 ++---
 .../time/EarlyFiscalDateCalculatorTest.java        | 42 ++++++++++++++++++++++
 .../sebhoss/time/LateFiscalDateCalculatorTest.java | 42 ++++++++++++++++++++++
 4 files changed, 89 insertions(+), 39 deletions(-)
 create mode 100644 src/test/java/com/github/sebhoss/time/EarlyFiscalDateCalculatorTest.java
 create mode 100644 src/test/java/com/github/sebhoss/time/LateFiscalDateCalculatorTest.java

diff --git a/pom.xml b/pom.xml
index ce3d334..e676de2 100755
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
   <parent>
     <groupId>com.github.sebhoss</groupId>
     <artifactId>java-parent</artifactId>
-    <version>1.0.11</version>
+    <version>3.0.0</version>
   </parent>
 
   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
@@ -41,35 +41,14 @@
   </scm>
 
   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <!--                                PROPERTIES                               -->
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
-  <properties>
-    <version.bom>3.0.4</version.bom>
-  </properties>
-
-  <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
   <!--                               DEPENDENCIES                              -->
   <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>com.github.sebhoss.bom</groupId>
-        <artifactId>java-bom</artifactId>
-        <version>${version.bom}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>com.github.sebhoss.bom</groupId>
-        <artifactId>testing-bom</artifactId>
-        <version>${version.bom}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-      <dependency>
-        <groupId>com.github.sebhoss.bom</groupId>
-        <artifactId>sebhoss-bom</artifactId>
-        <version>${version.bom}</version>
+        <artifactId>auto-managed</artifactId>
+        <version>2016.02.07</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -78,14 +57,6 @@
   <dependencies>
     <dependency>
       <groupId>com.github.sebhoss</groupId>
-      <artifactId>null-analysis</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.code.findbugs</groupId>
-      <artifactId>jsr305</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.github.sebhoss</groupId>
       <artifactId>suppress-warnings</artifactId>
     </dependency>
     <dependency>
@@ -103,7 +74,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.8</version>
         <configuration>
           <!--
             Ignore common annotations because @SuppressWarnings is not retained
diff --git a/src/main/java/com/github/sebhoss/time/FiscalDateImplementation.java b/src/main/java/com/github/sebhoss/time/FiscalDateImplementation.java
index 1e69b6f..c8587a1 100755
--- a/src/main/java/com/github/sebhoss/time/FiscalDateImplementation.java
+++ b/src/main/java/com/github/sebhoss/time/FiscalDateImplementation.java
@@ -9,10 +9,6 @@ package com.github.sebhoss.time;
 import java.time.LocalDate;
 import java.time.temporal.ChronoField;
 
-import javax.annotation.Nullable;
-
-import com.github.sebhoss.nullanalysis.Nullsafe;
-
 final class FiscalDateImplementation implements FiscalDate {
 
     private final FiscalDateCalculator fiscalDateCalculator;
@@ -108,8 +104,8 @@ final class FiscalDateImplementation implements FiscalDate {
         return copyWithNewDate(currentCalendarDate.minusDays(days));
     }
 
-    private FiscalDateImplementation copyWithNewDate(final @Nullable LocalDate newDate) {
-        return new FiscalDateImplementation(fiscalDateCalculator, Nullsafe.nullsafe(newDate));
+    private FiscalDateImplementation copyWithNewDate(final LocalDate newDate) {
+        return new FiscalDateImplementation(fiscalDateCalculator, newDate);
     }
 
     @Override
diff --git a/src/test/java/com/github/sebhoss/time/EarlyFiscalDateCalculatorTest.java b/src/test/java/com/github/sebhoss/time/EarlyFiscalDateCalculatorTest.java
new file mode 100644
index 0000000..0a9bc2d
--- /dev/null
+++ b/src/test/java/com/github/sebhoss/time/EarlyFiscalDateCalculatorTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2013 Sebastian Hoß <mail@shoss.de>
+ * This work is free. You can redistribute it and/or modify it under the
+ * terms of the Do What The Fuck You Want To Public License, Version 2,
+ * as published by Sam Hocevar. See http://www.wtfpl.net/ for more details.
+ */
+package com.github.sebhoss.time;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ *
+ */
+public class EarlyFiscalDateCalculatorTest {
+
+    /**
+     */
+    @SuppressWarnings("static-method")
+    @Test
+    public void shouldRemainWithinCurrentYear() {
+        final EarlyFiscalDateCalculator calculator = new EarlyFiscalDateCalculator(2);
+
+        final int calendarYear = calculator.calculateCalendarYear(2035, 12);
+
+        Assert.assertEquals(2035, calendarYear);
+    }
+
+    /**
+     */
+    @SuppressWarnings("static-method")
+    @Test
+    public void shouldBeInPastCalendarYear() {
+        final EarlyFiscalDateCalculator calculator = new EarlyFiscalDateCalculator(2);
+
+        final int calendarYear = calculator.calculateCalendarYear(2035, 11);
+
+        Assert.assertEquals(2034, calendarYear);
+    }
+
+}
diff --git a/src/test/java/com/github/sebhoss/time/LateFiscalDateCalculatorTest.java b/src/test/java/com/github/sebhoss/time/LateFiscalDateCalculatorTest.java
new file mode 100644
index 0000000..3bdcc5b
--- /dev/null
+++ b/src/test/java/com/github/sebhoss/time/LateFiscalDateCalculatorTest.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2013 Sebastian Hoß <mail@shoss.de>
+ * This work is free. You can redistribute it and/or modify it under the
+ * terms of the Do What The Fuck You Want To Public License, Version 2,
+ * as published by Sam Hocevar. See http://www.wtfpl.net/ for more details.
+ */
+package com.github.sebhoss.time;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ *
+ *
+ */
+public class LateFiscalDateCalculatorTest {
+
+    /**
+     */
+    @SuppressWarnings("static-method")
+    @Test
+    public void shouldBeInNextCalendarYear() {
+        final LateFiscalDateCalculator calculator = new LateFiscalDateCalculator(2);
+
+        final int calendarYear = calculator.calculateCalendarYear(2035, 12);
+
+        Assert.assertEquals(2036, calendarYear);
+    }
+
+    /**
+     */
+    @SuppressWarnings("static-method")
+    @Test
+    public void shouldBeInCurrentCalendarYear() {
+        final LateFiscalDateCalculator calculator = new LateFiscalDateCalculator(2);
+
+        final int calendarYear = calculator.calculateCalendarYear(2035, 11);
+
+        Assert.assertEquals(2035, calendarYear);
+    }
+
+}
-- 
2.11.4.GIT