Merge branch 'master' into METAMODEL-1159-composite-query
diff --git a/.travis.yml b/.travis.yml
index 948b691..f38a0b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,11 +8,12 @@
before_install:
- sudo apt-get -qq update
-- sudo apt-get install npm
-- sudo npm install newman --global;
+- sudo apt-get install -y npm
+- sudo npm config set registry="http://registry.npmjs.org/"
+- sudo npm install newman@3.9.3 --global;
script:
- mvn clean install -Pfull
notifications:
- email: false
\ No newline at end of file
+ email: false
diff --git a/Dockerfile b/Dockerfile
index a10b5d8..cd366e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
-FROM maven:3.5-jdk-8-alpine
+FROM maven:3-jdk-8
# Set data directory used for the app's persistence
VOLUME /data
diff --git a/postman-tests/pom.xml b/postman-tests/pom.xml
index 2d4c04c..40a91fc 100644
--- a/postman-tests/pom.xml
+++ b/postman-tests/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.metamodel.membrane</groupId>
<artifactId>Membrane-parent</artifactId>
- <version>0.1-SNAPSHOT</version>
+ <version>0.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>Membrane-postman-tests</artifactId>
@@ -111,6 +111,7 @@
<![CDATA[
-c "newman run ./Membrane.postman_collection.json \
-e ./environments/${postman.env}.postman_environment.json \
+ --disable-unicode \
--reporters junit,cli -x \
--reporter-junit-export ./target/NewmanTestResults.xml"
]]>
