Author: echatellier Date: 2014-05-07 12:30:25 +0200 (Wed, 07 May 2014) New Revision: 419 Url: http://forge.nuiton.org/projects/nuiton-js/repository/revisions/419 Log: Update version to 2.6.0 Removed: nuiton-js-moment/trunk/src/main/resources/nuiton-js-moment/ Modified: nuiton-js-moment/trunk/pom.xml nuiton-js-moment/trunk/src/main/resources/META-INF/nuiton-js/wro-moment.xml Modified: nuiton-js-moment/trunk/pom.xml =================================================================== --- nuiton-js-moment/trunk/pom.xml 2014-05-07 10:12:13 UTC (rev 418) +++ nuiton-js-moment/trunk/pom.xml 2014-05-07 10:30:25 UTC (rev 419) @@ -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-moment</artifactId> - <version>2.1.0-1-SNAPSHOT</version> + <version>2.6.0-1-SNAPSHOT</version> <name>Nuiton JS :: Moment</name> <description>Moment.js packaging</description> @@ -22,11 +22,20 @@ <url>http://momentjs.com/</url> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-moment-2.1.0-1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-moment-2.1.0-1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-js/tags/nuiton-js-moment-2.1.0-1</url> + <connection>scm:svn:https://svn.nuiton.org/nuiton-js/nuiton-js-moment/trunk</connection> + <developerConnection>scm:svn:https://svn.nuiton.org/nuiton-js/nuiton-js-moment/trunk</developerConnection> + <url>https://forge.nuiton.org/projects/nuiton-js/repository/show/nuiton-js-moment/trunk</url> </scm> + <properties> + <license.licenseName>mit</license.licenseName> + + <upstreamVersion>2.6.0</upstreamVersion> + <upstreamUrl>https://raw.githubusercontent.com/moment/moment/${upstreamVersion}</upstreamUrl> + <upstreamFile>moment.js</upstreamFile> + <destDir>${project.build.outputDirectory}/META-INF/resources/${project.artifactId}</destDir> + </properties> + <licenses> <license> <name>MIT License</name> @@ -34,4 +43,51 @@ </license> </licenses> + <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-moment/trunk/src/main/resources/META-INF/nuiton-js/wro-moment.xml =================================================================== --- nuiton-js-moment/trunk/src/main/resources/META-INF/nuiton-js/wro-moment.xml 2014-05-07 10:12:13 UTC (rev 418) +++ nuiton-js-moment/trunk/src/main/resources/META-INF/nuiton-js/wro-moment.xml 2014-05-07 10:30:25 UTC (rev 419) @@ -24,7 +24,7 @@ <groups xmlns="http://www.isdc.ro/wro"> <group name='moment'> - <js>classpath:nuiton-js-moment/moment.js</js> + <js>classpath:META-INF/resources/nuiton-js-moment/moment.js</js> </group> </groups>