From 806988e167d7112416c6c17370721c4887033caf Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Sat, 26 Dec 2015 17:43:01 +0100 Subject: [PATCH 1/7] [CLEANUP] Added comments to new code --- src/main/java/org/parabot/core/Core.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/org/parabot/core/Core.java b/src/main/java/org/parabot/core/Core.java index bb39d45..7f22244 100644 --- a/src/main/java/org/parabot/core/Core.java +++ b/src/main/java/org/parabot/core/Core.java @@ -208,6 +208,11 @@ public class Core { return true; } + /** + * Compares the latest version from the BDN and the current version + * + * @return True if the current version is equal or higher than the latest version, false if lower than the latest version + */ public static boolean validVersion() { BufferedReader br = WebUtil.getReader(Configuration.GET_BOT_VERSION); try { @@ -238,6 +243,9 @@ public class Core { return true; } + /** + * Validates the cache and removes the cache contents if required + */ private static void validateCache(){ File[] cache = Directories.getCachePath().listFiles(); Integer lowest = null; From cd91f6627fc9dcf4ff64e76de8999225806a9eef Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Sat, 26 Dec 2015 17:45:34 +0100 Subject: [PATCH 2/7] [TASK] Added Gitlab build CI file --- .gitlab-ci.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..d825612 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,10 @@ +before_script: + - mvn clean +​ +production: + script: + - mvn -U package -Dsettings.security=/home/ci/settings.xml + + type: deploy + only: + - master \ No newline at end of file From e06d270a9f8ebee64446dc845e79d35fb663d9a6 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Sat, 26 Dec 2015 17:48:28 +0100 Subject: [PATCH 3/7] [TASK] Added Gitlab build CI file --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d825612..1110467 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,9 @@ before_script: - mvn clean -​ + production: script: - mvn -U package -Dsettings.security=/home/ci/settings.xml - type: deploy only: - master \ No newline at end of file From 43b2e8943e0d6145e7bd91940e51aa9db69e2594 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Sat, 26 Dec 2015 17:49:34 +0100 Subject: [PATCH 4/7] [CLEANUP] Deprecated Core#versionValid --- src/main/java/org/parabot/core/Core.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/parabot/core/Core.java b/src/main/java/org/parabot/core/Core.java index 7f22244..57cada3 100644 --- a/src/main/java/org/parabot/core/Core.java +++ b/src/main/java/org/parabot/core/Core.java @@ -176,6 +176,7 @@ public class Core { * @Deprecated use #validVersion instead * * Checks the version of the bot using a variable comparison from the bot code and the Parabot website + * * @return true if no new version is found, otherwise false. */ private static boolean versionValid(){ From 2486f59b70315b98795fb22b54272614a4212052 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Sat, 26 Dec 2015 17:52:07 +0100 Subject: [PATCH 5/7] [BUGFIX] Set repository to Maven repository instead of local --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 570f293..587d1b7 100644 --- a/pom.xml +++ b/pom.xml @@ -28,8 +28,9 @@ - my-local-repo - file://${basedir}/libs + git-parabot + Parabot's Git based repo + https://github.com/parabot/Maven-Repository/raw/master/ From 9d0449af00018b78a59278265eac83242172ba3a Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Sat, 26 Dec 2015 17:55:20 +0100 Subject: [PATCH 6/7] [BUGFIX] Set JavaFX dependency correct --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 587d1b7..3422ead 100644 --- a/pom.xml +++ b/pom.xml @@ -41,8 +41,8 @@ 1.0 - jfxrt - jfxrt + javafx + javafx 1.0 From 28c906db2d424764f239a2e5631fc5c3ff5002e5 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Sat, 26 Dec 2015 17:59:10 +0100 Subject: [PATCH 7/7] [TASK] Removed only element from gitlab ci build file --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1110467..99ff537 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,4 @@ before_script: production: script: - mvn -U package -Dsettings.security=/home/ci/settings.xml - type: deploy - only: - - master \ No newline at end of file + type: deploy \ No newline at end of file