Skip to content

Commit

Permalink
Merge branch 'release/1.1.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
Julien Plu committed Aug 28, 2016
2 parents fee230e + 20673a2 commit 5660fd7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ jdk:
install: mvn install -Dmaven.test.skip=true
script: mvn test -DsurefireArgLine="-Xmx4g"
after_success:
- mvn verify -P integration-test -Denforcer.skip=true -Djavadoc.skip=true -Dlicense.skip=true -Dpmd.skip=true -Dfindbugs.skip=true -Dcheckstyle.skip=true -Dxml.skip=true -DsurefireArgLine="-Xmx4g"
- mvn verify coveralls:report
- mvn verify -P integration-test -DsurefireArgLine="-Xmx4g"
- mvn verify coveralls:report -DsurefireArgLine="-Xmx4g"
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=
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ mvn clean verify -P all-tests
# Usage

```
usage: java -jar stanfordNLPRESTAPI-1.1.3.jar
usage: java -jar stanfordNLPRESTAPI-1.1.4.jar
[-h] [-v] {server,check,pos,ner} ...
positional arguments:
Expand All @@ -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.3.jar
usage: java -jar stanfordNLPRESTAPI-1.1.4.jar
ner -t TEXT [-f FORMAT] [-h] [file]
NER command on text
Expand All @@ -92,7 +92,7 @@ optional arguments:
To use the **pos** CLI:

```
usage: java -jar stanfordNLPRESTAPI-1.1.3.jar
usage: java -jar stanfordNLPRESTAPI-1.1.4.jar
pos -t TEXT [-f FORMAT] [-h] [file]
POS command on text
Expand All @@ -112,7 +112,7 @@ optional arguments:
The second way is via a Web service:

```
usage: java -jar stanfordNLPRESTAPI-1.1.3.jar
usage: java -jar stanfordNLPRESTAPI-1.1.4.jar
server [-h] [file]
Runs the Dropwizard application as an HTTP server
Expand Down Expand Up @@ -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.3
docker run -d -p 7000:7000 -p 7001:7001 jplu/stanford-nlp-rest-api:1.1.4
```

Or with:
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<groupId>fr.eurecom</groupId>
<artifactId>stanfordNLPRESTAPI</artifactId>
<name>StanfordNLPRESTAPI</name>
<version>1.1.3</version>
<version>1.1.4</version>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down

0 comments on commit 5660fd7

Please sign in to comment.