Author: echatellier Date: 2014-05-07 15:28:26 +0200 (Wed, 07 May 2014) New Revision: 433 Url: http://forge.nuiton.org/projects/nuiton-js/repository/revisions/433 Log: Update to boostrap 3.1.1 Removed: nuiton-js-bootstrap/trunk/src/main/resources/nuiton-js-bootstrap/ Modified: nuiton-js-bootstrap/trunk/pom.xml nuiton-js-bootstrap/trunk/src/main/resources/META-INF/nuiton-js/wro-bootstrap.xml Modified: nuiton-js-bootstrap/trunk/pom.xml =================================================================== --- nuiton-js-bootstrap/trunk/pom.xml 2014-05-07 13:25:35 UTC (rev 432) +++ nuiton-js-bootstrap/trunk/pom.xml 2014-05-07 13:28:26 UTC (rev 433) @@ -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-bootstrap</artifactId> - <version>2.3.2-2-SNAPSHOT</version> + <version>3.1.1-1-SNAPSHOT</version> <name>Nuiton JS :: Bootstrap</name> <description>bootstrap packaging</description> @@ -22,9 +22,9 @@ <url>http://twitter.github.com/bootstrap/</url> <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-bootstrap-2.3.2-1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/nuiton-js/tags/nuiton-js-bootstrap-2.3.2-1</developerConnection> - <url>http://www.nuiton.org/repositories/browse/nuiton-js/tags/nuiton-js-bootstrap-2.3.2-1</url> + <connection>scm:svn:https://svn.nuiton.org/nuiton-js/nuiton-js-bootstrap/trunk</connection> + <developerConnection>scm:svns:https://svn.nuiton.org/nuiton-js/nuiton-js-bootstrap/trunk</developerConnection> + <url>https://forge.nuiton.org/projects/nuiton-js/repository/show/nuiton-js-bootstrap/trunk</url> </scm> <licenses> @@ -34,4 +34,71 @@ </license> </licenses> + <properties> + <license.licenseName>apache_v2</license.licenseName> + + <upstreamVersion>3.1.1</upstreamVersion> + <upstreamUrl>https://github.com/twbs/bootstrap/archive/</upstreamUrl> + <upstreamFile>v${upstreamVersion}.zip</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}/${project.artifactId}.zip</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="unzip archive" /> + <unzip src="${project.build.directory}/${project.artifactId}.zip" dest="${project.build.directory}" /> + <echo message="moving resources" /> + <copy todir="${destDir}"> + <fileset dir="${project.build.directory}/bootstrap-${upstreamVersion}/dist" includes="*"> + <filename regex="angular-?[a-z]*.(js|css)" /> + <filename name="angular-scenario.js" negate="true" /> + </fileset> + <fileset dir="${project.build.directory}/bootstrap-${upstreamVersion}/dist" includes="css/bootstrap.css" /> + <fileset dir="${project.build.directory}/bootstrap-${upstreamVersion}/dist" includes="css/bootstrap-theme.css" /> + <fileset dir="${project.build.directory}/bootstrap-${upstreamVersion}/dist" includes="fonts/*" /> + <fileset dir="${project.build.directory}/bootstrap-${upstreamVersion}/dist" includes="js/bootstrap.js" /> + </copy> + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> </project> \ No newline at end of file Modified: nuiton-js-bootstrap/trunk/src/main/resources/META-INF/nuiton-js/wro-bootstrap.xml =================================================================== --- nuiton-js-bootstrap/trunk/src/main/resources/META-INF/nuiton-js/wro-bootstrap.xml 2014-05-07 13:25:35 UTC (rev 432) +++ nuiton-js-bootstrap/trunk/src/main/resources/META-INF/nuiton-js/wro-bootstrap.xml 2014-05-07 13:28:26 UTC (rev 433) @@ -1,13 +1,13 @@ <groups xmlns="http://www.isdc.ro/wro"> <group name='bootstrap'> - <css>classpath:nuiton-js-bootstrap/css/bootstrap.css</css> - <js>classpath:nuiton-js-bootstrap/js/bootstrap.js</js> + <css>classpath:META-INF/resources/nuiton-js-bootstrap/css/bootstrap.css</css> + <js>classpath:META-INF/resources/nuiton-js-bootstrap/js/bootstrap.js</js> </group> - <group name='bootstrap-responsive'> + <group name='bootstrap-theme'> <group-ref>bootstrap</group-ref> - <css>classpath:nuiton-js-bootstrap/css/bootstrap-responsive.css</css> + <css>classpath:META-INF/resources/nuiton-js-bootstrap/css/bootstrap-theme.css</css> </group> </groups> \ No newline at end of file