Merge pull request #42 from evolvedbinary/feat-ci

Feat ci

Author: adamretter

.circleci/config.yml

@@ -1,14 +1,5 @@
 version: 2.1
 
-# TODO(DP): lets prune this see #30 #36 #35 
-# matrix:
-#   parameters: 
-#     image_tag: ['latest', '5.0.0', '5.2.0', 'nightly', '1.0.0-ALPHA3']
-#     image_name: ['existdb/existdb', 'evolvedbinary/fusiondb-server']
-#     image_port: ['4059', '8080']
-#     repo: ['repo.evolvedbinary.com:9543', 'repo.evolvedbinary.com:9443', 'default']
-
-
 # xenial uses Java 8 by default we need a VM executor for now
 executors:
   xenial:
@@ -28,11 +19,11 @@ workflows:
           matrix:
             parameters:
               command: 
-                - 'verify -B -q -Ddocker.test.port=$FS_API_PORT -Ddocker.test.image=existdb/existdb:latest'
-                - 'verify -B -q -Ddocker.test.port=$FS_API_PORT -Ddocker.test.image=existdb/existdb:5.2.0'
-                - 'verify -B -q -Ddocker.test.port=$FS_API_PORT -Ddocker.test.image=existdb/existdb:5.0.0'
-                # - 'verify -B -q -Ddocker.username=$FDB_NIGHTLY_DOCKER_USER -Ddocker.password=$FDB_NIGHTLY_DOCKER_PASS -Ddocker.test.port=4059 -Ddocker.test.image=$repo.evolvedbinary.com:9543/evolvedbinary/fusiondb-server:nightly'
-                # - 'verify -B -q -Ddocker.username=$FDB_DOCKER_USER -Ddocker.password=$FDB_DOCKER_PASS -Ddocker.test.port=4059 -Ddocker.test.image=$repo.evolvedbinary.com:9443/evolvedbinary/fusiondb-server:1.0.0-ALPHA3'
+                - 'verify -B -q -Dapi.port=8080 -Ddocker.db.image=existdb/existdb:latest'
+                - 'verify -B -q -Dapi.port=8080 -Ddocker.db.image=existdb/existdb:5.2.0'
+                - 'verify -B -q -Dapi.port=8080 -Ddocker.db.image=existdb/existdb:5.0.0'
+                - 'verify -B -q -Ddocker.username=$FDB_NIGHTLY_DOCKER_USER -Ddocker.password=$FDB_NIGHTLY_DOCKER_PASS'
+                - 'verify -B -q -Ddocker.username=$FDB_DOCKER_USER -Ddocker.password=$FDB_DOCKER_PASS -Ddocker.db.image=repo.evolvedbinary.com:9443/evolvedbinary/fusiondb-server:latest'
           executor: 'xenial'    
           context: FusionDB_images
           test_results_path: target/failsafe-reports

.gitignore

@@ -1,6 +1,85 @@
+##############################
+## Java
+##############################
+.mtj.tmp/
+*.class
+*.jar
+*.war
+*.ear
+*.nar
+hs_err_pid*
+
+##############################
+## Maven
+##############################
 target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+pom.xml.bak
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+.mvn/wrapper/maven-wrapper.jar
 
-*.iml
+##############################
+## Gradle
+##############################
+bin/
+build/
+.gradle
+.gradletasknamecache
+gradle-app.setting
+!gradle-wrapper.jar
+
+##############################
+## IntelliJ
+##############################
+out/
 .idea/
+.idea_modules/
+*.iml
+*.ipr
+*.iws
+
+##############################
+## Eclipse
+##############################
+.settings/
+bin/
+tmp/
+.metadata
+.classpath
+.project
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.loadpath
+.factorypath
+
+##############################
+## NetBeans
+##############################
+nbproject/private/
+build/
+nbbuild/
+dist/
+nbdist/
+nbactions.xml
+nb-configuration.xml
+
+##############################
+## Visual Studio Code
+##############################
+.vscode/
+.code-workspace
+.vscode/
 
-.DS_Store/
+##############################
+## OS X
+##############################
+.DS_Store

.travis.yml

@@ -1,5 +1,5 @@
 # Fusion Studio API
-[![Build Status](https://travis-ci.com/evolvedbinary/fusion-studio-api.svg?branch=master)](https://travis-ci.com/evolvedbinary/fusion-studio-api)
+[![CircleCI Status](https://circleci.com/gh/evolvedbinary/fusion-studio-api.svg?style=svg)](https://circleci.com/gh/evolvedbinary/fusion-studio-api)
 [![License](https://img.shields.io/badge/license-AGPL%203-blue.svg)](https://opensource.org/licenses/AGPL-3.0)
 
 Server Side API for [Fusion Studio](https://github.com/evolvedbinary/fusion-studio) written in RESTXQ and XQuery.
@@ -41,9 +41,8 @@ Various settings of the build can be overridden using the following System Prope
 | Host for Fusion Studio API | `api.host` | `API_HOST` |
 | Port for Fusion Studio API | `api.port` | `API_PORT` |
 
-**NOTE:** If you wish to use the FusionDB Nightly Build Docker Container, you must configure your username and password for the
-repository in either your Maven Settings file (`~/.m2/settings.xml`), or provide the values via System Properties (see above).
-For the Maven Settings file, the following should be added to the `<servers>` section:
+**NOTE:** FusionDB nightly images and release images are hosted by separated repos. To test against both you need 2 sets of credentials to log into two private registries. You can configure your username and password for the repository in either your Maven Settings file (`~/.m2/settings.xml`), or provide the values via System Properties (see above).
+For the Maven Settings file, the following should be added to the `<servers>` section for `:nightly` images:
 ```xml
 <server>
     <id>repo.evolvedbinary.com:9543</id>