From fbde6ee7046b2cdc792d6fb1410f6e41898c5335 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Thu, 8 Nov 2018 02:09:54 +0100
Subject: [PATCH] Release 0.9

---
 build.gradle                              |  2 +-
 docs/index.adoc                           |  4 +---
 merlin-desktop-installer/README.md        |  4 ++--
 merlin-desktop-installer/merlin.install4j |  6 +++---
 merlin-desktop-installer/updates.xml      | 12 ++++++++++--
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index fba4eac9..2b0a0ff7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ allprojects {
     apply plugin: 'maven'
 
     group = 'de.micromata.merlin'
-    version = '0.9-SNAPSHOT'
+    version = '0.9'
 }
 
 subprojects {
diff --git a/docs/index.adoc b/docs/index.adoc
index cf8e123b..75ee1d60 100644
--- a/docs/index.adoc
+++ b/docs/index.adoc
@@ -33,9 +33,6 @@ The desktop application contains the whole server including all the magic templa
 By clicking on the button of the desktop application a web browser will be opened. You can do everything through this
 web server (working with templates as well as administration stuff such as looking in log files or configuration of the server.
 
-ToDo: Technologies, Java embedded, platforms, ...
-
-== First steps
 
 == Templates
 
@@ -131,3 +128,4 @@ The full source code of Merlin is hosted by Github:
 https://github.com/micromata/MerlinRunner/[Merlin on GitHub^] +
 [.text-left]
 
+ToDo: Technologies, Java embedded, platforms, ..., First steps
diff --git a/merlin-desktop-installer/README.md b/merlin-desktop-installer/README.md
index 70f095b4..d2e3424e 100644
--- a/merlin-desktop-installer/README.md
+++ b/merlin-desktop-installer/README.md
@@ -1,9 +1,9 @@
 # Building a new release
-1. Increase version in `build.gradlel`.
+1. Increase version in `build.gradle`.
 2. `gradle clean test dist`
 3. Run Install4j
    1. General settings -> Application Info -> Version __current version__
-   2. Installer -> Auto-Update Options -> Base url for installers: https://sourceforge.net/projects/pforge/files/Merlin/0.3/
+   2. Installer -> Auto-Update Options -> Base url for installers: https://sourceforge.net/projects/pforge/files/Merlin/0.9/
    3. Build project
 4. `gradle postDist`
 5. Testing
diff --git a/merlin-desktop-installer/merlin.install4j b/merlin-desktop-installer/merlin.install4j
index a88c04d3..d4436c57 100644
--- a/merlin-desktop-installer/merlin.install4j
+++ b/merlin-desktop-installer/merlin.install4j
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="7.0.8" transformSequenceNumber="7">
   <directoryPresets config="../../Install4j/Merlin/javafx-11" />
-  <application name="Merlin" distributionSourceDir="" applicationId="5115-4774-2533-4349" mediaDir="../../Install4j/Merlin" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="6" lzmaCompression="false" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="merlin" publisher="ProjectForge" publisherWeb="www.projectforge.org" version="0.9dev" allPathsRelative="true" backupOnSave="false" autoSave="false" convertDotsToUnderscores="true" macSignature="????" macVolumeId="4356b34315fd64b9" javaMinVersion="11" javaMaxVersion="" allowBetaVM="false" jdkMode="jdk" jdkName="JDK 1.8">
+  <application name="Merlin" distributionSourceDir="" applicationId="5115-4774-2533-4349" mediaDir="../../Install4j/Merlin" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.platform}_${compiler:sys.version}" compression="6" lzmaCompression="false" pack200Compression="false" excludeSignedFromPacking="true" commonExternalFiles="false" createMd5Sums="true" shrinkRuntime="true" shortName="merlin" publisher="Micromata GmbH" publisherWeb="www.micromata.de" version="0.9" allPathsRelative="true" backupOnSave="false" autoSave="false" convertDotsToUnderscores="true" macSignature="????" macVolumeId="4356b34315fd64b9" javaMinVersion="11" javaMaxVersion="" allowBetaVM="false" jdkMode="jdk" jdkName="JDK 1.8">
     <languages skipLanguageSelection="false" languageSelectionInPrincipalLanguage="false">
       <principalLanguage id="en" customLocalizationFile="" />
       <additionalLanguages>
@@ -104,7 +104,7 @@
       </iconImageFiles>
     </launcher>
   </launchers>
-  <installerGui installerType="1" addOnAppId="" suggestPreviousLocations="true" autoUpdateDescriptorUrl="https://github.com/kreinhard/merlin/raw/master/merlin-installer/updates.xml" useAutoUpdateBaseUrl="true" autoUpdateBaseUrl="https://sourceforge.net/projects/merlinrunner/files/0.8/">
+  <installerGui installerType="1" addOnAppId="" suggestPreviousLocations="true" autoUpdateDescriptorUrl="https://github.com/kreinhard/merlin/raw/master/merlin-desktop-installer/updates.xml" useAutoUpdateBaseUrl="true" autoUpdateBaseUrl="https://sourceforge.net/projects/merlinrunner/files/0.9/">
     <staticMembers script="" />
     <customCode />
     <autoUpdate useMinUpdatableVersion="false" minUpdatableVersion="" useMaxUpdatableVersion="false" maxUpdatableVersion="">
@@ -2294,7 +2294,7 @@ return true;</string>
       </installerScript>
     </unixInstaller>
   </mediaSets>
-  <buildIds buildAll="false">
+  <buildIds buildAll="true">
     <mediaSet refId="61" />
   </buildIds>
   <buildOptions verbose="false" faster="false" disableSigning="false" disableJreBundling="false" debug="false" />
diff --git a/merlin-desktop-installer/updates.xml b/merlin-desktop-installer/updates.xml
index 7121fa77..9b6347d5 100644
--- a/merlin-desktop-installer/updates.xml
+++ b/merlin-desktop-installer/updates.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<updateDescriptor baseUrl="https://sourceforge.net/projects/merlinrunner/files/0.8/">
-  <entry targetMediaFileId="61" updatableVersionMin="" updatableVersionMax="" fileName="merlin_macos_0_8.dmg" newVersion="0.8" newMediaFileId="61" fileSize="104611975" md5Sum="3fb7b08ecafa962b1cdfcf1d741c3b39" bundledJre="macosx-amd64-10.0.2" archive="false" singleBundle="true">
+<updateDescriptor baseUrl="https://sourceforge.net/projects/merlinrunner/files/0.9/">
+  <entry targetMediaFileId="61" updatableVersionMin="" updatableVersionMax="" fileName="merlin_macos_0_9.dmg" newVersion="0.9" newMediaFileId="61" fileSize="69648519" md5Sum="c181cebdf6338160e48ba6105ee61e1f" bundledJre="" archive="false" singleBundle="true">
+    <comment language="en" />
+    <comment language="de" />
+  </entry>
+  <entry targetMediaFileId="587" updatableVersionMin="" updatableVersionMax="" fileName="merlin_windows-x64_0_9.exe" newVersion="0.9" newMediaFileId="587" fileSize="76198912" md5Sum="6a17debedafb9c42468dc4fbf7155ca0" bundledJre="" archive="false" singleBundle="false">
+    <comment language="en" />
+    <comment language="de" />
+  </entry>
+  <entry targetMediaFileId="715" updatableVersionMin="" updatableVersionMax="" fileName="merlin_unix_0_9.sh" newVersion="0.9" newMediaFileId="715" fileSize="78882486" md5Sum="6332aa8e4e43fc36d28ce2edaf9404ea" bundledJre="" archive="false" singleBundle="false">
     <comment language="en" />
     <comment language="de" />
   </entry>