Adapt to new updater without JRE

collect-earth/collect-earth-installer/src/main/resources/CollectEarthUpdater.xml

@@ -10,23 +10,14 @@
     <requireInstallationByRootUser>0</requireInstallationByRootUser>
     <requestedExecutionLevel>asInvoker</requestedExecutionLevel>
     <componentList>
-    	<!--  IN THE VERSION 1.20.0 (July 2023) the JRE was updated to version 11. We need to ass it to the updater -->
+    	<!--  IN THE VERSION 1.20.0 (July 2023) the JRE was updated to version 11. We need to ass it to the updater
     	<include>
 			<file>java.xml</file>
 		</include>
 		<!--  PROBABLY REMOVE THIS AFTER A YEAR! -->
 
         <component>
-	        <!--  IN THE VERSION 1.20.0 (July 2023) the JRE was updated to version 11. We need to ass it to the updater -->
-			<preInstallationActionList>
-		        <deleteFile>
-		        	<path>${installdir}/java</path>
-		        	<progressText>Removing old JRE</progressText>
-		        	<abortOnError>0</abortOnError>
-		        </deleteFile>
-		    </preInstallationActionList>
-			<!--  PROBABLY REMOVE THIS AFTER A YEAR! -->
-
+
 
             <name>default</name>
             <description>Default Component</description>
@@ -177,6 +168,7 @@
 
     <initializationActionList>
 
+		<!--  Not necessary anymore if java.xml component is not included
         <setInstallerVariable>
             <name>java_launcher_jar</name>
             <progressText>Creating Launcher</progressText>
@@ -192,7 +184,7 @@
             <progressText>Set launcher name</progressText>
             <value>CollectEarth-launcher.${platform_exec_suffix}</value>
         </setInstallerVariable>
-
+ 		-->
 
 		<if>
           <!-- The updater in osx comes as a ZIP that gets decompressed, so we need to go up an extra level -->
@@ -272,6 +264,7 @@
 
 
     </initializationActionList>
+    <!--  This was only necessary when update to the first version of JRE11 ( for versions older than 1.20.6... they use the colletEarthUpdateMvn.xml file
     <postInstallationActionList>
 		<substitute>
             <files>${installdir}/earth.properties_initial;${installdir}/earth.properties_forced_update</files>
@@ -287,6 +280,7 @@
             <text>You need to quit Collect Earth and re-start it for the update to finalize!</text>
         </showInfo>
     </postInstallationActionList>
+     -->
     <compressionAlgorithm>lzma</compressionAlgorithm>
     <defaultUnixDirectoryPermissions>777</defaultUnixDirectoryPermissions>
     <defaultUnixFilePermissions>777</defaultUnixFilePermissions>

collect-earth/collect-earth-installer/src/main/resources/collectEarthUpdateJRE11.xml

@@ -0,0 +1,37 @@
+<installerInformation>
+<!--
+     This file should be modified to fit your application and
+     placed at the URL specified in the update.ini file
+-->
+    <versionId>BUILD_NUMBER</versionId> <!-- When changing this version make sure to have the same one in update.ini and rebuild the autoupdater ! -->
+    <!--
+    version HERE WE CAN use " major" to mark that the user should be warned of the new update
+    This is used to indicate if the user should be prompted or not about the new updater.
+	major Means the user will be notified automatically.
+	minor (or nothing) means that the user can update COllect Earth but he will not be notified when Collect Earth starts that there is a new version
+	-->
+    <version>PROJECT_VERSION major</version>
+    <platformFileList>
+        <platformFile>
+            <filename>collect-earth-installer-PROJECT_VERSION-windows-updater.exe</filename>
+            <platform>windows</platform>
+        </platformFile>
+         <platformFile>
+            <filename>collect-earth-installer-PROJECT_VERSION-linux-updater.run</filename>
+            <platform>linux</platform>
+        </platformFile>
+        <platformFile>
+            <filename>collect-earth-installer-PROJECT_VERSION-linux-x64-updater.run</filename>
+            <platform>linux-x64</platform>
+        </platformFile>
+        <platformFile>
+            <filename>collect-earth-installer-PROJECT_VERSION-osx-updater.zip</filename>
+            <platform>osx</platform>
+        </platformFile>
+    </platformFileList>
+    <downloadLocationList>
+        <downloadLocation>
+            <url>https://oss.sonatype.org/service/local/repositories/releases/content/org/openforis/collect/earth/collect-earth-installer/PROJECT_VERSION/</url>
+        </downloadLocation>
+    </downloadLocationList>
+</installerInformation>