You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/01/02 19:36:42 UTC
[08/12] git commit: [flex-sdk] [refs/heads/release4.14.0] - custom
velocity NOTICE for Adobe fork
custom velocity NOTICE for Adobe fork
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/c0f11979
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/c0f11979
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/c0f11979
Branch: refs/heads/release4.14.0
Commit: c0f1197988d3a450e4955c9d2382dc63b95afa47
Parents: 9e5ca6e
Author: Alex Harui <ah...@apache.org>
Authored: Sun Dec 28 08:13:55 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Jan 2 10:33:23 2015 -0800
----------------------------------------------------------------------
modules/thirdparty/velocity/NOTICE | 1 +
modules/thirdparty/velocity/build/build.xml | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c0f11979/modules/thirdparty/velocity/NOTICE
----------------------------------------------------------------------
diff --git a/modules/thirdparty/velocity/NOTICE b/modules/thirdparty/velocity/NOTICE
index 09e9ae4..482c54a 100644
--- a/modules/thirdparty/velocity/NOTICE
+++ b/modules/thirdparty/velocity/NOTICE
@@ -1,2 +1,3 @@
This product includes software developed by The Apache Software Foundation (http://www.apache.org/).
+Modifications to the source code were developed by Adobe Systems Inc.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/c0f11979/modules/thirdparty/velocity/build/build.xml
----------------------------------------------------------------------
diff --git a/modules/thirdparty/velocity/build/build.xml b/modules/thirdparty/velocity/build/build.xml
index 223e691..174e3b6 100644
--- a/modules/thirdparty/velocity/build/build.xml
+++ b/modules/thirdparty/velocity/build/build.xml
@@ -325,8 +325,8 @@
<delete dir="${build.dest}/meta-inf" quiet="true"/>
<mkdir dir="${build.dest}/META-INF"/>
- <copy file="${FLEX_HOME}/LICENSE" todir="${build.dest}/META-INF"/>
- <copy file="${FLEX_HOME}/NOTICE" todir="${build.dest}/META-INF"/>
+ <copy file="${basedir}/../LICENSE" todir="${build.dest}/META-INF"/>
+ <copy file="${basedir}/../NOTICE" todir="${build.dest}/META-INF"/>
<jar jarfile="${FLEX_LIB}/velocity-dep-1.4-flex.jar">
<fileset dir="${build.dest}">