This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository bow. See http://git.chorem.org/bow.git commit 4cbfb21f7a306edb7169fe3cfb65b08eb9a128b0 Author: Maven Release <maven-release@codelutin.com> Date: Mon Jul 20 19:42:23 2015 +0200 fixes dependancy and license problem --- bow-ui/src/license/THIRD-PARTY.properties | 6 ++++-- bow-ui/src/main/java/org/chorem/bow/BowUtils.java | 2 +- pom.xml | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/bow-ui/src/license/THIRD-PARTY.properties b/bow-ui/src/license/THIRD-PARTY.properties index a6c13e1..03beb06 100644 --- a/bow-ui/src/license/THIRD-PARTY.properties +++ b/bow-ui/src/license/THIRD-PARTY.properties @@ -3,6 +3,7 @@ # Already used licenses in project : # - Apache 2 # - Apache License +# - Apache License 2.0 # - Apache Software License, version 1.1 # - BSD License # - BSD style @@ -25,13 +26,13 @@ # - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. # - The Apache Software License, Version 1.1 # - The Apache Software License, Version 2.0 -# - The H2 License, Version 1.0 # - The MIT License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Nov 20 18:34:08 UTC 2014 +#Mon Jul 20 19:30:15 CEST 2015 +com.h2database--h2--1.4.187=MPL 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. gnu.cajo--cajo--1.168=Lesser General Public License (LPGL) @@ -40,5 +41,6 @@ javax.servlet--jstl--1.2=Common Development and Distribution License (CDDL) v1.0 javax.servlet--servlet-api--2.5=Common Development and Distribution License (CDDL) v1.0 javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) v1.0 org.apache.zookeeper--zookeeper--3.4.5=The Apache Software License, Version 2.0 +org.jacorb--jacorb--2.3.1.jbossorg-1=Lesser General Public License (LPGL) oro--oro--2.0.8=The Apache Software License, Version 2.0 xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License, vesion 1.1.1 diff --git a/bow-ui/src/main/java/org/chorem/bow/BowUtils.java b/bow-ui/src/main/java/org/chorem/bow/BowUtils.java index b4794eb..172d18a 100644 --- a/bow-ui/src/main/java/org/chorem/bow/BowUtils.java +++ b/bow-ui/src/main/java/org/chorem/bow/BowUtils.java @@ -32,7 +32,7 @@ import java.util.List; import java.util.Set; import java.util.UUID; import org.apache.commons.codec.binary.Base64; -import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections.CollectionUtils; import org.nuiton.wikitty.query.WikittyQuery; import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.services.WikittyServiceAuthorisation; diff --git a/pom.xml b/pom.xml index 09188d6..12c846c 100644 --- a/pom.xml +++ b/pom.xml @@ -248,6 +248,7 @@ <groupId>com.jgeppert.struts2.jquery</groupId> <artifactId>struts2-jquery-plugin</artifactId> <version>${struts2jqueryVersion}</version> + <scope>runtime</scope> </dependency> <dependency> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.