From de2022e660dd4258d4da8f9c2d6fbea74c6bac6a Mon Sep 17 00:00:00 2001 From: gotty Date: Fri, 2 Jun 2017 12:22:30 +0000 Subject: [PATCH] [LIB-5] Inheritance from lib-parent pom git-svn-id: https://svn.hedgecode.org/lib/snooker-score-api/trunk@119 fb0bcced-7025-49ed-a12f-f98bce993226 --- pom.xml | 52 ++-------------------- .../java/org/hedgecode/snooker/api/Season.java | 5 ++- 2 files changed, 8 insertions(+), 49 deletions(-) diff --git a/pom.xml b/pom.xml index 71b33dd..f171311 100644 --- a/pom.xml +++ b/pom.xml @@ -22,13 +22,14 @@ org.hedgecode.maven - maven-parent - 1 + lib-parent + 2 + ../lib-parent/pom.xml org.hedgecode.snooker snooker-score-api - 0.1-SNAPSHOT + 0.1 jar Hedgecode Snooker Score API @@ -62,21 +63,11 @@ - 8 - 1.${javaVersion} - 1.${javaVersion} 2.8.0 4.8.2 2.8 - 2.5 2.4.1 - 2.5.3 - 3.4 - 2.8.1 - 3.0.4 - 2.7 10012 - LIB 5 @@ -148,21 +139,6 @@ [${issueKey}-${issueNumber}] - - org.apache.maven.plugins - maven-site-plugin - ${mavenPluginToolsVersion} - - en,ru - - - - org.apache.maven.wagon - wagon-webdav-jackrabbit - ${wagonWebDavVersion} - - - @@ -240,15 +216,8 @@ org.apache.maven.plugins - maven-project-info-reports-plugin - ${mavenReportsPluginVersion} - - - org.apache.maven.plugins maven-javadoc-plugin - true - true org//hedgecode/snooker/cache/assign/*.java org//hedgecode/snooker/compare/*.java @@ -257,19 +226,6 @@ org//hedgecode/snooker/request/*.java - - - default - - javadoc - - - - - - org.codehaus.mojo - findbugs-maven-plugin - ${mavenFindBugsPluginVersion} diff --git a/src/main/java/org/hedgecode/snooker/api/Season.java b/src/main/java/org/hedgecode/snooker/api/Season.java index f4b1cf5..3732528 100644 --- a/src/main/java/org/hedgecode/snooker/api/Season.java +++ b/src/main/java/org/hedgecode/snooker/api/Season.java @@ -30,9 +30,12 @@ public class Season implements Serializable { private static final Calendar CURRENT_CALENDAR = Calendar.getInstance(); + private static final int NEW_SEASON_MONTH = 5; /* June */ + public static final int BEGIN_YEAR = 2005; + public static final int CURRENT_YEAR = - CURRENT_CALENDAR.get(Calendar.MONTH) >= 6 + CURRENT_CALENDAR.get(Calendar.MONTH) >= NEW_SEASON_MONTH ? CURRENT_CALENDAR.get(Calendar.YEAR) : CURRENT_CALENDAR.get(Calendar.YEAR) - 1; -- 2.10.0