This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See http://git.chorem.org/lima.git commit c99ab61456a8e2547fe715784a1ad6a6edc0caaf Author: Eric Chatellier <chatellier@codelutin.com> Date: Thu Feb 25 11:14:46 2016 +0100 Fix build --- .gitignore | 5 +++++ lima-business-api/.gitignore | 1 + .../chorem/lima/business/api/TreasuryService.java | 22 ++++++++++++++++++++++ lima-business/.gitignore | 1 + lima-business/pom.xml | 4 ++++ .../lima/business/ejb/TreasuryServiceImpl.java | 22 ++++++++++++++++++++++ .../ejb/report/AccountReportServiceImpl.java | 22 ++++++++++++++++++++++ .../business/ejb/report/CommonsDocumentReport.java | 22 ++++++++++++++++++++++ lima-callao/.gitignore | 1 + lima-report/.gitignore | 1 + lima-server/src/license/THIRD-PARTY.properties | 10 +++++----- lima-swing/.gitignore | 1 + lima-swing/pom.xml | 4 ++++ lima-swing/src/license/THIRD-PARTY.properties | 10 +++++----- .../chorem/lima/ui/accountViewer/PeriodChoice.java | 22 ++++++++++++++++++++++ .../lima/ui/accountViewer/SelectionMode.java | 22 ++++++++++++++++++++++ pom.xml | 5 +++++ 17 files changed, 165 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 5fb0960..30ed63b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,8 @@ target/* */*.iws */*.iml */.idea +.project +.settings +*/.project +*/.classpath +*/.settings diff --git a/lima-business-api/.gitignore b/lima-business-api/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/lima-business-api/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/api/TreasuryService.java b/lima-business-api/src/main/java/org/chorem/lima/business/api/TreasuryService.java index 4551d55..83d5ec2 100644 --- a/lima-business-api/src/main/java/org/chorem/lima/business/api/TreasuryService.java +++ b/lima-business-api/src/main/java/org/chorem/lima/business/api/TreasuryService.java @@ -1,5 +1,27 @@ package org.chorem.lima.business.api; +/* + * #%L + * Lima :: Business API + * %% + * Copyright (C) 2008 - 2016 CodeLutin + * %% + * 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% + */ + import org.chorem.lima.entity.Treasury; /** diff --git a/lima-business/.gitignore b/lima-business/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/lima-business/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/lima-business/pom.xml b/lima-business/pom.xml index 90da0c9..7429023 100644 --- a/lima-business/pom.xml +++ b/lima-business/pom.xml @@ -71,6 +71,10 @@ <artifactId>commons-io</artifactId> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> + <dependency> <groupId>org.apache.openejb</groupId> <artifactId>javaee-api</artifactId> <scope>compile</scope> diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/TreasuryServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/TreasuryServiceImpl.java index 3a7cf26..9b65f1d 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/TreasuryServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/TreasuryServiceImpl.java @@ -1,5 +1,27 @@ package org.chorem.lima.business.ejb; +/* + * #%L + * Lima :: Business + * %% + * Copyright (C) 2008 - 2016 CodeLutin + * %% + * 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% + */ + import com.google.common.base.Preconditions; import org.chorem.lima.business.api.TreasuryService; import org.chorem.lima.entity.Treasury; diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/AccountReportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/AccountReportServiceImpl.java index 14fced0..7611e71 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/AccountReportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/AccountReportServiceImpl.java @@ -1,5 +1,27 @@ package org.chorem.lima.business.ejb.report; +/* + * #%L + * Lima :: Business + * %% + * Copyright (C) 2008 - 2016 CodeLutin + * %% + * 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% + */ + import net.sf.jasperreports.engine.JasperReport; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/CommonsDocumentReport.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/CommonsDocumentReport.java index 3b17a97..4b4654a 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/report/CommonsDocumentReport.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/report/CommonsDocumentReport.java @@ -1,5 +1,27 @@ package org.chorem.lima.business.ejb.report; +/* + * #%L + * Lima :: Business + * %% + * Copyright (C) 2008 - 2016 CodeLutin + * %% + * 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% + */ + import net.sf.jasperreports.engine.JasperReport; import org.apache.commons.lang3.StringUtils; import org.chorem.lima.beans.DocumentReport; diff --git a/lima-callao/.gitignore b/lima-callao/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/lima-callao/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/lima-report/.gitignore b/lima-report/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/lima-report/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/lima-server/src/license/THIRD-PARTY.properties b/lima-server/src/license/THIRD-PARTY.properties index 6212a42..2024cc3 100644 --- a/lima-server/src/license/THIRD-PARTY.properties +++ b/lima-server/src/license/THIRD-PARTY.properties @@ -4,11 +4,9 @@ # - AL 2.0 # - Apache 2 # - Apache License 2.0 -# - Apache License, Version 2.0 # - Apache License, version 2.0 # - Apache Software License - Version 2.0 # - Apache Software License 2.0 -# - BSD # - BSD License # - CDDL + GPLv2 with classpath exception # - CDDL 1.1 @@ -23,14 +21,15 @@ # - GNU General Public Library # - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public Licence -# - GNU Lesser General Public License # - GNU Library or Lesser General Public License # - GPL2 w/ CPE # - General Public License (GPL) # - HSQLDB License, a BSD open source license -# - LGPL 2.1 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 # - Mozilla Public License Version 2.0 @@ -45,7 +44,7 @@ # Please fill the missing licenses for dependencies : # # -#Sun Jan 31 19:57:44 CET 2016 +#Thu Feb 25 11:08:50 CET 2016 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=jdomlicence jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0 @@ -53,6 +52,7 @@ org.codehaus.castor--castor-core--1.3.3=The Apache Software License, Version 2.0 org.codehaus.castor--castor-xml--1.3.3=The Apache Software License, Version 2.0 org.metatype.sxc--sxc-jaxb-core--0.8=CDDL 1.1 org.metatype.sxc--sxc-runtime--0.8=CDDL 1.1 +org.olap4j--olap4j--0.9.7.309-JS-3=Lesser General Public License (LPGL) org.springframework--spring-aop--3.0.6.RELEASE=The Apache Software License, Version 2.0 org.springframework--spring-asm--3.0.6.RELEASE=The Apache Software License, Version 2.0 org.springframework--spring-beans--3.0.6.RELEASE=The Apache Software License, Version 2.0 diff --git a/lima-swing/.gitignore b/lima-swing/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/lima-swing/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/lima-swing/pom.xml b/lima-swing/pom.xml index 8348eaf..10f78ee 100644 --- a/lima-swing/pom.xml +++ b/lima-swing/pom.xml @@ -151,6 +151,10 @@ <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> <!-- for remote mode only --> <dependency> diff --git a/lima-swing/src/license/THIRD-PARTY.properties b/lima-swing/src/license/THIRD-PARTY.properties index 8a5917b..fcad152 100644 --- a/lima-swing/src/license/THIRD-PARTY.properties +++ b/lima-swing/src/license/THIRD-PARTY.properties @@ -4,11 +4,9 @@ # - AL 2.0 # - Apache 2 # - Apache License 2.0 -# - Apache License, Version 2.0 # - Apache License, version 2.0 # - Apache Software License - Version 2.0 # - Apache Software License 2.0 -# - BSD # - BSD License # - CDDL # - CDDL + GPLv2 with classpath exception @@ -24,15 +22,16 @@ # - GNU General Public Library # - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public Licence -# - GNU Lesser General Public License # - GNU Library or Lesser General Public License # - GPL2 w/ CPE # - GPLv2+CE # - General Public License (GPL) # - HSQLDB License, a BSD open source license -# - LGPL 2.1 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 # - MIT License # - MPL 1.1 # - Mozilla Public License Version 2.0 @@ -47,7 +46,7 @@ # Please fill the missing licenses for dependencies : # # -#Sun Jan 31 19:58:02 CET 2016 +#Thu Feb 25 11:09:13 CET 2016 commons-jxpath--commons-jxpath--1.3=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=jdomlicence @@ -56,6 +55,7 @@ org.codehaus.castor--castor-core--1.3.3=The Apache Software License, Version 2.0 org.codehaus.castor--castor-xml--1.3.3=The Apache Software License, Version 2.0 org.metatype.sxc--sxc-jaxb-core--0.8=CDDL 1.1 org.metatype.sxc--sxc-runtime--0.8=CDDL 1.1 +org.olap4j--olap4j--0.9.7.309-JS-3=Lesser General Public License (LPGL) org.springframework--spring-aop--3.0.6.RELEASE=The Apache Software License, Version 2.0 org.springframework--spring-asm--3.0.6.RELEASE=The Apache Software License, Version 2.0 org.springframework--spring-beans--3.0.6.RELEASE=The Apache Software License, Version 2.0 diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/PeriodChoice.java b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/PeriodChoice.java index cc8ade3..4494402 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/PeriodChoice.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/PeriodChoice.java @@ -1,5 +1,27 @@ package org.chorem.lima.ui.accountViewer; +/* + * #%L + * Lima :: Swing + * %% + * Copyright (C) 2008 - 2016 CodeLutin + * %% + * 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% + */ + import static org.nuiton.i18n.I18n.t; /** diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/SelectionMode.java b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/SelectionMode.java index e2f112f..ff7e1e9 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/SelectionMode.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/accountViewer/SelectionMode.java @@ -1,5 +1,27 @@ package org.chorem.lima.ui.accountViewer; +/* + * #%L + * Lima :: Swing + * %% + * Copyright (C) 2008 - 2016 CodeLutin + * %% + * 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% + */ + import static org.nuiton.i18n.I18n.t; /** diff --git a/pom.xml b/pom.xml index 868fae9..3d2b852 100644 --- a/pom.xml +++ b/pom.xml @@ -548,6 +548,11 @@ <artifactId>commons-email</artifactId> <version>${commonsEmailVersion}</version> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + <version>4.1</version> + </dependency> <dependency> <groupId>log4j</groupId> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.