From 1a588ba23d8bfb339078b262f562fc9ba7e1d2d7 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Wed, 21 Nov 2018 14:29:47 +0100
Subject: [PATCH] updated jlibs version
---
pom.xml | 5 +++--
src/main/java/de/deadlocker8/budgetmaster/Main.java | 6 +++---
.../budgetmaster/controller/CategoryController.java | 2 +-
.../budgetmaster/controller/SettingsController.java | 4 ++--
.../deadlocker8/budgetmaster/database/DatabaseParser.java | 2 +-
.../budgetmaster/database/DatabaseParser_v3.java | 2 +-
.../java/de/deadlocker8/budgetmaster/entities/Category.java | 2 +-
.../budgetmaster/repeating/endoption/RepeatingEndType.java | 2 +-
.../repeating/modifier/RepeatingModifierType.java | 2 +-
.../deadlocker8/budgetmaster/services/AccountService.java | 2 +-
.../deadlocker8/budgetmaster/services/CategoryService.java | 2 +-
.../deadlocker8/budgetmaster/services/HelpersService.java | 4 ++--
.../budgetmaster/services/LocalizationService.java | 2 +-
.../budgetmaster/services/TransactionService.java | 2 +-
.../budgetmaster/utils/DatabaseConfiguration.java | 4 ++--
.../de/deadlocker8/budgetmaster/utils/Notification.java | 2 +-
.../budgetmaster/utils/PropertiesConfiguration.java | 4 ++--
src/main/resources/templates/header.ftl | 2 +-
.../budgetmaster/database/DatabaseParser_v3Test.java | 4 ++--
19 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/pom.xml b/pom.xml
index 60999f84b..f99f3290b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,8 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
- <jlibs.version>2.0.1</jlibs.version>
+ <jlibs.version>2.0.4</jlibs.version>
+ <versionizer.version>1.0.2</versionizer.version>
<app.versionDate>${maven.build.timestamp}</app.versionDate>
<maven.build.timestamp.format>dd.MM.yy</maven.build.timestamp.format>
@@ -108,7 +109,7 @@
</dependency>
<dependency>
- <groupId>de.tobias</groupId>
+ <groupId>de.thecodelabs</groupId>
<artifactId>libUtils</artifactId>
</dependency>
diff --git a/src/main/java/de/deadlocker8/budgetmaster/Main.java b/src/main/java/de/deadlocker8/budgetmaster/Main.java
index fd1fb8d1b..5630058e1 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/Main.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/Main.java
@@ -1,8 +1,8 @@
package de.deadlocker8.budgetmaster;
-import de.tobias.utils.io.PathUtils;
-import de.tobias.utils.util.Localization;
-import de.tobias.utils.util.SystemUtils;
+import de.thecodelabs.utils.io.PathUtils;
+import de.thecodelabs.utils.util.Localization;
+import de.thecodelabs.utils.util.SystemUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.ApplicationArguments;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/CategoryController.java b/src/main/java/de/deadlocker8/budgetmaster/controller/CategoryController.java
index 86fe0e2da..a4bb5e5df 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/controller/CategoryController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/controller/CategoryController.java
@@ -8,7 +8,7 @@ import de.deadlocker8.budgetmaster.services.HelpersService;
import de.deadlocker8.budgetmaster.utils.Colors;
import de.deadlocker8.budgetmaster.utils.ResourceNotFoundException;
import de.deadlocker8.budgetmaster.validators.CategoryValidator;
-import de.tobias.utils.util.ColorUtils;
+import de.thecodelabs.utils.util.ColorUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java b/src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java
index d78ba3fc3..6ecc1b160 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/controller/SettingsController.java
@@ -13,8 +13,8 @@ import de.deadlocker8.budgetmaster.services.HelpersService;
import de.deadlocker8.budgetmaster.services.ImportService;
import de.deadlocker8.budgetmaster.utils.LanguageType;
import de.deadlocker8.budgetmaster.utils.Strings;
-import de.tobias.utils.util.Localization;
-import de.tobias.utils.util.RandomUtils;
+import de.thecodelabs.utils.util.Localization;
+import de.thecodelabs.utils.util.RandomUtils;
import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java
index de862a111..be2d5c360 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser.java
@@ -3,7 +3,7 @@ package de.deadlocker8.budgetmaster.database;
import com.google.gson.JsonObject;
import com.google.gson.JsonParser;
import de.deadlocker8.budgetmaster.database.legacy.LegacyParser;
-import de.tobias.utils.util.Localization;
+import de.thecodelabs.utils.util.Localization;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3.java b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3.java
index 7a2addbc9..b59c0b81e 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3.java
@@ -5,7 +5,7 @@ import de.deadlocker8.budgetmaster.entities.*;
import de.deadlocker8.budgetmaster.repeating.RepeatingOption;
import de.deadlocker8.budgetmaster.repeating.endoption.*;
import de.deadlocker8.budgetmaster.repeating.modifier.*;
-import de.tobias.utils.util.Localization;
+import de.thecodelabs.utils.util.Localization;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.slf4j.Logger;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/entities/Category.java b/src/main/java/de/deadlocker8/budgetmaster/entities/Category.java
index 71dd608dc..e5901de2f 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/entities/Category.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/entities/Category.java
@@ -1,7 +1,7 @@
package de.deadlocker8.budgetmaster.entities;
import com.google.gson.annotations.Expose;
-import de.tobias.utils.util.ColorUtils;
+import de.thecodelabs.utils.util.ColorUtils;
import javafx.scene.paint.Color;
import javax.persistence.*;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndType.java b/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndType.java
index 1efaa9780..8b95d68d5 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndType.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/repeating/endoption/RepeatingEndType.java
@@ -1,6 +1,6 @@
package de.deadlocker8.budgetmaster.repeating.endoption;
-import de.tobias.utils.util.Localization;
+import de.thecodelabs.utils.util.Localization;
public enum RepeatingEndType
{
diff --git a/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierType.java b/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierType.java
index 9be327326..a90f1b2dc 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierType.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/repeating/modifier/RepeatingModifierType.java
@@ -1,7 +1,7 @@
package de.deadlocker8.budgetmaster.repeating.modifier;
-import de.tobias.utils.util.Localization;
+import de.thecodelabs.utils.util.Localization;
public enum RepeatingModifierType
{
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/AccountService.java b/src/main/java/de/deadlocker8/budgetmaster/services/AccountService.java
index 58c9af345..c81472a47 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/AccountService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/services/AccountService.java
@@ -7,7 +7,7 @@ import de.deadlocker8.budgetmaster.entities.AccountType;
import de.deadlocker8.budgetmaster.repositories.AccountRepository;
import de.deadlocker8.budgetmaster.repositories.TransactionRepository;
import de.deadlocker8.budgetmaster.utils.Strings;
-import de.tobias.utils.util.Localization;
+import de.thecodelabs.utils.util.Localization;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/CategoryService.java b/src/main/java/de/deadlocker8/budgetmaster/services/CategoryService.java
index a9a4bb16a..9edc8f174 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/CategoryService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/services/CategoryService.java
@@ -5,7 +5,7 @@ import de.deadlocker8.budgetmaster.entities.CategoryType;
import de.deadlocker8.budgetmaster.entities.Transaction;
import de.deadlocker8.budgetmaster.repositories.CategoryRepository;
import de.deadlocker8.budgetmaster.utils.Strings;
-import de.tobias.utils.util.Localization;
+import de.thecodelabs.utils.util.Localization;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java b/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
index 0ec2ac00d..97e4210bc 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/services/HelpersService.java
@@ -10,8 +10,8 @@ import de.deadlocker8.budgetmaster.repositories.TagRepository;
import de.deadlocker8.budgetmaster.utils.Colors;
import de.deadlocker8.budgetmaster.utils.LanguageType;
import de.deadlocker8.budgetmaster.utils.Strings;
-import de.tobias.utils.util.ColorUtils;
-import de.tobias.utils.util.Localization;
+import de.thecodelabs.utils.util.ColorUtils;
+import de.thecodelabs.utils.util.Localization;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/LocalizationService.java b/src/main/java/de/deadlocker8/budgetmaster/services/LocalizationService.java
index 2c213e6a3..b09d0bd1d 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/LocalizationService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/services/LocalizationService.java
@@ -1,6 +1,6 @@
package de.deadlocker8.budgetmaster.services;
-import de.tobias.utils.util.Localization;
+import de.thecodelabs.utils.util.Localization;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/services/TransactionService.java b/src/main/java/de/deadlocker8/budgetmaster/services/TransactionService.java
index fa3b33743..767cfdbfc 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/services/TransactionService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/services/TransactionService.java
@@ -8,7 +8,7 @@ import de.deadlocker8.budgetmaster.repositories.CategoryRepository;
import de.deadlocker8.budgetmaster.repositories.RepeatingOptionRepository;
import de.deadlocker8.budgetmaster.repositories.TransactionRepository;
import de.deadlocker8.budgetmaster.utils.Strings;
-import de.tobias.utils.util.Localization;
+import de.thecodelabs.utils.util.Localization;
import org.joda.time.DateTime;
import org.joda.time.format.ISODateTimeFormat;
import org.slf4j.Logger;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfiguration.java b/src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfiguration.java
index c59eedefe..aa960983c 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfiguration.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/utils/DatabaseConfiguration.java
@@ -1,7 +1,7 @@
package de.deadlocker8.budgetmaster.utils;
-import de.tobias.utils.util.Localization;
-import de.tobias.utils.util.SystemUtils;
+import de.thecodelabs.utils.util.Localization;
+import de.thecodelabs.utils.util.SystemUtils;
import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/Notification.java b/src/main/java/de/deadlocker8/budgetmaster/utils/Notification.java
index 9d6f8bf1d..65023761c 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/utils/Notification.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/utils/Notification.java
@@ -1,6 +1,6 @@
package de.deadlocker8.budgetmaster.utils;
-import de.tobias.utils.util.Localization;
+import de.thecodelabs.utils.util.Localization;
public class Notification
{
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/PropertiesConfiguration.java b/src/main/java/de/deadlocker8/budgetmaster/utils/PropertiesConfiguration.java
index 8011c94bb..52910f40f 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/utils/PropertiesConfiguration.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/utils/PropertiesConfiguration.java
@@ -1,7 +1,7 @@
package de.deadlocker8.budgetmaster.utils;
-import de.tobias.utils.util.Localization;
-import de.tobias.utils.util.SystemUtils;
+import de.thecodelabs.utils.util.Localization;
+import de.thecodelabs.utils.util.SystemUtils;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
diff --git a/src/main/resources/templates/header.ftl b/src/main/resources/templates/header.ftl
index aeb0cfc6a..061b7ccc2 100644
--- a/src/main/resources/templates/header.ftl
+++ b/src/main/resources/templates/header.ftl
@@ -14,7 +14,7 @@
<link rel="stylesheet" href="/materialize-0.100.2/css/materialize.min.css">
<@style "style"/>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
- <#global locale = static["de.tobias.utils.util.Localization"]>
+ <#global locale = static["de.thecodelabs.utils.util.Localization"]>
<#if helpers.getSettings().isUseDarkTheme()>
<#global greenTextColor="text-green"/>
diff --git a/src/test/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3Test.java b/src/test/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3Test.java
index 50cfbfa19..5cf846011 100644
--- a/src/test/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3Test.java
+++ b/src/test/java/de/deadlocker8/budgetmaster/database/DatabaseParser_v3Test.java
@@ -4,8 +4,8 @@ import de.deadlocker8.budgetmaster.entities.*;
import de.deadlocker8.budgetmaster.repeating.RepeatingOption;
import de.deadlocker8.budgetmaster.repeating.endoption.RepeatingEndAfterXTimes;
import de.deadlocker8.budgetmaster.repeating.modifier.RepeatingModifierDays;
-import de.tobias.utils.util.Localization;
-import de.tobias.utils.util.Localization.LocalizationDelegate;
+import de.thecodelabs.utils.util.Localization;
+import de.thecodelabs.utils.util.Localization.LocalizationDelegate;
import org.joda.time.DateTime;
import org.joda.time.format.DateTimeFormat;
import org.junit.Before;
--
GitLab