Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#4466 Replaced ANT based yuicompression with Mvn plug-in #4467

Merged
merged 1 commit into from
Sep 22, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 67 additions & 18 deletions impl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -90,24 +90,7 @@
value="${mojarra.logstrings.version}">
<include name="**/LogStrings*.properties"/>
</replace>

<!--

Generate jsf(-uncompressed).js

-->
<mkdir dir="${project.build.directory}/generated-resources/antrun/META-INF/resources/javax.faces"/>
<concat destfile="${project.build.directory}/generated-resources/antrun/META-INF/resources/javax.faces/jsf-uncompressed.js" fixlastline="yes">
<filelist dir="src/main/js">
<file name="jsf.js"/>
</filelist>
<filelist dir="src/main/js">
<file name="mojarra.js"/>
</filelist>
</concat>
<get src="https://github.com/yui/yuicompressor/releases/download/v2.4.8/yuicompressor-2.4.8.jar" dest="yuicompressor.jar" usetimestamp="true" skipexisting="true"/>
<java jar="yuicompressor.jar" fork="true" failonerror="true"
args="-o ${project.build.directory}/generated-resources/antrun/META-INF/resources/javax.faces/jsf.js ${project.build.directory}/generated-resources/antrun/META-INF/resources/javax.faces/jsf-uncompressed.js"/>

</target>
</configuration>
<goals>
Expand Down Expand Up @@ -146,6 +129,40 @@
</dependency>
</dependencies>
</plugin>

<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
<version>1.5.1</version>
<executions>
<execution>
<id>minify-jsf-js</id>
<goals>
<goal>compress</goal>
</goals>
<configuration>
<nosuffix>true</nosuffix>
<preProcessAggregates>true</preProcessAggregates>
<aggregations>
<aggregation>
<includes>
<include>${project.basedir}/src/main/resources/META-INF/resources/javax.faces/jsf-uncompressed.js</include>
</includes>
<output>${project.build.directory}/generated-resources/yui/jsf.js</output>
</aggregation>
</aggregations>
<includes>
<include>*.js</include>
</includes>
<sourceDirectory>${project.build.directory}/generated-resources/yui</sourceDirectory>
<outputDirectory>${project.build.directory}/generated-resources/antrun/META-INF/resources/javax.faces/</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>




<!-- Adds the paths where the source and resources generated above was stored -->
<plugin>
Expand Down Expand Up @@ -437,6 +454,38 @@
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>

<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>net.alchim31.maven</groupId>
<artifactId>yuicompressor-maven-plugin</artifactId>
<versionRange>[1.5,)</versionRange>
<goals>
<goal>compress</goal>
</goals>
</pluginExecutionFilter>
<action>
<execute>
<runOnIncremental>false</runOnIncremental>
</execute>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>


Expand Down
184 changes: 0 additions & 184 deletions impl/src/main/js/mojarra.js

This file was deleted.

Loading