Merge remote-tracking branch 'origin/2.3.24-gae-stabilization' into 2.3
diff --git a/build.xml b/build.xml
index 676eb1c..faa38ff 100644
--- a/build.xml
+++ b/build.xml
@@ -342,7 +342,10 @@
/>
</copy>
<copy toDir="build/classes/META-INF">
- <fileset dir="." includes="LICENSE, NOTICE, DISCLAIMER" />
+ <fileset dir="." includes="LICENSE, DISCLAIMER" />
+ </copy>
+ <copy toDir="build/classes/META-INF">
+ <fileset dir="src/dist/jar/META-INF" includes="*" />
</copy>
</target>
diff --git a/src/dist/jar/META-INF/NOTICE b/src/dist/jar/META-INF/NOTICE
new file mode 100644
index 0000000..53915b3
--- /dev/null
+++ b/src/dist/jar/META-INF/NOTICE
@@ -0,0 +1,22 @@
+===========================================================================
+
+Apache FreeMarker
+Copyright 2015-2016 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+===========================================================================
+
+FreeMarker, both in its source code and binary form (freemarker.jar)
+includes files that were developed outside the FreeMarker project, and
+are licensed by the Apache Software Foundation under the Apache License,
+Version 2.0. This is the same license as the license of FreeMaker. These
+files in the FreeMarker binary (inside the jar file) are:
+
+ freemarker/ext/jsp/web-app_2_2.dtd
+ freemarker/ext/jsp/web-app_2_3.dtd
+ freemarker/ext/jsp/web-jsptaglibrary_1_1.dtd
+ freemarker/ext/jsp/web-jsptaglibrary_1_2.dtd
+
+===========================================================================
