Merge pull request #82 from Parabot/feature/javadocs

[MERGE] Merging feature/javadocs into development
This commit is contained in:
Jeroen Ketelaar
2016-06-04 17:02:40 +02:00
4 changed files with 55 additions and 16 deletions
+32 -14
View File
@@ -9,6 +9,9 @@ before_install:
- chmod +x ./.travis/call-creation.sh
- mvn clean
install:
- sudo apt-get update && sudo apt-get --assume-yes install zip unzip
script: "./.travis/maven-build.sh"
after_deploy: "./.travis/call-creation.sh"
@@ -29,6 +32,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
cache:
directories:
@@ -36,17 +40,31 @@ cache:
- "$HOME/.m2"
deploy:
provider: s3
access_key_id: AKIAJDZLZNH2PIKHUKOA
secret_access_key:
secure: MTOqhji8t8DcGRsfZEitMTqMemqxIag4a3dI0SBeWKBMpDCcKOokhGbXFCUBvMukU6tKIFfMo15z2wERZQxCVAxMt7dr1cyuWb49Sdy+mnBR6Z3EsJ2suilBe6b+9odLJVplCQVRPz9VyKnllWwO9D5j/ZpQaf8fb1675PB6feY=
bucket: parabot
skip_cleanup: true
local-dir: "./target/final/"
upload-dir: "artifacts/client"
region: us-west-1
detect_encoding: true
acl: public_read
on:
repo: Parabot/Parabot
all_branches: true
- provider: s3
access_key_id: AKIAJDZLZNH2PIKHUKOA
secret_access_key:
secure: MTOqhji8t8DcGRsfZEitMTqMemqxIag4a3dI0SBeWKBMpDCcKOokhGbXFCUBvMukU6tKIFfMo15z2wERZQxCVAxMt7dr1cyuWb49Sdy+mnBR6Z3EsJ2suilBe6b+9odLJVplCQVRPz9VyKnllWwO9D5j/ZpQaf8fb1675PB6feY=
bucket: parabot
skip_cleanup: true
local-dir: "./target/final/"
upload-dir: "artifacts/client"
region: us-west-1
detect_encoding: true
acl: public_read
on:
repo: Parabot/Parabot
all_branches: true
- provider: s3
access_key_id: AKIAJDZLZNH2PIKHUKOA
secret_access_key:
secure: MTOqhji8t8DcGRsfZEitMTqMemqxIag4a3dI0SBeWKBMpDCcKOokhGbXFCUBvMukU6tKIFfMo15z2wERZQxCVAxMt7dr1cyuWb49Sdy+mnBR6Z3EsJ2suilBe6b+9odLJVplCQVRPz9VyKnllWwO9D5j/ZpQaf8fb1675PB6feY=
bucket: parabot
skip_cleanup: true
local-dir: "./target/apidocs/zips/"
upload-dir: "artifacts/apidocs"
region: us-west-1
detect_encoding: true
acl: public_read
on:
repo: Parabot/Parabot
branch: master
+2 -2
View File
@@ -1,4 +1,4 @@
#! /bin/sh
#! /bin/bash
sleep 15
curl -sS "http://v3.bdn.parabot.org/api/bot/create/client?build_id=$TRAVIS_BUILD_ID&version=2.5.1" >/dev/null
curl -sS "http://v3.bdn.parabot.org/api/bot/create/client?build_id=$TRAVIS_BUILD_ID&version=$PARABOT_VERSION" >/dev/null
+2
View File
@@ -2,6 +2,8 @@
if [ "$TRAVIS_BRANCH" == "master" ]; then
mvn -U package
mkdir -p $TRAVIS_BUILD_DIR/target/apidocs/zips/
zip -r $TRAVIS_BUILD_DIR/target/apidocs/zips/$PARABOT_VERSION.zip $TRAVIS_BUILD_DIR/target/apidocs/$PARABOT_VERSION
else
mvn -Dbuild.version="-RC-$TRAVIS_BUILD_ID" -U package
fi
+19
View File
@@ -107,6 +107,25 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
<configuration>
<doctitle>${project.name} V${project.version}</doctitle>
<failOnError>false</failOnError>
<quiet>true</quiet>
<outputDirectory>${project.build.directory}/apidocs/${project.version}</outputDirectory>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>