Repository: wicket Updated Branches: refs/heads/WICKET-6492-minify-fix [created] e3832fd82
[WICKET-6492] minified js/css files are bundled Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e3832fd8 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e3832fd8 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e3832fd8 Branch: refs/heads/WICKET-6492-minify-fix Commit: e3832fd8276d56be8b678d5d0ebbf5ddd1673c4f Parents: d2286b2 Author: Maxim Solodovnik <[email protected]> Authored: Sat Nov 11 19:46:59 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sat Nov 11 19:47:39 2017 +0700 ---------------------------------------------------------------------- pom.xml | 9 +++++++++ .../src/main/resources/META-INF/MANIFEST.MF | 1 - 2 files changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/e3832fd8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 32d9fd8..4fa7ad5 100644 --- a/pom.xml +++ b/pom.xml @@ -634,6 +634,14 @@ <exclude>**/package.html</exclude> </excludes> </resource> + <resource> + <filtering>false</filtering> + <directory>${project.build.directory}/generated-res</directory> + <excludes> + <exclude>**/*min.min.js</exclude> + <exclude>**/*min.min.css</exclude> + </excludes> + </resource> </resources> <testResources> <testResource> @@ -708,6 +716,7 @@ <statistics>true</statistics> <jswarn>false</jswarn> <suffix>.min</suffix> + <outputDirectory>${project.build.directory}/generated-res</outputDirectory> </configuration> <executions> <execution> http://git-wip-us.apache.org/repos/asf/wicket/blob/e3832fd8/wicket-objectsizeof-agent/src/main/resources/META-INF/MANIFEST.MF ---------------------------------------------------------------------- diff --git a/wicket-objectsizeof-agent/src/main/resources/META-INF/MANIFEST.MF b/wicket-objectsizeof-agent/src/main/resources/META-INF/MANIFEST.MF index 5e589d4..7e3da39 100644 --- a/wicket-objectsizeof-agent/src/main/resources/META-INF/MANIFEST.MF +++ b/wicket-objectsizeof-agent/src/main/resources/META-INF/MANIFEST.MF @@ -1,4 +1,3 @@ -Manifest-Version: 1.0 Premain-Class: org.apache.wicket.util.instrument.ObjectSizeOfAgent Agent-Class: org.apache.wicket.util.instrument.ObjectSizeOfAgent
