branch develop updated (3de0177 -> 8f84168)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository coselmar. See https://gitlab.nuiton.org/codelutin/coselmar.git from 3de0177 refs #9206 Fix indexation revert when failure on documents mass import new 8f84168 third party licenses and tika deps fix The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8f8416887c54852ac09259281cd1fa688e291937 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Jun 8 13:48:17 2017 +0200 third party licenses and tika deps fix Summary of changes: coselmar-rest/pom.xml | 2 +- coselmar-rest/src/license/THIRD-PARTY.properties | 61 +++++++++++++----------- pom.xml | 2 +- 3 files changed, 36 insertions(+), 29 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See https://gitlab.nuiton.org/codelutin/coselmar.git commit 8f8416887c54852ac09259281cd1fa688e291937 Author: Yannick Martel <martel@©odelutin.com> Date: Thu Jun 8 13:48:17 2017 +0200 third party licenses and tika deps fix --- coselmar-rest/pom.xml | 2 +- coselmar-rest/src/license/THIRD-PARTY.properties | 61 +++++++++++++----------- pom.xml | 2 +- 3 files changed, 36 insertions(+), 29 deletions(-) diff --git a/coselmar-rest/pom.xml b/coselmar-rest/pom.xml index 6cba769..f939eb8 100644 --- a/coselmar-rest/pom.xml +++ b/coselmar-rest/pom.xml @@ -168,7 +168,7 @@ <!-- Tika for document indexation --> <dependency> <groupId>org.apache.tika</groupId> - <artifactId>tika-parsers</artifactId> + <artifactId>tika-core</artifactId> </dependency> <!-- Others --> diff --git a/coselmar-rest/src/license/THIRD-PARTY.properties b/coselmar-rest/src/license/THIRD-PARTY.properties index 19dd806..ddf86be 100644 --- a/coselmar-rest/src/license/THIRD-PARTY.properties +++ b/coselmar-rest/src/license/THIRD-PARTY.properties @@ -1,62 +1,69 @@ -### -# #%L -# Coselmar :: Rest Services -# %% -# Copyright (C) 2014 - 2015 Ifremer, Code Lutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - (MIT-style) netCDF C library license # - AL 2.0 +# - ASL, version 2 # - Apache 2 # - Apache License # - Apache License 2.0 # - Apache License, version 2.0 # - Apache Software License - Version 2.0 +# - BSD 3-Clause License # - BSD License # - BSD licence # - BSD style # - Bouncy Castle Licence # - CDDL + GPLv2 with classpath exception -# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - CDDL 1.1 +# - CDDL, v1.0 +# - CDDL/GPLv2+CE # - Common Development and Distribution License -# - Common Public License Version 1.0 +# - Common Development and Distribution License (CDDL) v1.0 # - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License - Version 1.0 +# - Eclipse Public License 1.0 +# - Eclipse Public License v1.0 +# - Eclipse Public License, Version 1.0 # - GNU General Public License, Version 2 with the Classpath Exception +# - GNU Lesser General Public License, Version 2.1 +# - GNU Lesser Public License +# - GNU Library or Lesser General Public License +# - GPL2 w/ CPE # - General Public License (GPL) # - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - LGPL +# - LGPL 2.1 +# - LGPL, v2.1 or later +# - LGPL, version 2.1 # - Lesser General Public License (LGPL) v 3.0 -# - Lesser General Public License (LPGL) -# - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - MIT License (MIT) # - MPL 1.1 +# - MPL 2.0, and EPL 1.0 +# - Mozilla Public License 1.1 (MPL 1.1) # - New BSD License +# - New BSD license +# - OGC copyright # - Public Domain +# - Similar to Apache License but with the acknowledgment clause removed +# - Specification License # - The Apache Software License, Version 2.0 -# - The H2 License, Version 1.0 +# - The BSD License +# - The JSON License +# - The MIT License +# - The New BSD License +# - The PostgreSQL License +# - UnRar License # - WTFPL #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Nov 17 11:20:03 UTC 2014 +#Thu Jun 08 11:52:26 CEST 2017 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License +net.jcip--jcip-annotations--1.0=The Apache Software License, Version 2.0 org.antlr--antlr-runtime--3.3=BSD License +regexp--regexp--1.3= diff --git a/pom.xml b/pom.xml index d0d4fba..154caeb 100644 --- a/pom.xml +++ b/pom.xml @@ -331,7 +331,7 @@ <dependency> <groupId>org.apache.tika</groupId> - <artifactId>tika-parsers</artifactId> + <artifactId>tika-core</artifactId> <version>${tikaVersion}</version> <exclusions> <exclusion> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm