Skip to content

Commit 33c15f6

Browse files
php-coderphp-coder
committed
Use minify-maven-plugin for CSS minification.
@see http://samaxes.github.io/minify-maven-plugin/ Fix #131 No functional changes.
1 parent 3a2caa2 commit 33c15f6

File tree

22 files changed

+59
-20
lines changed

22 files changed

+59
-20
lines changed

‎.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,6 @@ mystamps.iml
1212
# jasmine-maven-plugin uses phantomjs-maven-plugin.
1313
# phantomjs-maven-plugin creates this log file.
1414
phantomjsdriver.log
15+
16+
# minified resources
17+
src/main/webapp/WEB-INF/static/styles/*.min.css

‎pom.xml

+36
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,13 @@
4545

4646
<compiler.plugin.version>3.5.1</compiler.plugin.version>
4747
<resources.plugin.version>2.7</resources.plugin.version>
48+
<war.plugin.version>2.6</war.plugin.version>
4849
<native2ascii.plugin.version>1.0-beta-1</native2ascii.plugin.version>
4950
<surefire.plugin.version>2.19.1</surefire.plugin.version>
5051
<gmaven.plugin.version>1.4</gmaven.plugin.version>
5152
<gmaven.runtime.plugin.version>1.5</gmaven.runtime.plugin.version>
5253
<jasmine.plugin.version>2.1</jasmine.plugin.version>
54+
<minify.plugin.version>1.7.4</minify.plugin.version>
5355
<failsafe.plugin.version>2.19.1</failsafe.plugin.version>
5456
<license.plugin.version>1.9.0</license.plugin.version>
5557
<checkstyle.plugin.version>2.17</checkstyle.plugin.version>
@@ -539,6 +541,16 @@
539541
<version>${resources.plugin.version}</version>
540542
</plugin>
541543

544+
<plugin>
545+
<groupId>org.apache.maven.plugins</groupId>
546+
<artifactId>maven-war-plugin</artifactId>
547+
<version>${war.plugin.version}</version>
548+
<configuration>
549+
<!-- Exclude non-minified versions of resources -->
550+
<warSourceExcludes>WEB-INF/static/styles/main.css</warSourceExcludes>
551+
</configuration>
552+
</plugin>
553+
542554
<plugin>
543555
<groupId>org.codehaus.mojo</groupId>
544556
<artifactId>native2ascii-maven-plugin</artifactId>
@@ -604,6 +616,30 @@
604616
</configuration>
605617
</plugin>
606618

619+
<plugin>
620+
<groupId>com.samaxes.maven</groupId>
621+
<artifactId>minify-maven-plugin</artifactId>
622+
<version>${minify.plugin.version}</version>
623+
<configuration>
624+
<!-- Put minified versions to the same directory so that spring-boot:run can pick it -->
625+
<webappSourceDir>${basedir}/src/main/webapp</webappSourceDir>
626+
<webappTargetDir>${basedir}/src/main/webapp</webappTargetDir>
627+
<cssSourceDir>WEB-INF/static/styles</cssSourceDir>
628+
<cssSourceFiles>
629+
<cssSourceFile>main.css</cssSourceFile>
630+
</cssSourceFiles>
631+
<skipMerge>true</skipMerge>
632+
</configuration>
633+
<executions>
634+
<execution>
635+
<id>minify-resources</id>
636+
<goals>
637+
<goal>minify</goal>
638+
</goals>
639+
</execution>
640+
</executions>
641+
</plugin>
642+
607643
<plugin>
608644
<groupId>org.apache.maven.plugins</groupId>
609645
<artifactId>maven-failsafe-plugin</artifactId>

‎src/main/java/ru/mystamps/web/Url.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public final class Url {
7676

7777
// resources
7878
public static final String FAVICON_ICO = "/favicon.ico";
79-
public static final String MAIN_CSS = "/static/styles/main.css";
79+
public static final String MAIN_CSS = "/static/styles/main.min.css";
8080
public static final String CATALOG_UTILS_JS = "/public/js/CatalogUtils.js";
8181
public static final String SERIES_ADD_JS = "/public/js/series/add.js";
8282
public static final String COLLECTION_INFO_JS = "/public/js/collection/info.js";

‎src/main/webapp/WEB-INF/views/account/activate.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
1313
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
1414
<link rel="stylesheet" href="https://cdn.rawgit.com/usrz/bootstrap-languages/3ac2a3d2b27ac43a471cd99e79d378a03b2c6b5f/languages.min.css" th:href="${BOOTSTRAP_LANGUAGE}" />
15-
<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
15+
<link rel="stylesheet" href="../../static/styles/main.min.css" th:href="${MAIN_CSS}" />
1616
</head>
1717
<body>
1818
<div class="container-fluid">

‎src/main/webapp/WEB-INF/views/account/auth.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
1313
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
1414
<link rel="stylesheet" href="https://cdn.rawgit.com/usrz/bootstrap-languages/3ac2a3d2b27ac43a471cd99e79d378a03b2c6b5f/languages.min.css" th:href="${BOOTSTRAP_LANGUAGE}" />
15-
<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
15+
<link rel="stylesheet" href="../../static/styles/main.min.css" th:href="${MAIN_CSS}" />
1616
</head>
1717
<body>
1818
<div class="container-fluid">

‎src/main/webapp/WEB-INF/views/account/register.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
1313
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
1414
<link rel="stylesheet" href="https://cdn.rawgit.com/usrz/bootstrap-languages/3ac2a3d2b27ac43a471cd99e79d378a03b2c6b5f/languages.min.css" th:href="${BOOTSTRAP_LANGUAGE}" />
15-
<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
15+
<link rel="stylesheet" href="../../static/styles/main.min.css" th:href="${MAIN_CSS}" />
1616
</head>
1717
<body>
1818
<div class="container-fluid">

‎src/main/webapp/WEB-INF/views/category/add.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
1313
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
1414
<link rel="stylesheet" href="https://cdn.rawgit.com/usrz/bootstrap-languages/3ac2a3d2b27ac43a471cd99e79d378a03b2c6b5f/languages.min.css" th:href="${BOOTSTRAP_LANGUAGE}" />
15-
<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
15+
<link rel="stylesheet" href="../../static/styles/main.min.css" th:href="${MAIN_CSS}" />
1616
</head>
1717
<body>
1818
<div class="container-fluid">

‎src/main/webapp/WEB-INF/views/category/info.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
1212
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
1313
<link rel="stylesheet" href="https://cdn.rawgit.com/usrz/bootstrap-languages/3ac2a3d2b27ac43a471cd99e79d378a03b2c6b5f/languages.min.css" th:href="${BOOTSTRAP_LANGUAGE}" />
14-
<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
14+
<link rel="stylesheet" href="../../static/styles/main.min.css" th:href="${MAIN_CSS}" />
1515
<!--/*/
1616
<link rel="canonical" th:href="@{${PUBLIC_URL} + ${INFO_CATEGORY_PAGE}(id=${categoryId},slug=${categorySlug})}" />
1717
/*/-->

‎src/main/webapp/WEB-INF/views/category/list.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
1212
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
1313
<link rel="stylesheet" href="https://cdn.rawgit.com/usrz/bootstrap-languages/3ac2a3d2b27ac43a471cd99e79d378a03b2c6b5f/languages.min.css" th:href="${BOOTSTRAP_LANGUAGE}" />
14-
<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
14+
<link rel="stylesheet" href="../../static/styles/main.min.css" th:href="${MAIN_CSS}" />
1515
</head>
1616
<body>
1717
<div class="container-fluid">

‎src/main/webapp/WEB-INF/views/collection/info.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
1212
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
1313
<link rel="stylesheet" href="https://cdn.rawgit.com/usrz/bootstrap-languages/3ac2a3d2b27ac43a471cd99e79d378a03b2c6b5f/languages.min.css" th:href="${BOOTSTRAP_LANGUAGE}" />
14-
<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
14+
<link rel="stylesheet" href="../../static/styles/main.min.css" th:href="${MAIN_CSS}" />
1515
</head>
1616
<body>
1717
<div class="container-fluid">

‎src/main/webapp/WEB-INF/views/country/add.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
1313
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
1414
<link rel="stylesheet" href="https://cdn.rawgit.com/usrz/bootstrap-languages/3ac2a3d2b27ac43a471cd99e79d378a03b2c6b5f/languages.min.css" th:href="${BOOTSTRAP_LANGUAGE}" />
15-
<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
15+
<link rel="stylesheet" href="../../static/styles/main.min.css" th:href="${MAIN_CSS}" />
1616
</head>
1717
<body>
1818
<div class="container-fluid">

‎src/main/webapp/WEB-INF/views/country/info.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
1212
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
1313
<link rel="stylesheet" href="https://cdn.rawgit.com/usrz/bootstrap-languages/3ac2a3d2b27ac43a471cd99e79d378a03b2c6b5f/languages.min.css" th:href="${BOOTSTRAP_LANGUAGE}" />
14-
<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
14+
<link rel="stylesheet" href="../../static/styles/main.min.css" th:href="${MAIN_CSS}" />
1515
<!--/*/
1616
<link rel="canonical" th:href="@{${PUBLIC_URL} + ${INFO_COUNTRY_PAGE}(id=${countryId},slug=${countrySlug})}" />
1717
/*/-->

‎src/main/webapp/WEB-INF/views/country/list.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
1212
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
1313
<link rel="stylesheet" href="https://cdn.rawgit.com/usrz/bootstrap-languages/3ac2a3d2b27ac43a471cd99e79d378a03b2c6b5f/languages.min.css" th:href="${BOOTSTRAP_LANGUAGE}" />
14-
<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
14+
<link rel="stylesheet" href="../../static/styles/main.min.css" th:href="${MAIN_CSS}" />
1515
</head>
1616
<body>
1717
<div class="container-fluid">

‎src/main/webapp/WEB-INF/views/error/401.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<title th:text="#{t_401_title}">401: unauthorized</title>
1212
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
1313
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
14-
<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
14+
<link rel="stylesheet" href="../../static/styles/main.min.css" th:href="${MAIN_CSS}" />
1515
</head>
1616
<body>
1717
<div class="container-fluid">

‎src/main/webapp/WEB-INF/views/error/403.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<title th:text="#{t_403_title}">403: forbidden</title>
1212
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
1313
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
14-
<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
14+
<link rel="stylesheet" href="../../static/styles/main.min.css" th:href="${MAIN_CSS}" />
1515
</head>
1616
<body>
1717
<div class="container-fluid">

‎src/main/webapp/WEB-INF/views/error/404.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<title th:text="#{t_404_title}">404: page not found</title>
1212
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
1313
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
14-
<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
14+
<link rel="stylesheet" href="../../static/styles/main.min.css" th:href="${MAIN_CSS}" />
1515
</head>
1616
<body>
1717
<div class="container-fluid">

‎src/main/webapp/WEB-INF/views/error/500.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<title th:text="#{t_500_title}">500: internal server error</title>
1212
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
1313
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
14-
<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
14+
<link rel="stylesheet" href="../../static/styles/main.min.css" th:href="${MAIN_CSS}" />
1515
</head>
1616
<body>
1717
<div class="container-fluid">

‎src/main/webapp/WEB-INF/views/series/add.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
1313
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
1414
<link rel="stylesheet" href="https://cdn.rawgit.com/usrz/bootstrap-languages/3ac2a3d2b27ac43a471cd99e79d378a03b2c6b5f/languages.min.css" th:href="${BOOTSTRAP_LANGUAGE}" />
15-
<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
15+
<link rel="stylesheet" href="../../static/styles/main.min.css" th:href="${MAIN_CSS}" />
1616
<link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/selectize.js/0.12.1/css/selectize.bootstrap3.min.css" th:href="${SELECTIZE_CSS}" />
1717
</head>
1818
<body onload="initPage()">

‎src/main/webapp/WEB-INF/views/series/info.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
1212
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
1313
<link rel="stylesheet" href="https://cdn.rawgit.com/usrz/bootstrap-languages/3ac2a3d2b27ac43a471cd99e79d378a03b2c6b5f/languages.min.css" th:href="${BOOTSTRAP_LANGUAGE}" />
14-
<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
14+
<link rel="stylesheet" href="../../static/styles/main.min.css" th:href="${MAIN_CSS}" />
1515
</head>
1616
<body>
1717
<div class="container-fluid">

‎src/main/webapp/WEB-INF/views/series/search_result.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
1313
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
1414
<link rel="stylesheet" href="https://cdn.rawgit.com/usrz/bootstrap-languages/3ac2a3d2b27ac43a471cd99e79d378a03b2c6b5f/languages.min.css" th:href="${BOOTSTRAP_LANGUAGE}" />
15-
<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
15+
<link rel="stylesheet" href="../../static/styles/main.min.css" th:href="${MAIN_CSS}" />
1616
</head>
1717
<body>
1818
<div class="container-fluid">

‎src/main/webapp/WEB-INF/views/site/events.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
1313
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
1414
<link rel="stylesheet" href="https://cdn.rawgit.com/usrz/bootstrap-languages/3ac2a3d2b27ac43a471cd99e79d378a03b2c6b5f/languages.min.css" th:href="${BOOTSTRAP_LANGUAGE}" />
15-
<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
15+
<link rel="stylesheet" href="../../static/styles/main.min.css" th:href="${MAIN_CSS}" />
1616
</head>
1717
<body>
1818
<div class="container-fluid">

‎src/main/webapp/WEB-INF/views/site/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="shortcut icon" type="image/x-icon" href="../../../favicon.ico" th:href="${FAVICON_ICO}" />
1313
<link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css" th:href="${BOOTSTRAP_CSS}" />
1414
<link rel="stylesheet" href="https://cdn.rawgit.com/usrz/bootstrap-languages/3ac2a3d2b27ac43a471cd99e79d378a03b2c6b5f/languages.min.css" th:href="${BOOTSTRAP_LANGUAGE}" />
15-
<link rel="stylesheet" href="../../static/styles/main.css" th:href="${MAIN_CSS}" />
15+
<link rel="stylesheet" href="../../static/styles/main.min.css" th:href="${MAIN_CSS}" />
1616
</head>
1717
<body>
1818
<div class="container-fluid">

0 commit comments

Comments
 (0)