Skip to content

Commit

Permalink
Merge pull request #2393 from dzhw/release
Browse files Browse the repository at this point in the history
Release v1.0.92
  • Loading branch information
René Reitmann authored Sep 30, 2019
2 parents 27cc6cf + e471f25 commit e0f5241
Show file tree
Hide file tree
Showing 88 changed files with 16,275 additions and 35,361 deletions.
12 changes: 12 additions & 0 deletions .travis.settings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
http://maven.apache.org/xsd/settings-1.0.0.xsd">
<servers>
<server>
<id>github</id>
<username>${env.GITHUB_USERNAME}</username>
<password>${env.GITHUB_TOKEN}</password>
</server>
</servers>
</settings>
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ On Windows, `patch.exe` has to exist in the PATH. It is distributed as part of g

Before starting the app on your local machine you need to start the following Document Stores:
1. Mongodb: Mongodb must be running on the default port, on ubuntu you should install it from here https://docs.mongodb.org/manual/tutorial/install-mongodb-on-ubuntu/
2. Elasticsearch (6.3.2): Elasticsearch must be running on its default port. You can download it from here https://www.elastic.co/downloads/elasticsearch
2. Elasticsearch (7.3.2): Elasticsearch must be running on its default port. You can download it from here https://www.elastic.co/downloads/elasticsearch

Make sure that you have read-write-access on the ***data*** directory (in your project directory) for Elasticsearch.

Alternatively you can run
***Alternatively*** you can run

docker-compose up
# for later use once the containers are created
Expand Down
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"bootstrap-sass": "3.4.1",
"json3": "3.3.2",
"ng-file-upload": "12.2.13",
"elasticsearch": "15.4.1",
"elasticsearch": "16.4.0",
"jszip": "3.2.2",
"file-saver.js": "~1.20150507.2",
"jszip-utils": "~0.1.0",
Expand All @@ -32,7 +32,7 @@
"angular-material": "1.1.19",
"angular-block-ui": "^0.2.2",
"lodash": "^4.17.15",
"plotly.js": "1.49.4 ",
"plotly.js": "1.49.5",
"highlightjs": "^9.12.0",
"angular-highlightjs": "^0.7.1",
"js-beautify": "^1.10.2",
Expand Down
2 changes: 1 addition & 1 deletion deploy/build-and-deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if [ $? -ne 0 ]; then
echo "cf login failed!"
exit -1
fi
mvn --no-transfer-progress -P${PROFILE} clean package
mvn --settings .travis.settings.xml --no-transfer-progress -P${PROFILE} clean package
if [ $? -ne 0 ]; then
echo "Maven build failed!"
exit -1
Expand Down
2 changes: 1 addition & 1 deletion deploy/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if [ -z ${PROFILE} ]; then
exit -1
fi
echo "Going to run maven build with profile: ${PROFILE}"
mvn --no-transfer-progress -P${PROFILE} clean package
mvn --settings .travis.settings.xml --no-transfer-progress -P${PROFILE} clean package
if [ $? -ne 0 ]; then
echo "Maven build failed!"
exit -1
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ services:
volumes:
- ./data/mongodb/db:/data/mongodb/db
- ./data/mongodb/logs:/data/mongodb/logs
command: mongod --smallfiles
command: mongod
ports:
- "27017:27017"
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:6.3.2
image: docker.elastic.co/elasticsearch/elasticsearch:7.3.2
container_name: elasticsearch
environment:
- discovery.type=single-node
Expand Down
Loading

0 comments on commit e0f5241

Please sign in to comment.