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 f432be61633b2612c35cb8792e3fd14103ddf660 Author: Yannick Martel <martel@©odelutin.com> Date: Wed May 24 14:14:57 2017 +0200 Exclusion de bcprov-jdk15on de la dépendance apache tika (conflit avec la version de webmotion?) --- coselmar-bundle/src/main/webapp/WEB-INF/web.xml | 2 +- pom.xml | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/coselmar-bundle/src/main/webapp/WEB-INF/web.xml b/coselmar-bundle/src/main/webapp/WEB-INF/web.xml index 19c9656..13af477 100644 --- a/coselmar-bundle/src/main/webapp/WEB-INF/web.xml +++ b/coselmar-bundle/src/main/webapp/WEB-INF/web.xml @@ -24,7 +24,7 @@ --> -<web-app version="3.0" id="pollen-ui-angular" +<web-app version="3.0" id="coselmar-ui-angular" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee diff --git a/pom.xml b/pom.xml index 631c240..8325459 100644 --- a/pom.xml +++ b/pom.xml @@ -333,6 +333,12 @@ <groupId>org.apache.tika</groupId> <artifactId>tika-parsers</artifactId> <version>${tikaVersion}</version> + <exclusions> + <exclusion> + <groupId>org.bouncycastle</groupId> + <artifactId>bcprov-jdk15on</artifactId> + </exclusion> + </exclusions> </dependency> <!-- Commons --> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.