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..ddecabd 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 @@ -32,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: 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 diff --git a/pom.xml b/pom.xml index 8ad4ddf..9697eea 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.parabot client - 2.5.1 + 2.6 jar @@ -123,7 +123,7 @@ org.apache.maven.plugins maven-assembly-plugin - ${version} + 2.5.3 jar-with-dependencies