Merge pull request #232 from AtlasMediaGroup/main

Merge from main into development

SECURITY.md

@@ -10,15 +10,15 @@ In terms of plugin releases, our support matrix is as follows:
 These versions are currently actively supported by our team, and you should expect security patches where appropriate for these versions. 
 
 | Version             | Supported  | Support End:                   |
-| ------------------- | ------------------ | ------------------------------ |
-| 2021.09             | :white_check_mark: | No Earlier than December 2021    |
+| ------------------- | ---------- | ------------------------------ |
+| 2022.02             | ✅         | No Earlier than May 2022       |
 
 ### Legacy Supported
 These versions are no longer under active development, however we will look to release critical secuirty patches where appropriate. 
 
 | Version             | Supported  | Support End: |
-| ------------------- | ------------------ | ------------ |
-| 2021.06             | :white_check_mark: | October 2021 |
+| ------------------- | ---------- | ------------ |
+| 2021.09             | ⚠️         | April 2022   |
 
 
 ### No Longer Supported
@@ -26,8 +26,9 @@ These versions are no longer supported at all. It is strongly advised to update
 
 | Version             | Supported          | Support Ended:      |
 | ------------------- | ------------------ | ------------------- |
-| 2021.05             | :white_check_mark: | September 2021      |
-| 2021.04             | :white_check_mark: | July 2021           |
+| 2021.06             | :x:                | October 2021        |
+| 2021.05             | :x:                | September 2021      |
+| 2021.04             | :x:                | July 2021           |
 | 2021.02             | :x:                | 6 June 2021         |
 | 2020.11             | :x:                | 3 May 2021          |
 | 6.0.x (Pre-Release) | :x:                | December 2020       |

nb-configuration.xml

@@ -13,7 +13,7 @@ You can copy and paste the single properties, into the pom.xml file and the IDE
 That way multiple projects can share the same settings (useful for formatting rules for example).
 Any value defined here will override the pom.xml file value but is only applicable to the current project.
 -->
-        <netbeans.hint.jdkPlatform>JDK_11</netbeans.hint.jdkPlatform>
+        <netbeans.hint.jdkPlatform>JDK_17</netbeans.hint.jdkPlatform>
         <netbeans.checkstyle.format>true</netbeans.checkstyle.format>
     </properties>
 </project-shared-configuration>

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>me.totalfreedom</groupId>
     <artifactId>TotalFreedomMod</artifactId>
-    <version>2022.02-RC01</version>
+    <version>2022.02</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -396,7 +396,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.1-SNAPSHOT</version>
+                <version>3.3.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>

src/main/resources/plugin.yml

@@ -14,4 +14,4 @@ softdepend:
   - JDA
   - Votifier
 authors: [Madgeek1450, Prozza]
-api-version: "1.16"
+api-version: "1.17"