Nuiton-js-commits

Download

nuiton-js-commits@list.nuiton.org

February 2016

1 participants
2 discussions

r590 - trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro
by echatellier＠users.nuiton.org 26 Feb '16

26 Feb '16

Author: echatellier Date: 2016-02-26 10:41:43 +0100 (Fri, 26 Feb 2016) New Revision: 590 Url: http://forge.nuiton.org/projects/nuiton-js/repository/revisions/590 Log: Fix javadoc Modified: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsMavenWroManagerFactory.java trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsWroConfigurationFactory.java trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/ProtectedXmlModelFactory.java Modified: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsMavenWroManagerFactory.java =================================================================== --- trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsMavenWroManagerFactory.java 2016-02-26 09:38:59 UTC (rev 589) +++ trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsMavenWroManagerFactory.java 2016-02-26 09:41:43 UTC (rev 590) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 - 2013 CodeLutin + * Copyright (C) 2012 - 2016 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -67,8 +67,7 @@ protected File configProperties; /** - * Surcharge pour ajouter les preprocessors - * <li> {@link ForceCssDataUriPreProcessor} + * Surcharge pour ajouter les preprocessors {@link ForceCssDataUriPreProcessor} * @return */ @Override Modified: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsWroConfigurationFactory.java =================================================================== --- trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsWroConfigurationFactory.java 2016-02-26 09:38:59 UTC (rev 589) +++ trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/NuitonJsWroConfigurationFactory.java 2016-02-26 09:41:43 UTC (rev 590) @@ -6,7 +6,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2012 - 2013 CodeLutin + * Copyright (C) 2012 - 2016 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as @@ -39,11 +39,13 @@ /** * Creation de notre propre configuration pour avoir des valeurs par defaut * dans la config: - * <li> managerFactoryClassName=org.nuiton.js.wro.NuitonJsWroManagerFactory - * <li> debug=true - * <li> preProcessors=fallbackCssDataUri,cssUrlRewriting,cssImport,semicolonAppender,cssMinJawr - * <li> postProcessors=cssVariables,jsMin - * <li> uriLocators=servletContext,uri,classpath + * <ul> + * <li> managerFactoryClassName=org.nuiton.js.wro.NuitonJsWroManagerFactory</li> + * <li> debug=true</li> + * <li> preProcessors=fallbackCssDataUri,cssUrlRewriting,cssImport,semicolonAppender,cssMinJawr</li> + * <li> postProcessors=cssVariables,jsMin</li> + * <li> uriLocators=servletContext,uri,classpath</li> + * </ul> * * @author poussin * @version $Revision$ Modified: trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/ProtectedXmlModelFactory.java =================================================================== --- trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/ProtectedXmlModelFactory.java 2016-02-26 09:38:59 UTC (rev 589) +++ trunk/nuiton-js-wro/src/main/java/org/nuiton/js/wro/ProtectedXmlModelFactory.java 2016-02-26 09:41:43 UTC (rev 590) @@ -53,11 +53,11 @@ /** * Model factory implementation. Creates a WroModel object, based on an xml. This xml contains the description of all * groups. - * <p/> + * * This class is thread-safe (the create method is synchronized). * * @author Alex Objelean - * @created Created on Nov 3, 2008 + * created Created on Nov 3, 2008 */ public class ProtectedXmlModelFactory extends AbstractWroModelFactory {

1 0

r589 - trunk
by echatellier＠users.nuiton.org 26 Feb '16

26 Feb '16

Author: echatellier Date: 2016-02-26 10:38:59 +0100 (Fri, 26 Feb 2016) New Revision: 589 Url: http://forge.nuiton.org/projects/nuiton-js/repository/revisions/589 Log: Update deps Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-11-13 17:49:24 UTC (rev 588) +++ trunk/pom.xml 2016-02-26 09:38:59 UTC (rev 589) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>5.0.9</version> + <version>7</version> </parent> <groupId>org.nuiton.js</groupId> @@ -53,6 +53,24 @@ <version>${wroVersion}</version> <scope>provided</scope> </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.4</version> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.12</version> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>2.4</version> + </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -63,7 +81,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>1.9.5</version> + <version>1.10.19</version> <scope>test</scope> </dependency> </dependencies> @@ -121,8 +139,8 @@ <properties> - <wroVersion>1.7.6</wroVersion> - <slf4jVersion>1.7.7</slf4jVersion> + <wroVersion>1.7.9</wroVersion> + <slf4jVersion>1.7.16</slf4jVersion> <servletApiVersion>2.5</servletApiVersion>

1 0