New release 0.7

kreinhard · Oct 31, 2018 · ecd64cb · ecd64cb
1 parent 41a19d6
commit ecd64cb
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 12 deletions.
diff --git a/docs/build.xml b/docs/build.xml
@@ -13,6 +13,11 @@
         <antcall target="asciidoc">
             <param name="file" value="index" />
         </antcall>
+        <copy todir="${merlin-webapp-docs}">
+            <fileset dir=".">
+                <include name="**/*.png"/>
+            </fileset>
+        </copy>
     </target>
 
     <!-- cd merlin-webapp; npm run build -->

diff --git a/merlin-installer/build.xml b/merlin-installer/build.xml
@@ -11,11 +11,11 @@
 
     <target name="pre-dist" description="Prepares a new release." depends="merlin-mvn, merlin-webapp">
         <echo>
-            ***********************************************************************************************
-            *** 1. Please refer for ensuring all test where OK (>= 44): target/site/surefire-report.html **
-            *** 2. Build installation files                                                              **
-            *** 3. ant post-dist                                                                         **
-            ***********************************************************************************************
+            **************************************************************************************************
+            *** 1. Please refer for ensuring all test where OK (>= 44): ../target/site/surefire-report.html **
+            *** 2. Build installation files                                                                 **
+            *** 3. ant post-dist                                                                            **
+            **************************************************************************************************
         </echo>
     </target>
 

diff --git a/merlin-installer/merlin.install4j b/merlin-installer/merlin.install4j
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="7.0.8" transformSequenceNumber="7">
   <directoryPresets config="./resources" />
-  <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.6" allPathsRelative="true" backupOnSave="false" autoSave="false" convertDotsToUnderscores="true" macSignature="????" macVolumeId="4356b34315fd64b9" javaMinVersion="1.8" 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="ProjectForge" publisherWeb="www.projectforge.org" version="0.7" allPathsRelative="true" backupOnSave="false" autoSave="false" convertDotsToUnderscores="true" macSignature="????" macVolumeId="4356b34315fd64b9" javaMinVersion="1.8" javaMaxVersion="" allowBetaVM="false" jdkMode="jdk" jdkName="JDK 1.8">
     <languages skipLanguageSelection="false" languageSelectionInPrincipalLanguage="false">
       <principalLanguage id="en" customLocalizationFile="" />
       <additionalLanguages>
@@ -74,7 +74,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.6/">
+  <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.7/">
     <staticMembers script="" />
     <customCode />
     <autoUpdate useMinUpdatableVersion="false" minUpdatableVersion="" useMaxUpdatableVersion="false" maxUpdatableVersion="">

diff --git a/merlin-installer/updates.xml b/merlin-installer/updates.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<updateDescriptor baseUrl="https://sourceforge.net/projects/merlinrunner/files/0.6/">
-  <entry targetMediaFileId="61" updatableVersionMin="" updatableVersionMax="" fileName="merlin_macos_0_6.dmg" newVersion="0.6" newMediaFileId="61" fileSize="102871175" md5Sum="bba9d901dc65237e31673cf4aaf81727" bundledJre="macosx-amd64-10.0.2" archive="false" singleBundle="true">
+<updateDescriptor baseUrl="https://sourceforge.net/projects/merlinrunner/files/0.7/">
+  <entry targetMediaFileId="61" updatableVersionMin="" updatableVersionMax="" fileName="merlin_macos_0_7.dmg" newVersion="0.7" newMediaFileId="61" fileSize="104759431" md5Sum="8127dbe0496eb44b4a9eeea40c2db134" bundledJre="macosx-amd64-10.0.2" archive="false" singleBundle="true">
     <comment language="en" />
     <comment language="de" />
   </entry>

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <revision>0.7-SNAPSHOT</revision>
+        <revision>0.7</revision>
         <skip.assembly>true</skip.assembly>
         <skip.site>true</skip.site>
     </properties>
@@ -97,11 +97,11 @@
         </dependency>
 
         <!-- Intellij finds no tests, if junit-jupiter-engine is given as dependency in pom.xml, but required by surefire. -->
-        <!--dependency>
+        <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
             <version>5.3.1</version>
             <scope>test</scope>
-        </dependency-->
+        </dependency>
     </dependencies>
 </project>