From 32e06fa70d6cd5bbd4ffe1e9224a47d66a91f01e Mon Sep 17 00:00:00 2001 From: Julien Plu Date: Thu, 27 Oct 2016 16:40:03 +0200 Subject: [PATCH 1/7] updating poms for 2.0.1-SNAPSHOT development --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5538093..47c888c 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ fr.eurecom stanfordNLPRESTAPI StanfordNLPRESTAPI - 2.0.0-SNAPSHOT + 2.0.1-SNAPSHOT UTF-8 From 2d17cc7083e83dd3c3e4ebac3637b731438afd85 Mon Sep 17 00:00:00 2001 From: Julien Plu Date: Thu, 27 Oct 2016 17:15:08 +0200 Subject: [PATCH 2/7] updating develop poms to master versions to avoid merge conflicts --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 47c888c..d7a78ec 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ fr.eurecom stanfordNLPRESTAPI StanfordNLPRESTAPI - 2.0.1-SNAPSHOT + 2.0.0 UTF-8 From 9d77020e3ea0ebf613ba733da63e65faeea054e3 Mon Sep 17 00:00:00 2001 From: Julien Plu Date: Thu, 27 Oct 2016 17:15:08 +0200 Subject: [PATCH 3/7] Updating develop poms back to pre merge state --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d7a78ec..47c888c 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ fr.eurecom stanfordNLPRESTAPI StanfordNLPRESTAPI - 2.0.0 + 2.0.1-SNAPSHOT UTF-8 From 15f3bab81a17f79247ce9e91baf53c16b77be58d Mon Sep 17 00:00:00 2001 From: Julien Plu Date: Thu, 27 Oct 2016 17:18:23 +0200 Subject: [PATCH 4/7] Update README. --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 3171933..ac969dc 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # StanfordNLPRESTAPI -[![Build status](https://travis-ci.org/jplu/stanfordNLPRESTAPI.svg?branch=master)](https://travis-ci.org/jplu/stanfordNLPRESTAPI) -[![Coverage Status](https://coveralls.io/repos/github/jplu/stanfordNLPRESTAPI/badge.svg?branch=master)](https://coveralls.io/github/jplu/stanfordNLPRESTAPI?branch=master) +[![Build status](https://travis-ci.org/jplu/stanfordNLPRESTAPI.svg?branch=develop)](https://travis-ci.org/jplu/stanfordNLPRESTAPI) +[![Coverage Status](https://coveralls.io/repos/github/jplu/stanfordNLPRESTAPI/badge.svg?branch=develop)](https://coveralls.io/github/jplu/stanfordNLPRESTAPI?branch=master) [![License (GPL version 3)](https://img.shields.io/badge/license-GNU%20GPL%20version%203-blue.svg?style=flat-square)](http://opensource.org/licenses/GPL-3.0) # Introduction @@ -49,7 +49,7 @@ mvn clean verify -P all-tests # Usage ``` -usage: java -jar stanfordNLPRESTAPI-2.0.0.jar +usage: java -jar stanfordNLPRESTAPI-2.0.1-SNAPSHOT.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-2.0.0.jar +usage: java -jar stanfordNLPRESTAPI-2.0.1-SNAPSHOT ner [-f {turtle,jsonld}] [-s {neel2015,neel2016,oke2015,oke2016,none}] [-o OFILE] [-h] (-t TEXT | -i IFILE | -u URL) [file] NER command on text @@ -102,7 +102,7 @@ inputs: To use the **pos** CLI: ``` -usage: java -jar stanfordNLPRESTAPI-2.0.0.jar +usage: java -jar stanfordNLPRESTAPI-2.0.1-SNAPSHOT pos [-f {turtle,jsonld}] [-s {none,tweet}] [-o OFILE] [-h] (-t TEXT | -i IFILE | -u URL) [file] POS command on text @@ -131,7 +131,7 @@ inputs: The second way is via a Web service: ``` -usage: java -jar stanfordNLPRESTAPI-2.0.0.jar +usage: java -jar stanfordNLPRESTAPI-2.0.1-SNAPSHOT server [-h] [file] Runs the Dropwizard application as an HTTP server @@ -160,7 +160,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 -v $PWD/models:/maven/models -v $PWD/conf:/maven/conf jplu/stanford-nlp-rest-api:2.0.0 +docker run -d -p 7000:7000 -p 7001:7001 -v $PWD/models:/maven/models -v $PWD/conf:/maven/conf jplu/stanford-nlp-rest-api:2.0.1-SNAPSHOT ``` Or with: @@ -174,7 +174,7 @@ the loading of all the models of Stanford CoreNLP. ## Configuration -The CLI commands and the Web service use the same [configuration file](https://github.com/jplu/stanfordNLPRESTAPI/blob/master/conf/config.yaml). +The CLI commands and the Web service use the same [configuration file](https://github.com/jplu/stanfordNLPRESTAPI/blob/develop/conf/config.yaml). ## Used Models @@ -191,7 +191,7 @@ will have to include them in the CLASSPATH. We provide two models: # How to contribute -In case you want to contribute, please read the [CONTRIBUTING](https://github.com/jplu/stanfordNLPRESTAPI/blob/master/CONTRIBUTING.md) file. +In case you want to contribute, please read the [CONTRIBUTING](https://github.com/jplu/stanfordNLPRESTAPI/blob/develop/CONTRIBUTING.md) file. # Opening an issue From 71f8047da32210e89889c553349a092ff1a11064 Mon Sep 17 00:00:00 2001 From: Julien Plu Date: Fri, 28 Oct 2016 11:10:23 +0200 Subject: [PATCH 5/7] Improve README with libraries version. --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index ac969dc..1fb3974 100644 --- a/README.md +++ b/README.md @@ -8,6 +8,12 @@ This repository offer a REST API over [Stanford CoreNLP framework](http://stanfordnlp.github.io/CoreNLP/index.html) to get results in NIF format. The REST API is created via [Dropwizard](http://www.dropwizard.io/). +# Libraries + +* Stanford CoreNLP 3.6.0 +* Dropwizard 1.0.2 +* Jena 3.1.0 + # Requirements Java 1.8 and Maven 3.0.5 minimum. Docker (1.6 or later) is optional. From d51273883b90c9bfa8c049e2b50660f9d15df1f2 Mon Sep 17 00:00:00 2001 From: Julien Plu Date: Fri, 28 Oct 2016 11:13:35 +0200 Subject: [PATCH 6/7] Turn the README into release state. --- README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 1fb3974..7d3460e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # StanfordNLPRESTAPI -[![Build status](https://travis-ci.org/jplu/stanfordNLPRESTAPI.svg?branch=develop)](https://travis-ci.org/jplu/stanfordNLPRESTAPI) -[![Coverage Status](https://coveralls.io/repos/github/jplu/stanfordNLPRESTAPI/badge.svg?branch=develop)](https://coveralls.io/github/jplu/stanfordNLPRESTAPI?branch=master) +[![Build status](https://travis-ci.org/jplu/stanfordNLPRESTAPI.svg?branch=master)](https://travis-ci.org/jplu/stanfordNLPRESTAPI) +[![Coverage Status](https://coveralls.io/repos/github/jplu/stanfordNLPRESTAPI/badge.svg?branch=master)](https://coveralls.io/github/jplu/stanfordNLPRESTAPI?branch=master) [![License (GPL version 3)](https://img.shields.io/badge/license-GNU%20GPL%20version%203-blue.svg?style=flat-square)](http://opensource.org/licenses/GPL-3.0) # Introduction @@ -55,7 +55,7 @@ mvn clean verify -P all-tests # Usage ``` -usage: java -jar stanfordNLPRESTAPI-2.0.1-SNAPSHOT.jar +usage: java -jar stanfordNLPRESTAPI-2.0.1.jar [-h] [-v] {server,check,pos,ner} ... positional arguments: @@ -79,7 +79,7 @@ The first way is via CLI with two possible sub-commands, **ner** and **pos**. To use the **ner** CLI: ``` -usage: java -jar stanfordNLPRESTAPI-2.0.1-SNAPSHOT +usage: java -jar stanfordNLPRESTAPI-2.0.1.jar ner [-f {turtle,jsonld}] [-s {neel2015,neel2016,oke2015,oke2016,none}] [-o OFILE] [-h] (-t TEXT | -i IFILE | -u URL) [file] NER command on text @@ -108,7 +108,7 @@ inputs: To use the **pos** CLI: ``` -usage: java -jar stanfordNLPRESTAPI-2.0.1-SNAPSHOT +usage: java -jar stanfordNLPRESTAPI-2.0.1.jar pos [-f {turtle,jsonld}] [-s {none,tweet}] [-o OFILE] [-h] (-t TEXT | -i IFILE | -u URL) [file] POS command on text @@ -137,7 +137,7 @@ inputs: The second way is via a Web service: ``` -usage: java -jar stanfordNLPRESTAPI-2.0.1-SNAPSHOT +usage: java -jar stanfordNLPRESTAPI-2.0.1.jar server [-h] [file] Runs the Dropwizard application as an HTTP server @@ -166,7 +166,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 -v $PWD/models:/maven/models -v $PWD/conf:/maven/conf jplu/stanford-nlp-rest-api:2.0.1-SNAPSHOT +docker run -d -p 7000:7000 -p 7001:7001 -v $PWD/models:/maven/models -v $PWD/conf:/maven/conf jplu/stanford-nlp-rest-api:2.0.1 ``` Or with: @@ -180,7 +180,7 @@ the loading of all the models of Stanford CoreNLP. ## Configuration -The CLI commands and the Web service use the same [configuration file](https://github.com/jplu/stanfordNLPRESTAPI/blob/develop/conf/config.yaml). +The CLI commands and the Web service use the same [configuration file](https://github.com/jplu/stanfordNLPRESTAPI/blob/master/conf/config.yaml). ## Used Models @@ -197,7 +197,7 @@ will have to include them in the CLASSPATH. We provide two models: # How to contribute -In case you want to contribute, please read the [CONTRIBUTING](https://github.com/jplu/stanfordNLPRESTAPI/blob/develop/CONTRIBUTING.md) file. +In case you want to contribute, please read the [CONTRIBUTING](https://github.com/jplu/stanfordNLPRESTAPI/blob/master/CONTRIBUTING.md) file. # Opening an issue From acaf4d7c146edcdbf69b238dd4c8b6f224a725ac Mon Sep 17 00:00:00 2001 From: Julien Plu Date: Fri, 28 Oct 2016 11:14:18 +0200 Subject: [PATCH 7/7] updating poms for branch'release/2.0.1' with non-snapshot versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 47c888c..cad48d8 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ fr.eurecom stanfordNLPRESTAPI StanfordNLPRESTAPI - 2.0.1-SNAPSHOT + 2.0.1 UTF-8