114 lines
6.7 KiB
Diff
114 lines
6.7 KiB
Diff
diff -Nru mojarra-2.2.13/common/ant/dependencies.xml mojarra-2.2.13.yuicompressor/common/ant/dependencies.xml
|
|
--- mojarra-2.2.13/common/ant/dependencies.xml 2016-09-29 09:11:08.759142705 +0200
|
|
+++ mojarra-2.2.13.yuicompressor/common/ant/dependencies.xml 2016-09-29 09:12:48.618243338 +0200
|
|
@@ -82,7 +82,6 @@
|
|
<property name="javax-inject.version" value="1"/>
|
|
<property name="javax-enterprise.version" value="1.1"/>
|
|
<property name="maven.repository.importer.version" value="1.2"/>
|
|
- <property name="yuicompressor.version" value="2.4.8"/>
|
|
|
|
<property name="central.maven2" value="http://repo1.maven.org/maven2" />
|
|
<property name="redhat.maven2" value="https://repository.jboss.org/nexus/content/repositories/thirdparty-releases"/>
|
|
@@ -110,14 +109,12 @@
|
|
<property name="jsp.home" value="${dependency.base.dir}/jsp-${jsp.api.version}"/>
|
|
<property name="jstl.home" value="${dependency.base.dir}/jstl-${jstl.api.version}"/>
|
|
<property name="annotation.home" value="${dependency.base.dir}/annotation-${annotation.api.version}"/>
|
|
- <property name="yuicompressor.home" value="${dependency.base.dir}/yuicompressor-${yuicompressor.version}"/>
|
|
<property name="junit.jar" value="${dependency.jar.dir}/junit-${junit.version}.jar"/>
|
|
<property name="htmlunit.jar" value="${dependency.jar.dir}/htmlunit-${htmlunit.version}.jar"/>
|
|
<property name="commons-beanutils.jar" value="${dependency.jar.dir}/commons-beanutils-${beanutils.version}.jar"/>
|
|
<property name="commons-digester.jar" value="${dependency.jar.dir}/commons-digester-${digester.version}.jar"/>
|
|
<property name="commons-collections.jar" value="${dependency.jar.dir}/commons-collections-${collections.version}.jar"/>
|
|
<property name="commons-logging.jar" value="${dependency.jar.dir}/commons-logging-${logging.version}.jar"/>
|
|
- <property name="yuicompressor.jar" value="${dependency.jar.dir}/yuicompressor.jar"/>
|
|
<property name="tlddoc.jar" value="${dependency.jar.dir}/tlddoc-${taglibdoc.version}.jar"/>
|
|
<property name="vdldoc.jar" value="${dependency.jar.dir}/vdldoc-${vdldoc.version}.jar"/>
|
|
<property name="jsdoc.jar" value="${dependency.jar.dir}/jsdoc-${jsdoc.version}.jar"/>
|
|
diff -Nru mojarra-2.2.13/jsf-ri/build-pre-maven-rename.xml mojarra-2.2.13.yuicompressor/jsf-ri/build-pre-maven-rename.xml
|
|
--- mojarra-2.2.13/jsf-ri/build-pre-maven-rename.xml 2016-02-04 03:54:54.000000000 +0100
|
|
+++ mojarra-2.2.13.yuicompressor/jsf-ri/build-pre-maven-rename.xml 2016-09-29 09:14:50.341271267 +0200
|
|
@@ -87,7 +87,6 @@
|
|
|
|
<property name="dependency.base.dir" value="${jsf.build.home}/dependencies"/>
|
|
<property name="dependency.jar.dir" value="${dependency.base.dir}/jars"/>
|
|
- <property name="yuicompressor.jar" value="${dependency.jar.dir}/yuicompressor.jar"/>
|
|
<property name="build.javadocs.dir" value="${build.dir}/javadocs"/>
|
|
<property name="javadoc.private" value="true"/>
|
|
<property name="javadoc.protected" value="false"/>
|
|
@@ -344,7 +343,7 @@
|
|
</fileset>
|
|
</copy>
|
|
|
|
- <concat destfile="${build.classes.dir}/META-INF/resources/javax.faces/jsf-uncompressed.js" fixlastline="yes">
|
|
+ <concat destfile="${build.classes.dir}/META-INF/resources/javax.faces/jsf.js" fixlastline="yes">
|
|
<filelist dir="${api.dir}/src/main/resources">
|
|
<file name="jsf.js"/>
|
|
</filelist>
|
|
@@ -353,8 +352,6 @@
|
|
</filelist>
|
|
</concat>
|
|
|
|
- <java jar="${yuicompressor.jar}" fork="true" failonerror="true"
|
|
- args="-o ${build.classes.dir}/META-INF/resources/javax.faces/jsf.js ${build.classes.dir}/META-INF/resources/javax.faces/jsf-uncompressed.js"/>
|
|
<!--
|
|
RELEASE_PENDING (rlubke,driscoll)
|
|
For now these are copied to the root of the jsf-impl.jar, but
|
|
diff -Nru mojarra-2.2.13/jsf-ri/build-source.xml mojarra-2.2.13.yuicompressor/jsf-ri/build-source.xml
|
|
--- mojarra-2.2.13/jsf-ri/build-source.xml 2016-02-04 03:54:54.000000000 +0100
|
|
+++ mojarra-2.2.13.yuicompressor/jsf-ri/build-source.xml 2016-09-29 09:16:01.881761291 +0200
|
|
@@ -83,7 +83,6 @@
|
|
|
|
<property name="dependency.base.dir" value="${jsf.build.home}/dependencies"/>
|
|
<property name="dependency.jar.dir" value="${dependency.base.dir}/jars"/>
|
|
- <property name="yuicompressor.jar" value="${dependency.jar.dir}/yuicompressor.jar"/>
|
|
|
|
<path id="impl.compile.classpath">
|
|
<pathelement location="${jsf-api-intermediate.jar}"/>
|
|
@@ -310,7 +309,7 @@
|
|
</fileset>
|
|
</copy>
|
|
|
|
- <concat destfile="${build.classes.dir}/META-INF/resources/javax.faces/jsf-uncompressed.js" fixlastline="yes">
|
|
+ <concat destfile="${build.classes.dir}/META-INF/resources/javax.faces/jsf.js" fixlastline="yes">
|
|
<filelist dir="${api.dir}/src/main/resources">
|
|
<file name="jsf.js"/>
|
|
</filelist>
|
|
@@ -319,8 +318,6 @@
|
|
</filelist>
|
|
</concat>
|
|
|
|
- <java jar="${yuicompressor.jar}" fork="true" failonerror="true"
|
|
- args="-o ${build.classes.dir}/META-INF/resources/javax.faces/jsf.js ${build.classes.dir}/META-INF/resources/javax.faces/jsf-uncompressed.js"/>
|
|
<!--
|
|
RELEASE_PENDING (rlubke,driscoll)
|
|
For now these are copied to the root of the javax.faces.jar, but
|
|
diff -Nru mojarra-2.2.13/jsf-ri/build.xml mojarra-2.2.13.yuicompressor/jsf-ri/build.xml
|
|
--- mojarra-2.2.13/jsf-ri/build.xml 2016-02-04 03:54:54.000000000 +0100
|
|
+++ mojarra-2.2.13.yuicompressor/jsf-ri/build.xml 2016-09-29 09:17:35.514167424 +0200
|
|
@@ -84,7 +84,6 @@
|
|
|
|
<property name="dependency.base.dir" value="${jsf.build.home}/dependencies"/>
|
|
<property name="dependency.jar.dir" value="${dependency.base.dir}/jars"/>
|
|
- <property name="yuicompressor.jar" value="${dependency.jar.dir}/yuicompressor.jar"/>
|
|
<property name="build.javadocs.dir" value="${build.dir}/javadocs"/>
|
|
<property name="javadoc.private" value="true"/>
|
|
<property name="javadoc.protected" value="false"/>
|
|
@@ -340,7 +339,7 @@
|
|
</fileset>
|
|
</copy>
|
|
|
|
- <concat destfile="${build.classes.dir}/META-INF/resources/javax.faces/jsf-uncompressed.js" fixlastline="yes">
|
|
+ <concat destfile="${build.classes.dir}/META-INF/resources/javax.faces/jsf.js" fixlastline="yes">
|
|
<filelist dir="${api.dir}/src/main/resources">
|
|
<file name="jsf.js"/>
|
|
</filelist>
|
|
@@ -349,8 +348,6 @@
|
|
</filelist>
|
|
</concat>
|
|
|
|
- <java jar="${yuicompressor.jar}" fork="true" failonerror="true"
|
|
- args="-o ${build.classes.dir}/META-INF/resources/javax.faces/jsf.js ${build.classes.dir}/META-INF/resources/javax.faces/jsf-uncompressed.js"/>
|
|
<!--
|
|
RELEASE_PENDING (rlubke,driscoll)
|
|
For now these are copied to the root of the javax.faces.jar, but
|