Merge branch 'release/1.1.5'

jplu · Aug 28, 2016 · db4f515 · db4f515
2 parents 5660fd7 + dd2ace5
commit db4f515
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,10 +4,10 @@ language: java
 jdk:
 - oraclejdk8
 install: mvn install -Dmaven.test.skip=true
-script: mvn test -DsurefireArgLine="-Xmx4g"
+script: mvn test
 after_success:
-- mvn verify -P integration-test -DsurefireArgLine="-Xmx4g"
-- mvn verify coveralls:report -DsurefireArgLine="-Xmx4g"
+- mvn verify -P integration-test
+- mvn verify coveralls:report
 notifications:
   slack:
     secure: wATviRngbj5gS3k/92Ah1aGJLy3RWXZ9pKlC70+eaLpP4HWtFxH/9mzjnBkxGp/9qIb2uOYe5+khme5kHdx5ZKTbdSDf9mON/oyN2hPEr4f8IlgRevMUmT2CIakXbnt9YjmVRWPBqpwB5bzQf3ZOkqujdDhrAKhkgifLdB2wZ5Ii2AcfJdinKeuavOn+0Q/7EvxHCAsJbTh+8EI1kJNkP78QjKwoeH+QrEs3ZLIcwbfqV28zbjYI6KvfYw83NvGsSOVwglM9onDGeORTBBXzsFFPGQgzMc9GV1+93aXQeiCVgJbiG5X2mMT+xOBuL79wn73JQfoCywUL/r/6Re/1bgrqcRBfSitpxq8wEY3eonPKLSa7K5RyJ3zxZX0wk+YdgCCd1A6+5gc5/a8ketdgp5uZeBySVMNlH39BoBk9ebSkaQrOazxOnhdku+ySCtpkYg4DRnRmFAbbe8GY6jAnu1yG9hv97mOLmQDM4WQxtfFeZ6+5XJTMUN/6Z0z2ThTV6RH22rF86JWv9+anY4XunHQ49sHo0hrnUP2IArc4sMNg07wKPEpyJ/Aaf+7kgazTJCfEnYWep12EVl8+e8jyMHqP61Ht6RGjr0f4T9vgduWBdhgjJ2I+Lsyo+BwykcPyYhiEVmWpz5u9EbUMHbGdNC4HnoTqeOEzg27zLCio7Eo=
diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ mvn clean verify -P all-tests
 # Usage
 
 ```
-usage: java -jar stanfordNLPRESTAPI-1.1.4.jar
+usage: java -jar stanfordNLPRESTAPI-1.1.5.jar
        [-h] [-v] {server,check,pos,ner} ...
 
 positional arguments:
@@ -73,7 +73,7 @@ The first way is via CLI with two possible sub-commands, **ner** and **pos**.
 To use the **ner** CLI:
 
 ```
-usage: java -jar stanfordNLPRESTAPI-1.1.4.jar
+usage: java -jar stanfordNLPRESTAPI-1.1.5.jar
        ner -t TEXT [-f FORMAT] [-h] [file]
 
 NER command on text
@@ -92,7 +92,7 @@ optional arguments:
 To use the **pos** CLI:
 
 ```
-usage: java -jar stanfordNLPRESTAPI-1.1.4.jar
+usage: java -jar stanfordNLPRESTAPI-1.1.5.jar
        pos -t TEXT [-f FORMAT] [-h] [file]
 
 POS command on text
@@ -112,7 +112,7 @@ optional arguments:
 The second way is via a Web service:
 
 ```
-usage: java -jar stanfordNLPRESTAPI-1.1.4.jar
+usage: java -jar stanfordNLPRESTAPI-1.1.5.jar
        server [-h] [file]
 
 Runs the Dropwizard application as an HTTP server
@@ -141,7 +141,7 @@ mvn docker:build
 Once the image is built, it is possible to run it with:
 
 ```
-docker run -d -p 7000:7000 -p 7001:7001 jplu/stanford-nlp-rest-api:1.1.4
+docker run -d -p 7000:7000 -p 7001:7001 jplu/stanford-nlp-rest-api:1.1.5.jar
 ```
 
 Or with:

diff --git a/pom.xml b/pom.xml
@@ -23,7 +23,7 @@
     <groupId>fr.eurecom</groupId>
     <artifactId>stanfordNLPRESTAPI</artifactId>
     <name>StanfordNLPRESTAPI</name>
-    <version>1.1.4</version>
+    <version>1.1.5</version>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -359,7 +359,7 @@
                 <configuration>
                     <excludedGroups>fr.eurecom.stanfordnlprestapi.integrations.IntegrationTest
                     </excludedGroups>
-                    <argLine>${surefireArgLine}</argLine>
+                    <argLine>${surefireArgLine} -Xmx4g</argLine>
                     <skipTests>${skip.unit.tests}</skipTests>
                     <parallel>methods</parallel>
                     <threadCount>10</threadCount>
@@ -369,7 +369,7 @@
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <version>2.19.1</version>
                 <configuration>
-                    <argLine>${failsafeArgLine}</argLine>
+                    <argLine>${failsafeArgLine} -Xmx4g</argLine>
                     <skipTests>${skip.integration.tests}</skipTests>
                     <includes>
                         <include>**/*.java</include>