From d04cc812a9f39538bf3e8e73a997e187504c3161 Mon Sep 17 00:00:00 2001
From: JKetelaar <jeroen@ketelaar.me>
Date: Sun, 12 Jun 2016 01:47:10 +0200
Subject: [PATCH 1/4] [TASK] Bumped version to 2.6

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ed9ff72..02a2d70 100755
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.parabot</groupId>
     <artifactId>client</artifactId>
-    <version>2.5.1</version>
+    <version>2.6</version>
 
     <packaging>jar</packaging>
 

From 64bf3c335903860df8d8b21ab36fa51f6f8b9fe8 Mon Sep 17 00:00:00 2001
From: JKetelaar <jeroen@ketelaar.me>
Date: Sun, 12 Jun 2016 01:47:19 +0200
Subject: [PATCH 2/4] [BUGFIX] Set plugin to static version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 02a2d70..8533745 100755
--- a/pom.xml
+++ b/pom.xml
@@ -129,7 +129,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>
-                <version>${version}</version>
+                <version>2.5.3</version>
                 <configuration>
                     <descriptorRefs>
                         <descriptorRef>jar-with-dependencies</descriptorRef>

From 6fbd5116fcad655fcf368e47f3b90503f425ab1f Mon Sep 17 00:00:00 2001
From: JKetelaar <jeroen@ketelaar.me>
Date: Sun, 12 Jun 2016 01:47:54 +0200
Subject: [PATCH 3/4] [CLEANUP] Removed unused files

---
 .gitlab-ci.yml             | 7 -------
 .travis.yml                | 1 -
 .travis/artifact-upload.sh | 8 --------
 3 files changed, 16 deletions(-)
 delete mode 100644 .gitlab-ci.yml
 delete mode 100644 .travis/artifact-upload.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
deleted file mode 100644
index 99ff537..0000000
--- a/.gitlab-ci.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-before_script:
-  - mvn clean
-
-production:
-  script:
-    - mvn -U package -Dsettings.security=/home/ci/settings.xml
-  type: deploy
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 142ad9d..c9509e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,6 @@ jdk:
   - oraclejdk7
 
 before_install:
-  - chmod +x ./.travis/artifact-upload.sh
   - chmod +x ./.travis/maven-build.sh
   - chmod +x ./.travis/call-creation.sh
   - mvn clean
diff --git a/.travis/artifact-upload.sh b/.travis/artifact-upload.sh
deleted file mode 100644
index 6c1b4f4..0000000
--- a/.travis/artifact-upload.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/bash
- 
-local_file="$(ls $TRAVIS_BUILD_DIR/target/final/Parabot-V*.jar | head -n 1 | xargs -n 1 basename)"
-local_path="$(ls $TRAVIS_BUILD_DIR/target/final/Parabot-V*.jar | head -n 1)"
-target_url="ftp://$FTP_HOST/$local_file"
- 
-echo "Uploading $local_file to $target_url"
-curl -us $FTP_USERNAME:$FTP_PASSWORD -T "$local_path" "$target_url"
\ No newline at end of file

From f7a4db8b4b89c5e34389608f049b9a51ce6e42ae Mon Sep 17 00:00:00 2001
From: JKetelaar <jeroen@ketelaar.me>
Date: Sun, 12 Jun 2016 01:48:25 +0200
Subject: [PATCH 4/4] [TASK] Bumped exported version to 2.6

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c9509e0..ddecabd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,7 +31,7 @@ env:
     - secure: UG+b1tEgc8xv9x4r//2OAIK1RrYv6n209KTTFMMwcnAa7DI8HaP8nljRa5/VhDhuKHdlVrYH/tI90v7UVBs0GDVNwK5V17Io0fMm3FUGZekSthTCqqno5wAGa9r6a6mMLtSaSmIFeIKi0+0d2ZwplRuhj/dtEYjjBBj+kK8g4nE=
     - secure: St/fecUDInFBCRriYqgp2F8PU9/SooorgxD9Mrs+b0EsC7AbtSsQXvdIv2Lp6xzdQ0VSXPcLIhULPOYrmBKnGQ/NjXTIZXxnroyQxxnI6xyEWIZwiHRY/bKRJDRbQTxD9NL32szKiDSwnw7pu6llF4D64UqQvziq4Gm6VohU75M=
     - secure: bD15GVZWowiknbfLavh8CxSh0GsnF5kT4kZ6ggCuUDGyj0mzqf7dNRnchQIKkCG0WRYyTrFN4pEiygeywWsipEeAVv9Xhx3cuUZmzeQaR5KCWabSwJ8gK6jZd1YhcWmM9vrdPHobZr65MP0y/8mu/Fovgky9dY7KDf4G3SebNrM=
-    - PARABOT_VERSION=2.5.1
+    - PARABOT_VERSION=2.6
 
 cache:
   directories: