Merge pull request #2013 from SiboVG/unstable

Bump release version to 22.02

README.md

@@ -1,9 +1,11 @@
 OpenRocket
 ==========
 ![Build Status](https://github.com/openrocket/openrocket/actions/workflows/build.yml/badge.svg)
-[![SourceSpy Dashboard](https://sourcespy.com/shield.svg)](https://sourcespy.com/github/openrocketopenrocket/)
+[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
+
+![GitHub release](https://img.shields.io/github/release/openrocket/openrocket.svg)
+[![Github Releases (by release)](https://img.shields.io/github/downloads/openrocket/openrocket/latest/total.svg)](https://GitHub.com/openrocket/openrocket/releases/)
 
-Overview
 --------
 
 OpenRocket is a free, fully featured model rocket simulator that allows you to design and simulate your rockets before actually building and flying them.
@@ -24,12 +26,8 @@ Read more about it on the [OpenRocket Wiki](http://wiki.openrocket.info).
 
 Installers
 ----------
-OpenRocket maintains an installer for installing the software and Java runtime. You can find the installer below.
+OpenRocket maintains an installer for installing the software and Java runtime. You can find the installers on [our
-
+website](https://openrocket.info/downloads.html).
-* [OpenRocket 15.03 Installer (Windows)](https://github.com/openrocket/openrocket/releases/download/release-15.03/OpenRocket-15.03-installer.exe)
-* [OpenRocket 15.03 Installer (Mac OS)](https://github.com/openrocket/openrocket/releases/download/release-15.03/OpenRocket-15.03.dmg)
-* [OpenRocket 15.03 Installer (Linux)](https://github.com/openrocket/openrocket/releases/download/release-15.03/OpenRocket-15.03.AppImage)
-* [OpenRocket 15.03 JAR file](https://github.com/openrocket/openrocket/releases/download/release-15.03/OpenRocket-15.03.jar)
 
 Release Notes
 -------------

ReleaseNotes.md

@@ -13,6 +13,13 @@ Release Notes
 
 </div>
 
+<div id="22.02">
+
+OpenRocket 22.02 (2023-02-XX)
+------------------------
+
+</div>
+
 <div id="22.02.RC.01">
 
 OpenRocket 22.02.RC.01 (2023-01-27)

core/resources/build.properties

@@ -1,6 +1,6 @@
 
 # The OpenRocket build version
-build.version=22.02.RC.01
+build.version=22.02
 
 # The copyright year for the build. Displayed in the about dialog.
 # Will show as Copyright 2013-${build.copyright}

core/src/net/sf/openrocket/communication/WelcomeInfoRetriever.java

@@ -6,6 +6,7 @@ import net.sf.openrocket.util.BuildProperties;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
 
+import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
@@ -21,9 +22,14 @@ public abstract class WelcomeInfoRetriever {
     public static String retrieveWelcomeInfo(String version) throws IOException {
         ClassLoader cl = WelcomeInfoRetriever.class.getClassLoader();
         InputStream in = cl.getResourceAsStream("ReleaseNotes.md");
+        if (in == null) {
+            // Try to load the file from the file system (only really useful when running the unit tests directly from your IDE)
+            File f = new File("../ReleaseNotes.md");
+            in = f.toURI().toURL().openStream();
             if (in == null) {
                 throw new FileNotFoundException("ReleaseNotes.md not found");
             }
+        }
         InputSource source = new InputSource(new InputStreamReader(in));
         ReleaseNotesHandler handler = new ReleaseNotesHandler(version);
         WarningSet warnings = new WarningSet();

core/test/net/sf/openrocket/communication/WelcomeInfoTest.java

@@ -9,16 +9,12 @@ import static org.junit.Assert.assertTrue;
 
 public class WelcomeInfoTest extends BaseTestCase {
 
-    /**
-     * Note: this unit test will fail if you don't run it using 'ant unittest', because otherwise
-     * it can't load the ReleaseNotes.md file.
-     */
     @Test
     public void testWelcomeInfo() throws Exception {
         // Test the welcome info for the current build version
         String welcomeInfo = WelcomeInfoRetriever.retrieveWelcomeInfo();
-        assertNotNull(welcomeInfo);
+        assertNotNull("Current release version not present in release notes", welcomeInfo);
-        assertTrue(welcomeInfo.length() > 0);
+        assertTrue("Body of release notes is empty", welcomeInfo.length() > 0);
 
         // Test the release info for a bogus release version
         welcomeInfo = WelcomeInfoRetriever.retrieveWelcomeInfo("bogus release");

install4j/22.02/openrocket-22.02.install4j

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <install4j version="10.0.4" transformSequenceNumber="10">
   <directoryPresets config="../../core/resources/pix/icon" />
-  <application name="OpenRocket 22.02.RC.01" applicationId="8434-9327-1469-6373" mediaDir="media" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.version}_${compiler:sys.platform}" shortName="OpenRocket" publisher="OpenRocket" publisherWeb="http://openrocket.info" version="22.02.RC.01" allPathsRelative="true" convertDotsToUnderscores="false" macVolumeId="5f58a2be20d8e22f" javaMinVersion="11" javaMaxVersion="11" jdkMode="jdk" jdkName="JDK 11.0">
+  <application name="OpenRocket" applicationId="8434-9327-1469-6373" mediaDir="media" mediaFilePattern="${compiler:sys.shortName}_${compiler:sys.version}_${compiler:sys.platform}" shortName="OpenRocket" publisher="OpenRocket" publisherWeb="http://openrocket.info" version="22.02" allPathsRelative="true" convertDotsToUnderscores="false" macVolumeId="5f58a2be20d8e22f" javaMinVersion="11" javaMaxVersion="11" jdkMode="jdk" jdkName="JDK 11.0">
     <codeSigning macEnabled="true" macPkcs12File="./code_signing/OpenRocket_macOS.p12" windowsEnabled="true" windowsPkcs12File="./code_signing/OpenRocket_Windows.pfx" macNotarize="true" appleId="sibo.vangool@hotmail.com" />
     <jreBundles jdkProviderId="Liberica" release="11/11.0.17+7">
       <modules>