Author: echatellier Date: 2013-11-23 16:53:07 +0100 (Sat, 23 Nov 2013) New Revision: 308 Url: http://nuiton.org/projects/nuiton-js/repository/revisions/308 Log: Use test module Modified: nuiton-js-angular-ui-utils/trunk/pom.xml nuiton-js-angular-ui-utils/trunk/src/main/resources/META-INF/nuiton-js/wro-angular-ui-utils.xml nuiton-js-angularjs/trunk/pom.xml Modified: nuiton-js-angular-ui-utils/trunk/pom.xml =================================================================== --- nuiton-js-angular-ui-utils/trunk/pom.xml 2013-11-23 15:51:53 UTC (rev 307) +++ nuiton-js-angular-ui-utils/trunk/pom.xml 2013-11-23 15:53:07 UTC (rev 308) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-lib</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <artifactId>nuiton-js-angular-ui-utils</artifactId> @@ -25,6 +25,7 @@ <properties> <upstreamVersion>0.0.4</upstreamVersion> <upstreamUrl>https://github.com/angular-ui/ui-utils/archive/</upstreamUrl> + <upstreamFile>v${upstreamVersion}.zip</upstreamFile> <destDir>${project.build.outputDirectory}/META-INF/resources/${project.artifactId}</destDir> </properties> @@ -48,6 +49,12 @@ <version>1.2.0-1</version> <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-test</artifactId> + <version>1.0.2-SNAPSHOT</version> + <scope>test</scope> + </dependency> </dependencies> <build> @@ -55,7 +62,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>wagon-maven-plugin</artifactId> - <version>1.0-beta-4</version> <executions> <execution> <phase>process-resources</phase> @@ -64,7 +70,7 @@ </goals> <configuration> <url>${upstreamUrl}</url> - <fromFile>v${upstreamVersion}.zip</fromFile> + <fromFile>${upstreamFile}</fromFile> <toFile>${project.build.directory}/${project.artifactId}.zip</toFile> </configuration> </execution> @@ -72,7 +78,6 @@ </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.7</version> <executions> <execution> <phase>process-resources</phase> Modified: nuiton-js-angular-ui-utils/trunk/src/main/resources/META-INF/nuiton-js/wro-angular-ui-utils.xml =================================================================== --- nuiton-js-angular-ui-utils/trunk/src/main/resources/META-INF/nuiton-js/wro-angular-ui-utils.xml 2013-11-23 15:51:53 UTC (rev 307) +++ nuiton-js-angular-ui-utils/trunk/src/main/resources/META-INF/nuiton-js/wro-angular-ui-utils.xml 2013-11-23 15:53:07 UTC (rev 308) @@ -22,7 +22,7 @@ #L% --> <groups xmlns="http://www.isdc.ro/wro"> - <group name='angular-ui-event'> + <group name='angular-ui-event'> <group-ref>angular</group-ref> <js>classpath:META-INF/resources/nuiton-js-angular-ui-utils/modules/event/event.js</js> </group> Modified: nuiton-js-angularjs/trunk/pom.xml =================================================================== --- nuiton-js-angularjs/trunk/pom.xml 2013-11-23 15:51:53 UTC (rev 307) +++ nuiton-js-angularjs/trunk/pom.xml 2013-11-23 15:53:07 UTC (rev 308) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.js</groupId> <artifactId>nuiton-js-lib</artifactId> - <version>1.0.1</version> + <version>1.0.2-SNAPSHOT</version> </parent> <artifactId>nuiton-js-angularjs</artifactId> @@ -41,12 +41,20 @@ <url>http://www.nuiton.org/repositories/browse/nuiton-js/nuiton-js-angularjs/trunk</url> </scm> + <dependencies> + <dependency> + <groupId>org.nuiton.js</groupId> + <artifactId>nuiton-js-test</artifactId> + <version>1.0.2-SNAPSHOT</version> + <scope>test</scope> + </dependency> + </dependencies> + <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>wagon-maven-plugin</artifactId> - <version>1.0-beta-4</version> <executions> <execution> <phase>process-resources</phase> @@ -63,7 +71,6 @@ </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.7</version> <executions> <execution> <phase>process-resources</phase> @@ -79,8 +86,6 @@ <fileset dir="${project.build.directory}/angular-${upstreamVersion}" includes="*"> <filename regex="angular-?[a-z]*.(js|css)"/> <filename name="angular-scenario.js" negate="true" /> - <!-- <filename regex="angular-[a-z]*.css"/> - <include name="i18n/*.js"/> --> </fileset> <fileset dir="${project.build.directory}/angular-${upstreamVersion}" includes="i18n/*.js" /> </copy>