From f871237b3101c9ce531b6b675a77d39793179644 Mon Sep 17 00:00:00 2001
From: Pradeep Murugesan <pradeepmurugesan@outlook.com>
Date: Thu, 13 Apr 2017 12:30:54 +0200
Subject: [PATCH] converted the readme from txt to md and added the build
 status from travis

---
 README => README.md | 117 +++++++++++++++++++++++++-------------------
 build.xml           |  10 ++--
 2 files changed, 72 insertions(+), 55 deletions(-)
 rename README => README.md (77%)

diff --git a/README b/README.md
similarity index 77%
rename from README
rename to README.md
index c5cfc1e3a..7b1b03951 100644
--- a/README
+++ b/README.md
@@ -1,34 +1,35 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-===============================================================================
-
- Apache FreeMarker {version}
+```
 
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+```
+
+
+Apache FreeMarker {version}   [![Build Status](https://travis-ci.org/apache/incubator-freemarker.svg?branch=2.3-gae)](https://travis-ci.org/apache/incubator-freemarker)
+===========================
  For the latest version or to report bugs visit:
 
  http://freemarker.org/
 
-===============================================================================
 
-  DISCLAIMER
 
+DISCLAIMER
+==========
   Apache FreeMarker is an effort undergoing incubation at The Apache
   Software Foundation (ASF). Incubation is required of all newly accepted
   projects until a further review indicates that the infrastructure,
@@ -74,6 +75,7 @@ Installing
 
 If you are using Maven, just add this dependency:
 
+```xml
   <!--
   Attention: Be sure nothing pulls in an old dependency with groupId
   "freemarker" (without the "org."), because then you will end up with
@@ -84,7 +86,7 @@ If you are using Maven, just add this dependency:
     <artifactId>freemarker</artifactId>
     <version>{version}</version>
   </dependency>
-
+```
 Otherwise simply copy freemarker.jar to a location where your Java
 application's ClassLoader will find it. For example, if you are using
 FreeMarker in a web application, you probably want to put
@@ -111,41 +113,58 @@ In the binary release, open documentation/index.html, and you will find the
 link.
 
 
-Building
---------
+Local setup
+===========
+
+First of all, if you haven't yet, download the source release, or checkout FreeMarker from the source code repository.
 
-First of all, if you haven't yet, download the source release, or check
-out FreeMarker from the source code repository.
+You need 
+1. JDK 8(!), 
+2. Apache Ant and 
+3. Ivy 
 
-You need JDK 8(!), Apache Ant and Ivy to be installed. (As of this writing
-it was tested with Ant 1.8.1 and Ivy 2.3.0.) To install Ivy (but be sure
-it's not already installed), issue `ant download-ivy`, which will copy it
-under ~/.ant/lib. Alternatively, you can copy ivy-<version>.jar into your
-Ant home directory "lib" subfolder manually.
+to be installed. (As of this writing it was tested with Ant 1.8.1 and Ivy 2.3.0.). 
 
-It's recommended to copy build.properties.sample into build.properties, and
-edit its content to fit your system. (Although basic jar building should
-succeeds without the build.properties file too.)
+Ivy Installation
+---------------------------
+To install Ivy (but be sure it's not already installed).
+Issue 
+```
+ant download-ivy
+``` 
+which will copy it under ~/.ant/lib. Alternatively, you can copy ivy-<version>.jar into your Ant home directory "lib" subfolder manually.
 
-To build freemarker.jar, just issue "ant" in the project root
-directory, and it should download all dependencies automatically and
-build freemarker.jar.
 
-If later you change the dependencies in ivy.xml, or otherwise want to
-re-download some of them, it will not happen automatically anymore.
-You have to issue "ant update-deps" for that.
+Building
+---------------------------
 
+To build freemarker.jar, just issue 
+```
+ant
+```
+in the project root directory, and it should download all dependencies automatically and build freemarker.jar. 
 
-Eclipse and other IDE setup
+It's recommended to copy build.properties.sample into build.properties, and edit its content to fit your system. (Although basic jar building should succeeds without the build.properties file too.)
+
+Managing dependencies
 ---------------------------
+If later you change the dependencies in ivy.xml, or otherwise want to re-download some of them, it will not happen automatically anymore. Issue 
+```
+ant update-deps
+```
+
+
+Eclipse and other IDE setup
+===========================
 
-Below you find the step-by-step setup for Eclipse Mars.1. If you are using a
-different version or an entierly different IDE, still read this, and try to
-apply it to your development environment:
+Below you find the step-by-step setup for Eclipse Mars.1. If you are using a different version or an entierly different IDE, still read this, and try to apply it to your development environment:
 
 - Install Ant and Ivy, if you haven't yet; see earlier.
-- From the command line, run `ant clean jar ide-dependencies`. (Note that
-  now the folders "ide-dependencies", "build/generated-sources" and "META-INF"
+- From the command line, run 
+  ```
+  ant clean jar ide-dependencies
+  ```
+   (Note that now the folders "ide-dependencies", "build/generated-sources" and "META-INF"
   were created.)
 - Start Eclipse
 - You may prefer to start a new workspace (File -> "Switch workspace"), but
diff --git a/build.xml b/build.xml
index cf8be0a1b..861a1b532 100644
--- a/build.xml
+++ b/build.xml
@@ -54,8 +54,6 @@
   </condition>
   <condition property="has.all.explicit.boot.classpaths">
     <and>
-      <isset property="has.explicit.boot.classpath.j2se1.5"/>
-      <isset property="has.explicit.boot.classpath.j2se1.6"/>
       <isset property="has.explicit.boot.classpath.j2se1.8"/>
     </and>
   </condition>
@@ -670,7 +668,7 @@
     <!-- Copy txt-s -->
     <copy todir="${dist.bin.dir}" includeEmptyDirs="no">
       <fileset dir="." defaultexcludes="no">
-        <include name="README" />
+        <include name="README.md" />
         <!-- LICENSE is binary-distribution-specific, and is copied later. -->
         <include name="NOTICE" />
         <include name="DISCLAIMER" />
@@ -678,7 +676,7 @@
       </fileset>
     </copy>
     <replace
-      file="${dist.bin.dir}/README"
+      file="${dist.bin.dir}/README.md"
       token="{version}"
       value="${version}"
     />
@@ -719,7 +717,7 @@
     <!-- Copy extensionless files: -->
     <copy todir="${dist.src.dir}" includeEmptyDirs="no">
       <fileset dir="." defaultexcludes="no">
-        <include name="README" />
+        <include name="README.md" />
         <include name="LICENSE" />
         <include name="NOTICE" />
         <include name="DISCLAIMER" />
@@ -727,7 +725,7 @@
       </fileset>
     </copy>
     <replace
-      file="${dist.src.dir}/README"
+      file="${dist.src.dir}/README.md"
       token="{version}"
       value="${version}"
     />