Author: echatellier Date: 2014-05-07 15:07:11 +0200 (Wed, 07 May 2014) New Revision: 429 Url: http://forge.nuiton.org/projects/nuiton-js/repository/revisions/429 Log: Udpate to underscore 1.6.0 Removed: nuiton-js-underscore/trunk/src/main/resources/nuiton-js-underscore/ Modified: nuiton-js-underscore/trunk/pom.xml nuiton-js-underscore/trunk/src/main/resources/META-INF/nuiton-js/wro-underscore.xml Modified: nuiton-js-underscore/trunk/pom.xml =================================================================== --- nuiton-js-underscore/trunk/pom.xml 2014-05-07 13:01:55 UTC (rev 428) +++ nuiton-js-underscore/trunk/pom.xml 2014-05-07 13:07:11 UTC (rev 429) @@ -10,11 +10,11 @@ <parent> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-lib</artifactId> - <version>1.0.1</version> + <version>1.0.2</version> </parent> <artifactId>nuiton-js-underscore</artifactId> - <version>1.5.1-2-SNAPSHOT</version> + <version>1.6.0-1-SNAPSHOT</version> <name>Nuiton JS :: Underscore.js</name> <description>Underscore jar packaging</description> @@ -29,9 +29,65 @@ </licenses> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-underscore-1.5.1-2</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-underscore-1.5.1-2</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-js/tags/nuiton-js-underscore-1.5.1-2</url> + <connection>scm:svn:https://svn.nuiton.org/nuiton-js/nuiton-js-underscore/trunk</connection> + <developerConnection>scm:svn:https://svn.nuiton.org/nuiton-js/nuiton-js-underscore/trunk</developerConnection> + <url>https://forge.nuiton.org/projects/nuiton-js/repository/show/nuiton-js-underscore/trunk</url> </scm> + <properties> + <license.licenseName>mit</license.licenseName> + + <upstreamVersion>1.6.0</upstreamVersion> + <upstreamUrl>https://raw.githubusercontent.com/jashkenas/underscore/${upstreamVersion}</upstreamUrl> + <upstreamFile>underscore.js</upstreamFile> + <destDir>${project.build.outputDirectory}/META-INF/resources/${project.artifactId}</destDir> + </properties> + + <dependencies> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-test</artifactId> + <version>1.0.2</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> + <executions> + <execution> + <phase>process-resources</phase> + <goals> + <goal>download-single</goal> + </goals> + <configuration> + <url>${upstreamUrl}</url> + <fromFile>${upstreamFile}</fromFile> + <toFile>${project.build.directory}/${upstreamFile}</toFile> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>process-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <echo message="moving resources" /> + <copy todir="${destDir}" file="${project.build.directory}/${upstreamFile}" /> + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> Modified: nuiton-js-underscore/trunk/src/main/resources/META-INF/nuiton-js/wro-underscore.xml =================================================================== --- nuiton-js-underscore/trunk/src/main/resources/META-INF/nuiton-js/wro-underscore.xml 2014-05-07 13:01:55 UTC (rev 428) +++ nuiton-js-underscore/trunk/src/main/resources/META-INF/nuiton-js/wro-underscore.xml 2014-05-07 13:07:11 UTC (rev 429) @@ -4,7 +4,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2013 CodeLutin, Chatellier Eric + Copyright (C) 2013 - 2014 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 @@ -23,6 +23,6 @@ --> <groups xmlns="http://www.isdc.ro/wro"> <group name='underscore'> - <js>classpath:nuiton-js-underscore/*.js</js> + <js>classpath:META-INF/resources/nuiton-js-underscore/*.js</js> </group> </groups>