Author: ymartel Date: 2014-02-06 17:17:01 +0100 (Thu, 06 Feb 2014) New Revision: 399 Url: http://chorem.org/projects/chorem/repository/revisions/399 Log: Update some dependencies. Cannot update all, need update wikitty before... Modified: trunk/chorem-webmotion/pom.xml trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp trunk/pom.xml Modified: trunk/chorem-webmotion/pom.xml =================================================================== --- trunk/chorem-webmotion/pom.xml 2014-02-05 08:06:07 UTC (rev 398) +++ trunk/chorem-webmotion/pom.xml 2014-02-06 16:17:01 UTC (rev 399) @@ -147,7 +147,7 @@ <dependency> <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-angular</artifactId> + <artifactId>nuiton-js-angularjs</artifactId> </dependency> <dependency> @@ -264,27 +264,6 @@ </goals> </execution> <execution> - <id>scan-jsp-sources</id> - <goals> - <goal>parserJsp</goal> - </goals> - <configuration> - <userRulesFiles> - <file>${basedir}/src/main/i18n/jsp.rules</file> - </userRulesFiles> - <namespaces> - <s>http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd</s> - <sx> - http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd - </sx> - <jsp>http://java.sun.com/JSP/Page</jsp> - <decorator> - http://www.opensymphony.com/sitemesh/decorator - </decorator> - </namespaces> - </configuration> - </execution> - <execution> <id>gen-and-make-bundle</id> <goals> <goal>gen</goal> Modified: trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp =================================================================== --- trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2014-02-05 08:06:07 UTC (rev 398) +++ trunk/chorem-webmotion/src/main/webapp/WEB-INF/jsp/decorator.jsp 2014-02-06 16:17:01 UTC (rev 399) @@ -49,7 +49,7 @@ </script> <%-- import via nuiton-js to add js or css show WEB-INF/wro.xml --%> - <script type="text/javascript" src="<c:url value='/nuiton-js/chorem-lib.js'/>"></script> + <script type="text/javascript" src="<c:url value='/nuiton-js/chorem-lib.js'/>?minimize=false"></script> <script type="text/javascript" src="<c:url value='/js/chorem.js'/>"></script> <script type="text/javascript" src="<c:url value='/js/ng-wikitty.js'/>"></script> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-05 08:06:07 UTC (rev 398) +++ trunk/pom.xml 2014-02-06 16:17:01 UTC (rev 399) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>4.0</version> + <version>4.6</version> </parent> <groupId>org.chorem</groupId> @@ -92,11 +92,11 @@ <nuitonI18nVersion>2.3.1</nuitonI18nVersion> <nuitonCsvVersion>3.0-alpha-1</nuitonCsvVersion> <wikittyVersion>3.10</wikittyVersion> - <slf4jVersion>1.6.1</slf4jVersion> + <slf4jVersion>1.7.6</slf4jVersion> <javaxMailVersion>1.4.3</javaxMailVersion> <servletApiVersion>2.5</servletApiVersion> <jspApiVersion>2.0</jspApiVersion> - <h2Version>1.2.134</h2Version> + <h2Version>1.3.175</h2Version> <webmotionVersion>2.4-SNAPSHOT</webmotionVersion> <jstlVersion>1.2</jstlVersion> @@ -236,12 +236,12 @@ <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-wro</artifactId> - <version>1.0</version> + <version>1.0.2</version> </dependency> <dependency> <groupId>org.nuiton.js</groupId> - <artifactId>nuiton-js-angular</artifactId> - <version>1.1.5-1-SNAPSHOT</version> + <artifactId>nuiton-js-angularjs</artifactId> + <version>1.2.11-1</version> </dependency> <dependency> <groupId>org.nuiton.js</groupId> @@ -261,7 +261,7 @@ <dependency> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-bootstrap</artifactId> - <version>2.2.2-1</version> + <version>2.3.2-1</version> </dependency> <!-- <dependency> <groupId>org.nuiton.js</groupId>