freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [7/7] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae'
Date Sat, 02 Jan 2016 14:15:56 GMT
Merge remote-tracking branch 'origin/2.3-gae'

Conflicts:
	src/main/resources/freemarker/version.properties


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

Branch: refs/heads/master
Commit: 8424e566753bf662bfe700d60030644d2ffa92b7
Parents: c620968 def5937
Author: ddekany <ddekany@apache.org>
Authored: Sat Jan 2 15:11:14 2016 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Sat Jan 2 15:13:12 2016 +0100

----------------------------------------------------------------------
 README                                          | 13 +++-
 RELEASE-NOTES                                   |  8 ++-
 build.xml                                       |  2 +-
 src/dist/bin/documentation/index.html           |  4 +-
 .../resources/freemarker/version.properties     | 12 ++--
 src/manual/en_US/book.xml                       | 69 ++++++++++++++------
 .../java/freemarker/template/VersionTest.java   | 18 +++++
 7 files changed, 94 insertions(+), 32 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8424e566/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index cdbdffc,06dc5eb..2dff2d2
--- a/build.xml
+++ b/build.xml
@@@ -823,7 -823,7 +823,7 @@@
    </parent>
    
    <groupId>org.freemarker</groupId>
--  <artifactId>freemarker-gae</artifactId>
++  <artifactId>freemarker</artifactId>
    <version>${mavenVersion}</version>
    
    <packaging>jar</packaging>

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/8424e566/src/main/resources/freemarker/version.properties
----------------------------------------------------------------------
diff --cc src/main/resources/freemarker/version.properties
index 3ae50f9,e209196..4080c2b
--- a/src/main/resources/freemarker/version.properties
+++ b/src/main/resources/freemarker/version.properties
@@@ -56,11 -57,11 +57,11 @@@
  #   continue working without modification or recompilation.
  # - When the major version number is increased, major backward
  #   compatibility violations are allowed, but still should be avoided.
- version=2.4.0-nightly_@timestampInVersion@
 -version=2.3.24-rc01-incubating
++version=2.4.0-nightly_@timestampInVersion@-incubating
  # This exists as oss.sonatype only allows SNAPSHOT and final releases,
- # so instead 2.3.21-rc01 and such we have to use 2.3.21-SNAPSHOT.
+ # so instead 2.3.21-rc01 and such we have to use 2.3.21-SNAPSHOT there.
  # For final releases it's the same as "version".
 -mavenVersion=2.3.24-rc01-incubating
 +mavenVersion=2.4.0-SNAPSHOT
  
  # Version string that conforms to OSGi
  # ------------------------------------
@@@ -73,7 -74,8 +74,8 @@@
  #   2.4.0.rc01
  #   2.4.0.pre01
  #   2.4.0.nightly_@timestampInVersion@
- versionForOSGi=2.4.0.nightly_@timestampInVersion@
+ # During Apache Incubation, "-incubating" is added to this string.
 -versionForOSGi=2.3.24.rc01-incubating
++versionForOSGi=2.4.0.nightly_@timestampInVersion@-incubating
  
  # Version string that conforms to legacy MF
  # -----------------------------------------
@@@ -91,7 -93,7 +93,7 @@@
  # "97 denotes "nightly", 98 denotes "pre", 99 denotes "rc" build.
  # In general, for the nightly/preview/rc Y of version 2.X, the versionForMf is
  # 2.X-1.(99|98).Y. Note the X-1.
- versionForMf=2.3.99.97
 -versionForMf=2.3.23.99.1
++versionForMf=2.3.97
  
  # The date of the build.
  # This should be automatically filled by the building tool (Ant).


Mime
View raw message