Author: echatellier Date: 2013-12-20 15:10:44 +0100 (Fri, 20 Dec 2013) New Revision: 316 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/316 Log: Fix dependencies and licenses Modified: trunk/nuiton-js-test/pom.xml trunk/nuiton-js-test/src/license/THIRD-PARTY.properties trunk/nuiton-js-test/src/main/java/org/nuiton/js/wro/NuitonJsTestManagerFactory.java trunk/nuiton-js-wro/src/license/THIRD-PARTY.properties Modified: trunk/nuiton-js-test/pom.xml =================================================================== --- trunk/nuiton-js-test/pom.xml 2013-12-20 13:53:51 UTC (rev 315) +++ trunk/nuiton-js-test/pom.xml 2013-12-20 14:10:44 UTC (rev 316) @@ -25,6 +25,11 @@ <artifactId>nuiton-js-wro</artifactId> <version>${project.version}</version> </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> <dependency> <groupId>org.slf4j</groupId> @@ -39,6 +44,11 @@ </dependency> <dependency> + <groupId>ro.isdc.wro4j</groupId> + <artifactId>wro4j-core</artifactId> + </dependency> + + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <scope>compile</scope> Modified: trunk/nuiton-js-test/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-js-test/src/license/THIRD-PARTY.properties 2013-12-20 13:53:51 UTC (rev 315) +++ trunk/nuiton-js-test/src/license/THIRD-PARTY.properties 2013-12-20 14:10:44 UTC (rev 316) @@ -1,40 +1,25 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - Academic Free License v2.1 # - Apache License version 2.0 -# - Apache v2.0 # - BSD License -# - BSD licence # - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Public License - v 1.0 # - Common Public License Version 1.0 -# - Copyright (C) 2011 by Yehuda Katz -# - Copyright (c) 2002 Douglas Crockford -# - Copyright (c) 2012 Yehuda Katz, Tom Dale, Charles Jolley and Ember.js contributors -# - Copyright 2012 Anton Kovalyov -# - Eclipse Public License, Version 1.0 -# - GNU General Public License Version 2 -# - 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 -# - New BSD license -# - None -# - Public Domain # - The Apache Software License, Version 2.0 # - The MIT License -# - provided without support or warranty #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Fri Jul 05 19:02:24 CEST 2013 +#Fri Dec 20 15:02:19 CET 2013 args4j--args4j--2.0.16=MIT License javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.antlr--antlr--3.4=BSD License org.antlr--antlr-runtime--3.4=BSD License org.apache.ant--ant--1.8.1=Apache License version 2.0 org.apache.ant--ant-launcher--1.8.1=Apache License version 2.0 Modified: trunk/nuiton-js-test/src/main/java/org/nuiton/js/wro/NuitonJsTestManagerFactory.java =================================================================== --- trunk/nuiton-js-test/src/main/java/org/nuiton/js/wro/NuitonJsTestManagerFactory.java 2013-12-20 13:53:51 UTC (rev 315) +++ trunk/nuiton-js-test/src/main/java/org/nuiton/js/wro/NuitonJsTestManagerFactory.java 2013-12-20 14:10:44 UTC (rev 316) @@ -1,5 +1,29 @@ package org.nuiton.js.wro; +/* + * #%L + * Nuiton JS :: Test + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2013 CodeLutin, Chatellier Eric + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser 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 Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + import ro.isdc.wro.model.factory.WroModelFactory; /** Modified: trunk/nuiton-js-wro/src/license/THIRD-PARTY.properties =================================================================== --- trunk/nuiton-js-wro/src/license/THIRD-PARTY.properties 2013-12-20 13:53:51 UTC (rev 315) +++ trunk/nuiton-js-wro/src/license/THIRD-PARTY.properties 2013-12-20 14:10:44 UTC (rev 316) @@ -2,10 +2,10 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Academic Free License v2.1 +# - Apache License Version 2.0 # - Apache License version 2.0 # - Apache v2.0 # - BSD License -# - BSD licence # - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License - v 1.0 @@ -14,16 +14,22 @@ # - Copyright (c) 2002 Douglas Crockford # - Copyright (c) 2012 Yehuda Katz, Tom Dale, Charles Jolley and Ember.js contributors # - Copyright 2012 Anton Kovalyov +# - EPL +# - Eclipse Public License (EPL) # - Eclipse Public License, Version 1.0 # - GNU General Public License Version 2 # - GNU Lesser General Public License Version 2.1 +# - GPL 3 +# - Gnu General Public License, Version 3 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - LGPL 3 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License # - New BSD license # - None # - Public Domain +# - Revised BSD # - The Apache Software License, Version 2.0 # - The MIT License # - provided without support or warranty @@ -31,12 +37,12 @@ # Please fill the missing licenses for dependencies : # # -#Fri Jul 05 19:02:24 CEST 2013 +#Fri Dec 20 14:59:02 CET 2013 args4j--args4j--2.0.16=MIT License javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -org.antlr--antlr--3.4=BSD License org.antlr--antlr-runtime--3.4=BSD License org.apache.ant--ant--1.8.1=Apache License version 2.0 org.apache.ant--ant-launcher--1.8.1=Apache License version 2.0 org.codehaus.groovy--groovy-all--1.7.4=Apache License version 2.0 +org.jruby--yecht--1.0=Yecht / LICENSE ro.isdc.wro4j--rhino--1.7R5-20130223-1=Apache License version 2.0