a187b1d | lopez | 05 November 2017, 20:23:42 UTC | not far from the end of migrating web service documentation to readthedocs Former-commit-id: 30641ad6e0f8795c516e8b5a774785d660f7d707 | 05 November 2017, 20:23:42 UTC |
c33234c | lopez | 05 November 2017, 02:50:52 UTC | again continue migrating web service documentation to readthedocs Former-commit-id: fd1406020fd445495f5ddce87852eabb7c2058e1 | 05 November 2017, 02:50:52 UTC |
88af0e2 | lopez | 04 November 2017, 22:31:32 UTC | still continue migrating web service documentation to readthedocs Former-commit-id: 348eeb15e28bb45aa62438338c8c7c77a0ddbc5d | 04 November 2017, 22:31:32 UTC |
e57538f | lopez | 04 November 2017, 20:40:13 UTC | continue migrating web service documentation to readthedocs Former-commit-id: 4b3c5084ab3496dc46537dea8650914954b68dc2 | 04 November 2017, 20:40:13 UTC |
e879bb0 | lopez | 04 November 2017, 20:18:12 UTC | start migrating web service documentation to readthedocs Former-commit-id: a21e1e438796212daf9ab4a0d2fadaf5ff9d4487 | 04 November 2017, 20:18:12 UTC |
b782b89 | lopez | 04 November 2017, 14:22:30 UTC | Avoid java.lang.ClassNotFoundException: org.w3c.dom.ElementTraversal in grobid-trainer tasks too, similarly as for grobid-core Former-commit-id: 722116f88d010d0731e723c629f694c70960b877 | 04 November 2017, 14:22:30 UTC |
b1e0c56 | lopez | 04 November 2017, 12:26:20 UTC | another addition of /api/ service prefix Former-commit-id: ce25097a8a948807b705781d05acd8f6e6078a6c | 04 November 2017, 12:26:20 UTC |
76b5e27 | Luca Foppiano | 04 November 2017, 12:09:04 UTC | updating documentation, correcting path prefix Former-commit-id: 0c47592bf9233293bb667c7354dd8d993ff7e4d2 | 04 November 2017, 12:09:04 UTC |
837f401 | lopez | 04 November 2017, 00:01:03 UTC | update console image Former-commit-id: 16adbdad267492660b97d3f5f10bf969dadb63a8 | 04 November 2017, 00:01:03 UTC |
252a1e5 | lopez | 03 November 2017, 23:44:14 UTC | make service readme consistent with the documentation Former-commit-id: 6b076571eecc93ddcc2d7efa2131969022fc7876 | 03 November 2017, 23:44:14 UTC |
3081daa | lopez | 03 November 2017, 23:37:34 UTC | Cleaning all the maven-ant plugin remains Former-commit-id: e51be9eea8cbc00418bc41bf24d7a801e1049ad0 | 03 November 2017, 23:37:34 UTC |
69f4926 | lopez | 03 November 2017, 23:22:01 UTC | update paths in the documentation examples Former-commit-id: b626f60f6508cc4e5dbe3dcec7f7b57ad37b3f86 | 03 November 2017, 23:22:01 UTC |
75ccdf8 | lopez | 03 November 2017, 23:15:44 UTC | more documentation updates Former-commit-id: 2900b47d9f30e04e111b73bc17e43ee32c6c01a4 | 03 November 2017, 23:15:44 UTC |
445371e | lopez | 03 November 2017, 22:31:03 UTC | Updating main built jar path for batch commands Former-commit-id: e5f6c823c282d9e9053399799e8abd359dc150dd | 03 November 2017, 22:31:03 UTC |
abb96c1 | lopez | 03 November 2017, 22:21:13 UTC | Updating documentation for gradle commands Former-commit-id: beb36a22d3b84d035d79572d4b30e65ea5c59891 | 03 November 2017, 22:21:13 UTC |
0a2561f | lopez | 03 November 2017, 21:59:32 UTC | Update documentation after some tests Former-commit-id: f18e5361c137786566647ab5be11d086fcbee9a2 | 03 November 2017, 21:59:32 UTC |
26b79c1 | Luca Foppiano | 24 October 2017, 16:26:12 UTC | first update of the updating documentation Former-commit-id: 1f055d12e768e2ff06cf66755c77e5ef76070bf6 | 24 October 2017, 16:26:12 UTC |
bcdce5c | Luca Foppiano | 24 October 2017, 15:42:18 UTC | add gradle wrapper directory to .gitignore Former-commit-id: 46492d3d7c58bf5e007b42fd53dcc96e14918948 | 24 October 2017, 15:42:18 UTC |
e534a22 | Vyacheslav Zholudev | 20 October 2017, 10:31:44 UTC | changing grobid-service docs and add "doc" folder to the distribution Former-commit-id: 42539fe30bb05eab169a4428c173b6bc4bbd0ee1 | 20 October 2017, 10:31:44 UTC |
444b95f | Luca Foppiano | 20 October 2017, 09:16:18 UTC | Merge remote-tracking branch 'origin/master' into dropwizard-service Former-commit-id: 5f356afe5c873ebfce649f2462ef85a103a82ab0 | 20 October 2017, 09:16:18 UTC |
4550667 | Luca Foppiano | 19 October 2017, 20:33:06 UTC | Merge branch 'master' into dropwizard-service Former-commit-id: 3035b0dbc1583a62ae6bfe8dadb316655d7415e0 | 19 October 2017, 20:33:06 UTC |
0334269 | Luca Foppiano | 19 October 2017, 19:51:26 UTC | let the exception go up so that the exception handler will take care of it Former-commit-id: 62bf15a6323108805c1be4abe3ec00adeb06e388 | 19 October 2017, 20:21:02 UTC |
245c489 | Luca Foppiano | 19 October 2017, 19:35:18 UTC | fixed grobid service mapper Former-commit-id: 6634e6692a28a5a74ee1376350d6a81473a644d6 | 19 October 2017, 20:21:02 UTC |
f027738 | Luca Foppiano | 19 October 2017, 19:34:17 UTC | Fixed correct status code when the patent file is not of the correct format Former-commit-id: d4fea359cf241c52724d215dfdaa9329f4dce7d0 | 19 October 2017, 20:21:02 UTC |
8620626 | Luca Foppiano | 19 October 2017, 19:15:08 UTC | Correcting wrong if, fixed message when the module directory doesn't exists Former-commit-id: 7a6ade9467d6e62df6ad8013bf01c2a90c18caeb | 19 October 2017, 20:21:02 UTC |
a1691c1 | Luca Foppiano | 28 September 2017, 12:25:10 UTC | updating jackson to version 2.9.1 Former-commit-id: 8a4ce70865d92ca0407996a7772b924958c3a69a | 19 October 2017, 20:21:02 UTC |
03ca664 | lopez | 17 October 2017, 10:55:54 UTC | Review segementation features and update segementation model Former-commit-id: 99961566e82af6114e0d21d58a961a9b6921c9d0 | 17 October 2017, 10:55:54 UTC |
09daabc | lopez | 16 October 2017, 16:11:15 UTC | Merge branch Former-commit-id: 9d4f4415006c03a77bb05f76a7f6512ab8669326 | 16 October 2017, 16:11:15 UTC |
fd53d53 | lopez | 16 October 2017, 16:08:19 UTC | Update some doc Former-commit-id: 1b79eea57a6d0f6871866572b1c8621d43e29ed6 | 16 October 2017, 16:08:19 UTC |
5d939de | Vyacheslav Zholudev | 16 October 2017, 14:34:10 UTC | - disable default grobid-core jar - cosmetic Former-commit-id: 7e5166453c241d09202611c56f9a7da513a368d2 | 16 October 2017, 14:34:10 UTC |
601c7f2 | Vyacheslav Zholudev | 13 October 2017, 18:26:08 UTC | - getting best parts from PR https://github.com/kermitt2/grobid/pull/246/files - properly relocating lucene (including service files) Former-commit-id: a0e965ac0d684644475923fa42402ebb1a84d501 | 13 October 2017, 18:26:08 UTC |
12ffedd | Luca Foppiano | 13 October 2017, 15:00:54 UTC | update documentation Former-commit-id: c2b8941aeb0e3d98490481596252524cbe449ba0 | 13 October 2017, 15:09:32 UTC |
68b0a15 | lopez | 07 October 2017, 00:58:54 UTC | Moving to development version 0.5.0-SNAPSHOT Former-commit-id: ba578f7561def1124c2992db150e14e4494340f9 | 07 October 2017, 00:58:54 UTC |
89c0833 | lopez | 06 October 2017, 04:42:58 UTC | Last doc update before new release Former-commit-id: 6e44738327a5a7124b37ac9dc8b7bdd3e709f029 | 06 October 2017, 04:42:58 UTC |
3f33389 | lopez | 04 October 2017, 06:17:06 UTC | convenience method Former-commit-id: 1e9dabd47e5ea645a6a37b4ee9afbe0d0d3fd5b8 | 04 October 2017, 06:17:06 UTC |
f938bb0 | Luca Foppiano | 28 September 2017, 11:27:18 UTC | Adding out directory to .gitignore Former-commit-id: b0f33a6ff2dcd101612203fffe9471ed788fdb53 | 28 September 2017, 11:27:18 UTC |
b1ee94e | Vyacheslav Zholudev | 26 September 2017, 16:16:00 UTC | adding evaluation tasks for grobid-trainer Former-commit-id: cb313da72447c00b80ca003f79ca2c63a13f29fa | 26 September 2017, 16:16:00 UTC |
5e0f1c1 | Vyacheslav Zholudev | 26 September 2017, 15:59:29 UTC | adding training tasks into "modelTraining" gradle task group Former-commit-id: 7b4fa8774880e31e9afafd443408b9076babb91b | 26 September 2017, 15:59:29 UTC |
717381a | Vyacheslav Zholudev | 26 September 2017, 15:33:28 UTC | all in one jar for grobid-core Former-commit-id: a8fdce963e821400f4dd8dbda40093a0c1eecf21 | 26 September 2017, 15:33:28 UTC |
83fb55e | Vyacheslav Zholudev | 26 September 2017, 13:34:30 UTC | sudo: true for travis to have more memory for the build Former-commit-id: 7ea34d2d68b61e0af808a8cbbeb7d9b1572845c0 | 26 September 2017, 13:34:30 UTC |
26986eb | Vyacheslav Zholudev | 26 September 2017, 13:28:37 UTC | bintray setup - depends on release Former-commit-id: e28c612a26eee679babdede7b215c1425490b0f0 | 26 September 2017, 13:28:37 UTC |
cbfa95b | Vyacheslav Zholudev | 26 September 2017, 12:41:25 UTC | bintray setup Former-commit-id: 68ad7c2a66597a2434a5d8942286516cd32425d6 | 26 September 2017, 12:41:25 UTC |
e78481b | Vyacheslav Zholudev | 25 September 2017, 16:25:14 UTC | test for the citation parsing from text block with multiple citations Former-commit-id: 2dcda3e69a0fe6eeb47a10e366cf86ed3ad294f4 | 25 September 2017, 16:25:14 UTC |
9175c02 | Vyacheslav Zholudev | 25 September 2017, 14:38:27 UTC | removing old code Former-commit-id: b7dbadb8a2e63590ebdcf69e1d34d0db143e7529 | 25 September 2017, 14:38:27 UTC |
63d2b77 | Vyacheslav Zholudev | 25 September 2017, 14:35:32 UTC | gradle opts Former-commit-id: e209645e3ada48616114548ec05b445a045f38c0 | 25 September 2017, 14:35:32 UTC |
778af1f | Vyacheslav Zholudev | 25 September 2017, 14:32:41 UTC | global gradle opts Former-commit-id: 7187e4ddd0a175e76de23a41f96975ed9562aa02 | 25 September 2017, 14:32:41 UTC |
3ce08f9 | Vyacheslav Zholudev | 25 September 2017, 14:24:34 UTC | gradle opts updating coveralls version Former-commit-id: 428b516ec08eaf13fa7e406e4d34081ea5612055 | 25 September 2017, 14:24:34 UTC |
d5c76ba | Vyacheslav Zholudev | 25 September 2017, 14:13:09 UTC | jacoco build path Former-commit-id: c2ccfef78d623b0bc3eb7c39dde641c371540553 | 25 September 2017, 14:13:09 UTC |
bd7defa | Vyacheslav Zholudev | 25 September 2017, 14:06:25 UTC | trying to fix jacoco Former-commit-id: fea2c80e41cc7f8f09da88ab8596d1c0d3fd5a35 | 25 September 2017, 14:06:25 UTC |
4dd50b7 | Vyacheslav Zholudev | 25 September 2017, 13:55:32 UTC | cosmetic Former-commit-id: 42d0516fc861102488671e076a7615a723525a7d | 25 September 2017, 13:55:32 UTC |
2241f08 | Vyacheslav Zholudev | 25 September 2017, 13:48:11 UTC | base plugin Former-commit-id: e982100a49cee537378e5c7214d4002ed84222b9 | 25 September 2017, 13:48:11 UTC |
56f1081 | Vyacheslav Zholudev | 25 September 2017, 13:47:28 UTC | trying to optimizae memory in tests - reusing engine - closing engine after usage - less memory to gradle tests Xmx Former-commit-id: 37fd1d671b4f660cfbd077ff423fd26d1ae0570d | 25 September 2017, 13:47:28 UTC |
b6f7b93 | Vyacheslav Zholudev | 25 September 2017, 13:19:43 UTC | dependencien on jacoco report Former-commit-id: 44407ec24c6b283b6b68b5894c708d43337a78fc | 25 September 2017, 13:19:43 UTC |
d4e08ce | Vyacheslav Zholudev | 25 September 2017, 13:17:43 UTC | cosmetic Former-commit-id: 928db123cef6ac5ed90ce8f4b66da998f3cd3b2a | 25 September 2017, 13:17:43 UTC |
bbac30a | Vyacheslav Zholudev | 25 September 2017, 12:55:54 UTC | sudo true for travis Former-commit-id: 2c19f47bc5756d6fe681e7913d327d460c326e82 | 25 September 2017, 12:55:54 UTC |
7418864 | Vyacheslav Zholudev | 25 September 2017, 12:50:56 UTC | coveralls + jacoco Former-commit-id: b5a133154e0f0ddb17037081dc2587dc8ee36a92 | 25 September 2017, 12:50:56 UTC |
28575e8 | Vyacheslav Zholudev | 25 September 2017, 12:41:26 UTC | coveralls + jacoco Former-commit-id: b3b610eaa002580e671cd29e236da1fb1c197e47 | 25 September 2017, 12:41:26 UTC |
27d2c02 | Vyacheslav Zholudev | 25 September 2017, 10:11:22 UTC | remove caching from travis (seems to be useless) Former-commit-id: 6fd234fe7f7c4395a906250cd4bb0143abaef1f8 | 25 September 2017, 10:11:22 UTC |
ce52dbe | Vyacheslav Zholudev | 25 September 2017, 10:02:33 UTC | cosmetic change to provoke a build Former-commit-id: bcaa73d208f387a29ac796398332ab84f6009d9e | 25 September 2017, 10:02:33 UTC |
3be82f1 | Vyacheslav Zholudev | 25 September 2017, 09:53:13 UTC | cosmetic change to provoke a build Former-commit-id: 0977490cc68d9e6c6481e4892ca50868fd3ce373 | 25 September 2017, 09:53:13 UTC |
13d2bc7 | Vyacheslav Zholudev | 25 September 2017, 09:47:34 UTC | cosmetic: cleaning up gradle script Former-commit-id: 638297490016ebdecbf248abb85fa5c043287337 | 25 September 2017, 09:47:34 UTC |
8bfea3c | Vyacheslav Zholudev | 25 September 2017, 09:33:57 UTC | disable gradle daemon for the build Former-commit-id: f856e38327aed4b0afbfbc344d42c29c092c19c1 | 25 September 2017, 09:33:57 UTC |
392b2e0 | Vyacheslav Zholudev | 25 September 2017, 09:31:07 UTC | - avoid model reopening to save some time - caching gradle dependencies to save some time Former-commit-id: b2b53cefa4d57f489b450fb1f1d6dcd0abb4e513 | 25 September 2017, 09:31:07 UTC |
ab36e16 | Vyacheslav Zholudev | 25 September 2017, 09:23:30 UTC | - testing less XMX memory (more memory for Wapiti native stuff) - disabling extra step when build fails (usually --stracktrace flag won't help us) Former-commit-id: 6f6c0bde3487c61d28a7b3ffc162deb46ce491a9 | 25 September 2017, 09:23:30 UTC |
9172c17 | Vyacheslav Zholudev | 25 September 2017, 09:03:27 UTC | increasing memory for UT Former-commit-id: c3d498d94d11f313d381ef833a1d444b817b6717 | 25 September 2017, 09:03:27 UTC |
a01dc06 | Vyacheslav Zholudev | 25 September 2017, 08:53:35 UTC | forking every test Former-commit-id: 64435fce9f06b3fe810348efbd6f115388812b21 | 25 September 2017, 08:53:54 UTC |
f585233 | Luca Foppiano | 25 September 2017, 08:45:11 UTC | rollback build done on trusty and with container Former-commit-id: ccf0e07895dab4526122233dd949caa12f9347fa | 25 September 2017, 08:45:11 UTC |
952599b | Luca Foppiano | 23 September 2017, 18:32:49 UTC | disabling jacoco Former-commit-id: bf9d6d1aded7b271d96fb24320b039f816d9adde | 23 September 2017, 18:32:49 UTC |
9142382 | Luca Foppiano | 23 September 2017, 15:37:38 UTC | disabling the coverage Former-commit-id: b48dd88f5519ad0cf89fd84e51f76e2905d39b35 | 23 September 2017, 15:37:38 UTC |
97026c1 | Luca Foppiano | 23 September 2017, 15:23:17 UTC | try using ubuntu trusty and reduce the parallel fork of tests to 1 Former-commit-id: ce2979f68714e121c14f99207013452c78e1d95a | 23 September 2017, 15:23:17 UTC |
0419af7 | Luca Foppiano | 23 September 2017, 13:08:32 UTC | get all information if the build fails Former-commit-id: 0fa25a43d86e0ce383252f3cb7f5164cf38c5ea5 | 23 September 2017, 13:08:32 UTC |
753c9de | Luca Foppiano | 23 September 2017, 11:28:20 UTC | rewrite test case - updating slf4j version Former-commit-id: 0fb00a80af3daa462418d8c0f8b88fae42694d8a | 23 September 2017, 11:28:20 UTC |
2f4b4d9 | Luca Foppiano | 23 September 2017, 11:02:22 UTC | disabling coveralls Former-commit-id: 150db6d75c8944815f8da469a807b44520b85bb6 | 23 September 2017, 11:02:22 UTC |
7d1ccb9 | Vyacheslav Zholudev | 23 September 2017, 10:58:34 UTC | updating version to 0.5.0-SNAPSHOT Former-commit-id: 28dc50915184eba6bb49c5479f54c6bbcff3b258 | 23 September 2017, 10:58:34 UTC |
e9b822c | Vyacheslav Zholudev | 23 September 2017, 10:55:52 UTC | sorting out things with logging Former-commit-id: 898894c1c2f9f181b2d883653c39b5e5db88a749 | 23 September 2017, 10:56:02 UTC |
8b3a5f0 | Luca Foppiano | 22 September 2017, 20:48:37 UTC | trying with jacoco Former-commit-id: 233678369779ab5c0e549b775979753866fdbc44 | 22 September 2017, 20:48:37 UTC |
42d3bc6 | Luca Foppiano | 22 September 2017, 20:12:10 UTC | cobertura give us all the info! Former-commit-id: 4ad0e1575660a98cff303e272f3ca85a837301a2 | 22 September 2017, 20:12:10 UTC |
b500168 | Vyacheslav Zholudev | 22 September 2017, 15:43:53 UTC | introducing local libs instead of local maven, flattening those libs into grobid-core.jar Former-commit-id: 421e6706cd2dc4f842e9f999de52398c227e0456 | 22 September 2017, 15:43:53 UTC |
a221c05 | Vyacheslav Zholudev | 22 September 2017, 15:09:30 UTC | adding uploadArchives Former-commit-id: 25ea83b1616a75e45f8d83ef36efaad02322830b | 22 September 2017, 15:09:42 UTC |
bc8380d | Luca Foppiano | 22 September 2017, 15:07:02 UTC | get stacktrace in case of failure Former-commit-id: 5b10856030c682e4dda1bbee654f9413d93aee2b | 22 September 2017, 15:07:02 UTC |
1a5de0a | Luca Foppiano | 22 September 2017, 14:58:24 UTC | re-enabling coveralls, fixing version Former-commit-id: 2b0b60cb472a0210b8ba278aa61ce3bb3a2efe90 | 22 September 2017, 14:58:24 UTC |
18abe8c | Luca Foppiano | 22 September 2017, 14:45:57 UTC | Switching to version 3.5 of gradle Former-commit-id: c4bb5e3d2031560b6c9659f19816f70dafc0506e | 22 September 2017, 14:45:57 UTC |
ac548dd | Luca Foppiano | 22 September 2017, 13:25:46 UTC | trying another engine for generating coverage Former-commit-id: dfc501b306ca32595438fea5e2f65b543cbabd97 | 22 September 2017, 13:25:46 UTC |
60db033 | Luca Foppiano | 22 September 2017, 13:14:06 UTC | adding command after failure Former-commit-id: aa3c9d4468a606ec88e350f558230c6d7f39f477 | 22 September 2017, 13:14:06 UTC |
528473d | Luca Foppiano | 22 September 2017, 13:08:32 UTC | showing stacktrace when uploading code coverage results (debugging travis) Former-commit-id: 6c5fb8e992f195e43c7964926475dfa202157de5 | 22 September 2017, 13:08:32 UTC |
505a8e4 | Luca Foppiano | 22 September 2017, 12:43:02 UTC | Matching official grobid version Former-commit-id: 94bd0c8a7ac007ef9a3640487467c5b3b2c074ae | 22 September 2017, 12:43:02 UTC |
a37f0dc | Luca Foppiano | 22 September 2017, 12:17:51 UTC | Adding gradle wrapper Former-commit-id: f6a1e7480f34b35ed378be53129e8312a4ef6ef3 | 22 September 2017, 12:18:29 UTC |
83f2fcd | Luca Foppiano | 22 September 2017, 10:32:21 UTC | Fixing cobertura coveralls (hopefully!) Former-commit-id: fc377651a4ece655ff02bf0d0910460dc7d8544d | 22 September 2017, 10:32:21 UTC |
be559c8 | Vyacheslav Zholudev | 22 September 2017, 10:12:35 UTC | cobertura and coveralls plugins Former-commit-id: 1f393d3222b8908b0f0a04ef9471b1f077e5bcbd | 22 September 2017, 10:12:35 UTC |
66d14e1 | Luca Foppiano | 22 September 2017, 10:04:25 UTC | Adding gradle build Former-commit-id: 7c3cfa7c08aff58782d4bd8829ee401ebfb6e07a | 22 September 2017, 10:04:25 UTC |
2bc4196 | Vyacheslav Zholudev | 22 September 2017, 09:57:04 UTC | jars with sources Former-commit-id: 1dd1c90be9b8a624b0c9ee70f686488c7ba008d5 | 22 September 2017, 09:57:04 UTC |
bc20dc0 | Vyacheslav Zholudev | 22 September 2017, 09:42:57 UTC | adding grobid home to artifacts Former-commit-id: c74edbec283fc6c76bf42e3ed00170abd49f3434 | 22 September 2017, 09:42:57 UTC |
3aa12c3 | Vyacheslav Zholudev | 22 September 2017, 09:21:10 UTC | packaging grobid home Former-commit-id: 53af88685fae1f402304565637008f538a57369e | 22 September 2017, 09:21:10 UTC |
b72f94c | Vyacheslav Zholudev | 22 September 2017, 09:10:29 UTC | application plugin for grobid service Former-commit-id: 4086df5d3ee7249d21e0f870d7c8696846a8b77c | 22 September 2017, 09:10:29 UTC |
a5398f8 | Luca Foppiano | 22 September 2017, 08:50:38 UTC | Adding possibility to generate GrobidProperties instance using a customised grobidHomeFinder Former-commit-id: f28502555f52e55d08be18228b4a7ad7da2b4665 | 22 September 2017, 08:50:38 UTC |
85d360f | Luca Foppiano | 22 September 2017, 06:56:04 UTC | Minor cosmetic cleanup, removing hardcoded path in favour of streams resources Former-commit-id: 187d09f4fad54e239e36837b64bb6bc7ff119a2c | 22 September 2017, 06:56:04 UTC |
a2f4f2f | Vyacheslav Zholudev | 21 September 2017, 16:20:26 UTC | gradle support Former-commit-id: d4d4b7c99bf1834b6f33260b470b5452f3d0299c | 21 September 2017, 16:20:26 UTC |
2a7952d | Luca Foppiano | 20 September 2017, 20:49:17 UTC | Merge branch 'master' into dropwizard-service # Conflicts: # doc/Grobid-batch.md # doc/training/fulltext.md # grobid-core/pom.xml # grobid-core/src/main/resources/log4j.xml # grobid-core/src/test/java/org/grobid/core/engines/EngineTest.java # grobid-core/src/test/java/org/grobid/core/lexicon/FastMatcherTest.java # grobid-core/src/test/java/org/grobid/core/lexicon/LexiconIntegrationTest.java # grobid-service/src/main/java/org/grobid/service/GrobidRestService.java # grobid-service/src/main/java/org/grobid/service/process/GrobidRestProcessFiles.java # grobid-service/src/main/java/org/grobid/service/process/GrobidRestProcessGeneric.java # grobid-service/src/main/java/org/grobid/service/process/GrobidRestProcessString.java # grobid-service/src/main/resources/log4j-jetty.properties # grobid-trainer/src/main/java/org/grobid/trainer/NameCitationTrainer.java # pom.xml Former-commit-id: e594e2e527be09a19ef0ac069e21b83d43c5161e | 20 September 2017, 21:06:47 UTC |
14f3d45 | Luca Foppiano | 20 September 2017, 07:27:02 UTC | putting back the slf4j/log4j implementation with scope runtime Former-commit-id: 815167bb682ee6052bdd141e4aa884cebbb6897d | 20 September 2017, 07:27:02 UTC |
79211a2 | Luca Foppiano | 19 September 2017, 15:52:44 UTC | ignoring tests depending on an external service Former-commit-id: f71015f8b4672f1756340ec41898feb414195885 | 19 September 2017, 17:03:32 UTC |