Author: tchemit Date: 2014-03-25 10:03:44 +0100 (Tue, 25 Mar 2014) New Revision: 1735 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1735 Log: fix licenses fix third-parties fix dependencies Added: trunk/wao-persistence/src/license/ trunk/wao-persistence/src/license/THIRD-PARTY.properties trunk/wao-services/src/license/ trunk/wao-services/src/license/THIRD-PARTY.properties trunk/wao-web/src/license/ trunk/wao-web/src/license/THIRD-PARTY.properties Modified: trunk/LICENSE.txt trunk/pom.xml trunk/wao-persistence/LICENSE.txt trunk/wao-persistence/pom.xml trunk/wao-services/LICENSE.txt trunk/wao-services/pom.xml trunk/wao-web/LICENSE.txt trunk/wao-web/pom.xml Modified: trunk/LICENSE.txt =================================================================== --- trunk/LICENSE.txt 2014-03-24 10:06:46 UTC (rev 1734) +++ trunk/LICENSE.txt 2014-03-25 09:03:44 UTC (rev 1735) @@ -658,4 +658,4 @@ 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/>. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-03-24 10:06:46 UTC (rev 1734) +++ trunk/pom.xml 2014-03-25 09:03:44 UTC (rev 1735) @@ -106,7 +106,7 @@ <bootstrapPluginVersion>1.6.1</bootstrapPluginVersion> <shiroVersion>1.2.2</shiroVersion> <slf4jVersion>1.7.6</slf4jVersion> - <hibernateVersion>4.2.8.Final</hibernateVersion> + <hibernateVersion>4.3.1.Final</hibernateVersion> <mockitoVersion>1.9.5</mockitoVersion> <postgresqlDriverVersion>9.3-1101-jdbc41</postgresqlDriverVersion> <commonsEmailVersion>1.3.2</commonsEmailVersion> @@ -237,6 +237,13 @@ <dependency> <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>${hibernateVersion}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> <artifactId>hibernate-c3p0</artifactId> <version>${hibernateVersion}</version> <scope>runtime</scope> Modified: trunk/wao-persistence/LICENSE.txt =================================================================== --- trunk/wao-persistence/LICENSE.txt 2014-03-24 10:06:46 UTC (rev 1734) +++ trunk/wao-persistence/LICENSE.txt 2014-03-25 09:03:44 UTC (rev 1735) @@ -658,4 +658,4 @@ 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/>. Modified: trunk/wao-persistence/pom.xml =================================================================== --- trunk/wao-persistence/pom.xml 2014-03-24 10:06:46 UTC (rev 1734) +++ trunk/wao-persistence/pom.xml 2014-03-25 09:03:44 UTC (rev 1735) @@ -22,11 +22,21 @@ <dependency> <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> <artifactId>hibernate-c3p0</artifactId> </dependency> <dependency> <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> </dependency> Added: trunk/wao-persistence/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-persistence/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/wao-persistence/src/license/THIRD-PARTY.properties 2014-03-25 09:03:44 UTC (rev 1735) @@ -0,0 +1,31 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - AL 2.0 +# - Apache License 2.0 +# - Apache License, version 2.0 +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License +# - Common Public License Version 1.0 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.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 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - 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 +# - New BSD License +# - Public Domain +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Tue Mar 25 09:09:51 CET 2014 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License Property changes on: trunk/wao-persistence/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/wao-services/LICENSE.txt =================================================================== --- trunk/wao-services/LICENSE.txt 2014-03-24 10:06:46 UTC (rev 1734) +++ trunk/wao-services/LICENSE.txt 2014-03-25 09:03:44 UTC (rev 1735) @@ -658,4 +658,4 @@ 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/>. Modified: trunk/wao-services/pom.xml =================================================================== --- trunk/wao-services/pom.xml 2014-03-24 10:06:46 UTC (rev 1734) +++ trunk/wao-services/pom.xml 2014-03-25 09:03:44 UTC (rev 1735) @@ -20,10 +20,10 @@ <artifactId>nuiton-csv</artifactId> </dependency> - <dependency> + <!--dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> - </dependency> + </dependency--> <dependency> <groupId>org.nuiton.i18n</groupId> @@ -31,6 +31,11 @@ </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> <groupId>com.github.spullara.mustache.java</groupId> <artifactId>compiler</artifactId> </dependency> @@ -81,10 +86,10 @@ <artifactId>commons-io</artifactId> </dependency> - <dependency> + <!--dependency> <groupId>commons-codec</groupId> <artifactId>commons-codec</artifactId> - </dependency> + </dependency--> <dependency> <groupId>org.slf4j</groupId> Added: trunk/wao-services/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-services/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/wao-services/src/license/THIRD-PARTY.properties 2014-03-25 09:03:44 UTC (rev 1735) @@ -0,0 +1,37 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - AL 2.0 +# - Affero General Public License (AGPL) +# - Apache License 2.0 +# - Apache License, version 2.0 +# - BSD License +# - CDDL +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License +# - Common Public License Version 1.0 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.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 Library or Lesser General Public License +# - GPLv2+CE +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - 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 +# - New BSD License +# - Public Domain +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +# - The MIT License +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Tue Mar 25 09:19:02 CET 2014 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License Property changes on: trunk/wao-services/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/wao-web/LICENSE.txt =================================================================== --- trunk/wao-web/LICENSE.txt 2014-03-24 10:06:46 UTC (rev 1734) +++ trunk/wao-web/LICENSE.txt 2014-03-25 09:03:44 UTC (rev 1735) @@ -658,4 +658,4 @@ 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/>. Modified: trunk/wao-web/pom.xml =================================================================== --- trunk/wao-web/pom.xml 2014-03-24 10:06:46 UTC (rev 1734) +++ trunk/wao-web/pom.xml 2014-03-25 09:03:44 UTC (rev 1735) @@ -129,6 +129,7 @@ <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-json-plugin</artifactId> + <scope>runtime</scope> </dependency> <dependency> @@ -138,7 +139,13 @@ <dependency> <groupId>org.apache.shiro</groupId> + <artifactId>shiro-core</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.shiro</groupId> <artifactId>shiro-web</artifactId> + <scope>runtime</scope> </dependency> <!-- TODO enable guava caching --> Added: trunk/wao-web/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wao-web/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/wao-web/src/license/THIRD-PARTY.properties 2014-03-25 09:03:44 UTC (rev 1735) @@ -0,0 +1,38 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - AL 2.0 +# - Affero General Public License (AGPL) +# - Apache License 2.0 +# - Apache License, version 2.0 +# - BSD License +# - BSD-style license +# - CDDL +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.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 Library or Lesser General Public License +# - GPLv2+CE +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - 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 +# - Public Domain +# - 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 : +# +# +#Tue Mar 25 09:20:32 CET 2014 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License +javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +oro--oro--2.0.8=The Apache Software License, Version 2.0 Property changes on: trunk/wao-web/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native