Merge pull request #217 from botblock/development

Next Release

Author: Andre601

SECURITY.md

@@ -1,14 +1,25 @@
 [discord]: https://discord.gg/6dazXp6
-[issues]: https://github.com/botblock/JavaBotBlockAPI/issues/new?labels=Type:+Bug&template=bug_report.md
+[issue]: https://github.com/botblock/JavaBotBlockAPI/issues/new?labels=Type%3A+Bug+%28Unconfirmed%29&template=bug_report.yml
+[contributing]: https://github.com/botblock/JavaBotBlockAPI/blob/master/.github/CONTRIBUTING.md
+
+[version]: https://img.shields.io/nexus/maven-public/org.botblock/javabotblockapi-core?label=Release&server=https%3A%2F%2Frepo.codemc.io&style=plastic
 
 # Security Policy
+Security is important to us.  
+To make sure that there aren't any vulnerabilities in our library to we ask you to report any issues to us that could affect the security of this library and its connections.
+
+## Before sumbitting
+Before you submit a bug report or similar to us would we like to ask you to make sure, that you use the latest version.  
+We can't and won't fix bugs that exist in older versions and aren't present on newer ones.
+
+We support all minor and patch-versions of the latest major version which currently is Version **6** (Last updated: 11th of March 2021).
 
-## Supported Versions
-We only support the latest major releases of the different modules, which are listed below.  
-Those are also the only versions that may receive bug fixes and patches.
+The latest available version is seen below:  
+![version]
 
-The currently supported major release is `6`
+## How to report
+If your issue is in fact a security-issue/vulnerability would we like to ask you, to report to in our [Discord Server][discord] directly.  
+Issues are not the right place to report these kinds of problems as they would allow people to find out about them and use it to their malicious benefit.
 
-## Reporting issues
-Security issues should be reported through our [Discord Server][discord].  
-Any other issue should be reported as usual through the [Issues tab][issues]
+If your issue is just a regular bug can you open a normal [Bug Report][issue] on our Issue tracker.  
+Please make sure to follow our [Contributing Guidelines][contributing] while doing so.

build.gradle

@@ -7,7 +7,7 @@ plugins{
     id 'com.github.johnrengelman.shadow' version '5.2.0'
 }
 
-def ver = new Version(major: 6, minor: 6, patch: 2)
+def ver = new Version(major: 6, minor: 6, patch: 3)
 
 allprojects {
     apply plugin: 'maven-publish'
@@ -20,7 +20,7 @@ allprojects {
     ext {
 
         dependencies {
-            api group: 'org.json', name: 'json', version: '20201115'
+            api group: 'org.json', name: 'json', version: '20210307'
             api group: 'com.github.ben-manes.caffeine', name: 'caffeine', version: '2.8.0'
             api group: 'com.google.code.findbugs', name: 'jsr305', version: '3.0.2'
             api group: 'org.slf4j', name: 'slf4j-api', version: '1.7.30'

core/src/main/java/org/botblock/javabotblockapi/core/Info.java

@@ -39,7 +39,7 @@ public class Info{
     /**
      * Patch version of the Wrapper.
      */
-    public static final int PATCH = 2;
+    public static final int PATCH = 3;
 
     /**
      * Full version in the format {@code major.minor.patch}.

core/src/main/java/org/botblock/javabotblockapi/core/Site.java

@@ -78,8 +78,13 @@ public class Site{
      *     <li>GET</li>
      *     <li>POST</li>
      * </ul>
+     * 
+     * @deprecated Domain changed to {@link #DISCORDLIST_SPACE discordlist.space}
      */
-    public static final Site BOTLIST_SPACE = new Site("botlist.space", HttpMethod.GET, HttpMethod.POST);
+    @Deprecated
+    @DeprecatedSince(major = 6, minor = 6, patch = 3, replacements = {"DISCORDLIST_SPACE"})
+    @PlannedRemoval(major = 6, minor = 6, patch = 5)
+    public static final Site BOTLIST_SPACE = new Site("botlist.space");
 
     /**
      * <a href="https://botsdatabase.com" target="_blank">botsdatabase.com</a>
@@ -103,23 +108,6 @@ public class Site{
      */
     public static final Site BOTS_DISCORDLABS_ORG = new Site("discordlabs.org", HttpMethod.GET, HttpMethod.POST);
 
-    /**
-     * <a href="https://bots.distop.xyz" target="_blank">bots.distop.xyz</a>
-     *
-     * <p>Supported methods:
-     * <ul>
-     *     <li>GET</li>
-     * </ul>
-     * 
-     * @deprecated Site no longer available.
-     * 
-     * @since 6.4.1
-     */
-    @Deprecated
-    @DeprecatedSince(major = 6, minor = 6, patch = 1)
-    @PlannedRemoval(major = 6, minor = 6, patch = 3)
-    public static final Site BOTS_DISTOP_XYZ = new Site("bots.distop.xyz");
-    
     /**
      * <a href="https://botsfordiscord.com" target="_blank">botsfordiscord.com</a>
      *
@@ -131,22 +119,6 @@ public class Site{
      */
     public static final Site BOTSFORDISCORD_COM = new Site("botsfordiscord.com", HttpMethod.GET, HttpMethod.POST);
 
-    /**
-     * <a href="https://bots.idledev.org" target="_blank">bots.idledev.org</a>
-     *
-     * <p>Supported methods:
-     * <ul>
-     *     <li>GET</li>
-     *     <li>POST</li>
-     * </ul>
-     * 
-     * @deprecated Site no longer available.
-     */
-    @Deprecated
-    @DeprecatedSince(major = 6, minor = 6, patch = 1)
-    @PlannedRemoval(major = 6, minor = 6, patch = 3)
-    public static final Site BOTS_IDLEDEV_ORG = new Site("bots.idledev.org");
-    
     /**
      * <a href="https://bots.ondiscord.xyz" target="_blank">bots.ondiscord.xyz</a>
      *
@@ -263,6 +235,17 @@ public class Site{
      */
     public static final Site DISCORDLISTOLOGY_COM = new Site("discordlistology.com", HttpMethod.GET, HttpMethod.POST);
 
+    /**
+     * <a href="https://discordlist.space" target="_blank">discordlist.space</a> (Formerly botlist.space)
+     * 
+     * <p>Supported methods:
+     * <ul>
+     *     <li>GET</li>
+     *     <li>POST</li>
+     * </ul>
+     */
+    public static final Site DISCORDLIST_SPACE = new Site("discordlist.space", HttpMethod.GET, HttpMethod.POST);
+    
     /**
      * <a href="https://disforge.com" target="_blank">disforge.com</a>
      *

jda/build.gradle

@@ -1,5 +1,5 @@
 dependencies {
-    api(group: 'net.dv8tion', name: 'JDA', version: '4.2.0_229'){
+    api(group: 'net.dv8tion', name: 'JDA', version: '4.2.0_242'){
         exclude(module: 'opus-java')
     }
     implementation project(":core")