branch develop updated (b40716a -> 814a202)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository vradi. See http://git.chorem.org/vradi.git from b40716a fixes #1132: Migrates to git (fix not in central dependencies) new 814a202 Fix build and dependencies 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 814a20267535be9c17eac7d5a22e0543a80bf48b Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Feb 25 13:27:42 2016 +0100 Fix build and dependencies Summary of changes: .gitignore | 5 +++++ LICENSE.txt | 2 +- pom.xml | 24 +++++++++++++++++++--- vradi-entities/LICENSE.txt | 2 +- vradi-services-web/LICENSE.txt | 2 +- vradi-services-web/pom.xml | 5 +++++ .../src/license/THIRD-PARTY.properties | 17 ++++++--------- vradi-services/LICENSE.txt | 2 +- vradi-services/pom.xml | 6 +++--- vradi-swing/LICENSE.txt | 2 +- vradi-swing/src/license/THIRD-PARTY.properties | 20 +++++++----------- vradi-web/LICENSE.txt | 2 +- vradi-web/pom.xml | 22 ++++++++++++++------ vradi-web/src/license/THIRD-PARTY.properties | 16 ++++++--------- 14 files changed, 75 insertions(+), 52 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository vradi. See http://git.chorem.org/vradi.git commit 814a20267535be9c17eac7d5a22e0543a80bf48b Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Feb 25 13:27:42 2016 +0100 Fix build and dependencies --- .gitignore | 5 +++++ LICENSE.txt | 2 +- pom.xml | 24 +++++++++++++++++++--- vradi-entities/LICENSE.txt | 2 +- vradi-services-web/LICENSE.txt | 2 +- vradi-services-web/pom.xml | 5 +++++ .../src/license/THIRD-PARTY.properties | 17 ++++++--------- vradi-services/LICENSE.txt | 2 +- vradi-services/pom.xml | 6 +++--- vradi-swing/LICENSE.txt | 2 +- vradi-swing/src/license/THIRD-PARTY.properties | 20 +++++++----------- vradi-web/LICENSE.txt | 2 +- vradi-web/pom.xml | 22 ++++++++++++++------ vradi-web/src/license/THIRD-PARTY.properties | 16 ++++++--------- 14 files changed, 75 insertions(+), 52 deletions(-) diff --git a/.gitignore b/.gitignore index 233f4da..ee37be8 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,8 @@ target/* */*.iws */*.iml */.idea +.project +.settings +*/.project +*/.settings +*/.classpath diff --git a/LICENSE.txt b/LICENSE.txt index 2def0e8..dba13ed 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -658,4 +658,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. diff --git a/pom.xml b/pom.xml index 046ff62..185ff4d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>chorempom</artifactId> - <version>1.5</version> + <version>6</version> </parent> <groupId>org.chorem</groupId> @@ -318,6 +318,12 @@ <groupId>org.nuiton.wikitty</groupId> <artifactId>wikitty-solr</artifactId> <version>${wikittyVersion}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> @@ -407,14 +413,14 @@ <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-runner</artifactId> - <version>${jettyPluginVersion}</version> + <version>8.1.16.v20140903</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-webapp</artifactId> - <version>${jettyPluginVersion}</version> + <version>8.1.16.v20140903</version> <scope>provided</scope> </dependency> @@ -592,6 +598,18 @@ <artifactId>commons-logging</artifactId> <version>1.2</version> </dependency> + + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.3</version> + </dependency> + + <dependency> + <groupId>gnu.cajo</groupId> + <artifactId>cajo</artifactId> + <version>1.168</version> + </dependency> </dependencies> </dependencyManagement> diff --git a/vradi-entities/LICENSE.txt b/vradi-entities/LICENSE.txt index 2def0e8..dba13ed 100644 --- a/vradi-entities/LICENSE.txt +++ b/vradi-entities/LICENSE.txt @@ -658,4 +658,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. diff --git a/vradi-services-web/LICENSE.txt b/vradi-services-web/LICENSE.txt index 2def0e8..dba13ed 100644 --- a/vradi-services-web/LICENSE.txt +++ b/vradi-services-web/LICENSE.txt @@ -658,4 +658,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. diff --git a/vradi-services-web/pom.xml b/vradi-services-web/pom.xml index 6946ca7..b34a436 100644 --- a/vradi-services-web/pom.xml +++ b/vradi-services-web/pom.xml @@ -82,6 +82,11 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> + + <dependency> + <groupId>gnu.cajo</groupId> + <artifactId>cajo</artifactId> + </dependency> </dependencies> diff --git a/vradi-services-web/src/license/THIRD-PARTY.properties b/vradi-services-web/src/license/THIRD-PARTY.properties index 96f3130..5f40c11 100644 --- a/vradi-services-web/src/license/THIRD-PARTY.properties +++ b/vradi-services-web/src/license/THIRD-PARTY.properties @@ -1,24 +1,23 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache 2 # - Apache License # - Apache Software License - Version 2.0 -# - Apache Software License, Version 1.1 # - Apache Software License, Version 2.0 # - Apache Software License, version 1.1 # - BSD License # - BSD style # - CDDL -# - CDDL 1.0 # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - Eclipse Public License - Version 1.0 -# - Eclipse Public License v1.0 # - GNU Affero General Public License version 3 +# - GNU LESSER GENERAL PUBLIC LICENSE # - GNU Lesser General Public License, Version 3 # - GPLv2+CE +# - Indiana University Extreme! Lab Software License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - JDom license # - Java Transaction API (JTA) License # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) @@ -27,30 +26,26 @@ # - MIT License # - Mozilla Public License # - Mozilla Public License Version 1.0 +# - New BSD License # - Public Domain # - Public domain +# - Similar to Apache License but with the acknowledgment clause removed # - 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 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Aug 18 08:43:50 CEST 2011 -antlr--antlr--2.7.2=BSD License +#Thu Feb 25 12:29:08 CET 2016 commons-cli--commons-cli--1.2=Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=Apache Software License, Version 2.0 concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. -dom4j--dom4j--1.1=BSD License groovy--groovy-all--1.0-jsr-06=Apache Software License, Version 2.0 jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0 javax.servlet--servlet-api--2.5=License Agreement for Java(TM) Servlet API Specification Interface Classes javax.transaction--jta--1.1=Java Transaction API (JTA) License jboss--jnet--3.2.1=GNU Lesser General Public License, Version 3 org.apache.commons--commons-email--1.2=Apache Software License, Version 2.0 -org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0 -org.jdom--jdom--1.1=JDom license -oro--oro--2.0.8=The Apache Software License, Version 2.0 rome--rome--1.0=Apache Software License, Version 2.0 xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License diff --git a/vradi-services/LICENSE.txt b/vradi-services/LICENSE.txt index 2def0e8..dba13ed 100644 --- a/vradi-services/LICENSE.txt +++ b/vradi-services/LICENSE.txt @@ -658,4 +658,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. diff --git a/vradi-services/pom.xml b/vradi-services/pom.xml index 7b17760..8a84c62 100644 --- a/vradi-services/pom.xml +++ b/vradi-services/pom.xml @@ -166,10 +166,10 @@ <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> </dependency> - + <dependency> - <groupId>com.caucho</groupId> - <artifactId>hessian</artifactId> + <groupId>gnu.cajo</groupId> + <artifactId>cajo</artifactId> </dependency> </dependencies> diff --git a/vradi-swing/LICENSE.txt b/vradi-swing/LICENSE.txt index 2def0e8..dba13ed 100644 --- a/vradi-swing/LICENSE.txt +++ b/vradi-swing/LICENSE.txt @@ -658,4 +658,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. diff --git a/vradi-swing/src/license/THIRD-PARTY.properties b/vradi-swing/src/license/THIRD-PARTY.properties index 7bdd4b1..9d23a74 100644 --- a/vradi-swing/src/license/THIRD-PARTY.properties +++ b/vradi-swing/src/license/THIRD-PARTY.properties @@ -1,20 +1,23 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache 2 # - Apache License # - Apache Software License - Version 2.0 -# - Apache Software License, Version 1.1 # - Apache Software License, version 1.1 # - BSD / Apache # - BSD License # - BSD style # - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 # - Eclipse Public License - Version 1.0 # - GNU Affero General Public License version 3 +# - GNU LESSER GENERAL PUBLIC LICENSE # - GNU Lesser General Public License, Version 3 # - GPLv2+CE +# - Indiana University Extreme! Lab Software License # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 @@ -24,36 +27,27 @@ # - MPL 1.1 # - Mozilla Public License # - Mozilla Public License Version 1.0 +# - New BSD License # - Public Domain # - Public domain +# - Similar to Apache License but with the acknowledgment clause removed # - 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 -# - http://asm.ow2.org/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Aug 18 08:55:35 CEST 2011 -antlr--antlr--2.7.2=BSD License -asm--asm--3.1=http\://asm.ow2.org/license.html -asm--asm-commons--3.1=http\://asm.ow2.org/license.html -asm--asm-tree--3.1=http\://asm.ow2.org/license.html +#Thu Feb 25 13:00:17 CET 2016 commons-cli--commons-cli--1.2=Apache License, Version 2.0 -commons-codec--commons-codec--1.2=Apache License, Version 2.0 commons-jxpath--commons-jxpath--1.3=Apache License, Version 2.0 commons-primitives--commons-primitives--1.0=Apache License, Version 2.0 concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. -dom4j--dom4j--1.1=BSD License groovy--groovy-all--1.0-jsr-06=BSD / Apache jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.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 jboss--jnet--3.2.1=GNU LESSER GENERAL PUBLIC LICENSE org.apache.commons--commons-email--1.2=Apache License, Version 2.0 -org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0 -org.jdom--jdom--1.1=Apache License -oro--oro--2.0.8=The Apache Software License, Version 2.0 rome--rome--1.0=Apache Software License - Version 2.0 xpp3--xpp3_min--1.1.3.4.O=Indiana University Extreme\! Lab Software License diff --git a/vradi-web/LICENSE.txt b/vradi-web/LICENSE.txt index 2def0e8..dba13ed 100644 --- a/vradi-web/LICENSE.txt +++ b/vradi-web/LICENSE.txt @@ -658,4 +658,4 @@ specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see -<http://www.gnu.org/licenses/>. \ No newline at end of file +<http://www.gnu.org/licenses/>. diff --git a/vradi-web/pom.xml b/vradi-web/pom.xml index 72a3ff4..8638784 100644 --- a/vradi-web/pom.xml +++ b/vradi-web/pom.xml @@ -86,6 +86,7 @@ <dependency> <groupId>org.nuiton.wikitty</groupId> <artifactId>wikitty-struts</artifactId> + <scope>runtime</scope> </dependency> <dependency> @@ -102,14 +103,17 @@ <dependency> <groupId>com.jgeppert.struts2.jquery</groupId> <artifactId>struts2-jquery-plugin</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>com.jgeppert.struts2.jquery</groupId> <artifactId>struts2-jquery-grid-plugin</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>com.jgeppert.struts2.jquery</groupId> <artifactId>struts2-jquery-richtext-plugin</artifactId> + <scope>runtime</scope> </dependency> <dependency> <groupId>com.jgeppert.struts2.jquery</groupId> @@ -118,6 +122,7 @@ <dependency> <groupId>com.jgeppert.struts2.jquery</groupId> <artifactId>struts2-jquery-mobile-plugin</artifactId> + <scope>runtime</scope> </dependency> <dependency> @@ -129,6 +134,7 @@ <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-json-plugin</artifactId> + <scope>runtime</scope> </dependency> <dependency> @@ -157,6 +163,16 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + </dependency> <dependency> <groupId>javax.mail</groupId> @@ -216,12 +232,6 @@ </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <scope>compile</scope> - </dependency> - - <dependency> <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> </dependency> diff --git a/vradi-web/src/license/THIRD-PARTY.properties b/vradi-web/src/license/THIRD-PARTY.properties index 59510a0..38d0984 100644 --- a/vradi-web/src/license/THIRD-PARTY.properties +++ b/vradi-web/src/license/THIRD-PARTY.properties @@ -1,8 +1,8 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - Apache 2 # - Apache License -# - Apache Software License, Version 1.1 # - Apache Software License, Version 2.0 # - Apache Software License, version 1.1 # - BSD License @@ -10,12 +10,13 @@ # - BSD-style license # - CDDL # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 # - GNU Affero General Public License version 3 +# - GNU LESSER GENERAL PUBLIC LICENSE # - GNU Lesser General Public License, Version 3 # - GPLv2+CE # - Indiana University Extreme! Lab Software License, vesion 1.1.1 -# - JDom license # - JDom license (Apache-like) # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) @@ -25,23 +26,20 @@ # - Mozilla Public License # - Mozilla Public License Version 1.0 # - Mozilla Public License version 1.1 +# - New BSD License # - Public Domain # - Public domain +# - Similar to Apache License but with the acknowledgment clause removed # - 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 -# - http://asm.ow2.org/license.html # - http://source.icu-project.org/repos/icu/icu/trunk/license.html #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Aug 18 08:50:50 CEST 2011 -antlr--antlr--2.7.2=BSD License -asm--asm--3.1=http\://asm.ow2.org/license.html -asm--asm-commons--3.1=http\://asm.ow2.org/license.html -asm--asm-tree--3.1=http\://asm.ow2.org/license.html +#Thu Feb 25 12:29:16 CET 2016 com.ibm.icu--icu4j--2.6.1=http\://source.icu-project.org/repos/icu/icu/trunk/license.html commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 concurrent--concurrent--1.0=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. @@ -54,8 +52,6 @@ javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) V jaxen--jaxen--1.1.1=The Apache Software License, Version 2.0 jboss--jnet--3.2.1=GNU Lesser General Public License, Version 3 jdom--jdom--1.0=JDom license (Apache-like) -org.apache.zookeeper--zookeeper--3.3.1=The Apache Software License, Version 2.0 -org.jdom--jdom--1.1=JDom license oro--oro--2.0.8=The Apache Software License, Version 2.0 rome--rome--1.0=Apache Software License, Version 2.0 xerces--xercesImpl--2.6.2=The Apache Software License, Version 2.0 -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm