You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/03/15 20:04:43 UTC
[4/5] incubator-freemarker git commit: Fixed problem where the
LICENSE in the jar was accidentally "shadowed" by the LICENSE for the source
Fixed problem where the LICENSE in the jar was accidentally "shadowed" by the LICENSE for the source
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/43564859
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/43564859
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/43564859
Branch: refs/heads/2.3
Commit: 43564859db4bec23e161c6fa5a32882e8bd9e40a
Parents: 1ab9ae3
Author: ddekany <dd...@apache.org>
Authored: Wed Mar 15 20:52:36 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Wed Mar 15 20:52:36 2017 +0100
----------------------------------------------------------------------
build.xml | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/43564859/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index d81a9b9..3ac2384 100644
--- a/build.xml
+++ b/build.xml
@@ -367,13 +367,6 @@
verify="yes" stubversion="1.2"
/>
- <!-- We don't have this file in 2.4.X... yet?
- <copy
- file="build/classes/freemarker/core/SecureRendererImpl.class"
- tofile="build/classes/freemarker/core/SecureRendererImpl.clazz"
- />
- -->
-
<copy toDir="build/classes">
<fileset dir="src/main/resources"
excludes="
@@ -387,12 +380,11 @@
/>
</copy>
<copy toDir="build/classes/META-INF">
- <fileset dir="." includes="LICENSE, DISCLAIMER" />
+ <fileset dir="." includes="DISCLAIMER" />
</copy>
<copy toDir="build/classes/META-INF">
<fileset dir="src/dist/jar/META-INF" includes="*" />
</copy>
-
<delete dir="build/src-main-java-filtered" />
</target>