commit d9e32d54cbfd5642818d099a773902cd3f8132f1 Author: Karsten Loesing karsten.loesing@gmx.net Date: Fri Oct 28 14:53:16 2016 +0200

Prepare for 1.1.0 release. --- .gitignore | 2 +- CHANGELOG.md | 8 +++++--- build.xml | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore index a3acc9a..7343096 100644 --- a/.gitignore +++ b/.gitignore @@ -14,5 +14,5 @@ cobertura.ser *~ build.properties -/index.json* +/index/

diff --git a/CHANGELOG.md b/CHANGELOG.md index a19145f..523e0b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 1.1.0 - 2016-10-XX +# Changes in version 1.1.0 - 2016-10-28

* Major changes - Provide a facility to synchronize descriptors from other CollecTor @@ -12,8 +12,8 @@ * Medium changes - Replace four properties for configuring where to write descriptors by a single 'OutPath' property. - - Introduced *Sources and *Origins properties to simplify - data source definition. + - Introduce *Sources and *Origins properties to simplify data + source definition. - Remove six properties for specifying what relay descriptors to download and replace them with hard-coded 'true' values.

@@ -22,6 +22,8 @@ - Add modular file persistence to write descriptors to the out/ and recent/ subdirectories.. - Exclude temporary files from index.json* files. + - Expand the operator's guide in INSTALL.md. +

# Changes in version 1.0.2 - 2016-10-07

diff --git a/build.xml b/build.xml index d84a86a..90a1888 100644 --- a/build.xml +++ b/build.xml @@ -1,12 +1,12 @@ <project default="compile" name="CollecTor" basedir="."> - <property name="release.version" value="1.1.0-dev" /> + <property name="release.version" value="1.1.0" /> <property name="name" value="CollecTor"/> <property name="descriptorversion" value="1.5.0" /> <property name="source-and-target-java-version" value="1.7" /> <property name="sources" value="src/main/java"/> <property name="resources" value="src/main/resources/"/> <property name="webappsources" value="src/main/webapp"/> - <property name="generated" value="generated/"/> + <property name="generated" value="generated"/> <property name="dist" value="${generated}/dist"/> <property name="testresult" value="${generated}/test-results"/> <property name="testsources" value="src/test/java"/>