freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [3/3] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3.24-gae-stabilization' into 2.3
Date Wed, 13 Jan 2016 22:39:55 GMT
Merge remote-tracking branch 'origin/2.3.24-gae-stabilization' into 2.3

Conflicts:
	build.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/a3413702
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a3413702
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a3413702

Branch: refs/heads/2.3
Commit: a34137028a5793336741357bd7500b773b8e232d
Parents: ce1dc19 550ac15
Author: ddekany <ddekany@apache.org>
Authored: Wed Jan 13 23:37:33 2016 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Wed Jan 13 23:37:33 2016 +0100

----------------------------------------------------------------------
 build.xml                        | 34 +++++++++++++++++++++++-----------
 src/dist/javadoc/META-INF/NOTICE |  5 +++++
 2 files changed, 28 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/a3413702/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 154ac9e,d5e78f0..676eb1c
--- a/build.xml
+++ b/build.xml
@@@ -31,6 -31,9 +31,9 @@@
    <!-- Properties                                                         -->
    <!-- ================================================================== -->
  
+   <!-- Maven project coordinates: -->
+   <property name="mavenGroupId" value="org.freemarker" />
 -  <property name="mavenArtifactId" value="freemarker-gae" />
++  <property name="mavenArtifactId" value="freemarker" />
    <!-- Ivy project coordinates: -->
    <property name="moduleOrg" value="org.freemarker" />
    <property name="moduleName" value="freemarker" />


Mime
View raw message