chore(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v2.22.2

Bumps [com.mysql:mysql-connector-j](https://github.com/mysql/mysql-connector-j) from 8.0.31 to 8.2.0.
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/9.x/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.31...8.2.0)

---
updated-dependencies:
- dependency-name: com.mysql:mysql-connector-j
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

.github/workflows/maven.yml

@@ -29,13 +29,17 @@ jobs:
         run: mvn -B package --file pom.xml -Dgpg.skip
 
       - name: "Upload artifacts"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: artifacts
           path: "**/target/"
+          retention-days: 5
+          include-hidden-files: true
 
       - name: "Upload assets"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: assets
-          path: ".asset/"
+          path: ".asset/"
+          retention-days: 5
+          include-hidden-files: true

api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>minesql-parent</artifactId>
         <groupId>cc.carm.plugin</groupId>
-        <version>1.4.0</version>
+        <version>1.4.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>minesql-parent</artifactId>
         <groupId>cc.carm.plugin</groupId>
-        <version>1.4.0</version>
+        <version>1.4.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>
@@ -68,17 +68,10 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>net.byteflux</groupId>
-            <artifactId>libby-core</artifactId>
-            <version>${deps.libby.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
         <dependency>
             <groupId>com.github.chris2018998</groupId>
             <artifactId>beecp</artifactId>
-            <scope>provided</scope>
+            <scope>compile</scope>
         </dependency>
 
         <dependency>
@@ -87,6 +80,24 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.mariadb.jdbc</groupId>
+            <artifactId>mariadb-java-client</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
         <dependency>
             <groupId>cc.carm.lib</groupId>
             <artifactId>easyplugin-githubchecker</artifactId>

core/src/main/java/cc/carm/plugin/minesql/MineSQLCore.java

@@ -14,16 +14,14 @@ import cc.carm.plugin.minesql.command.MineSQLCommand;
 import cc.carm.plugin.minesql.command.MineSQLHelpFormatter;
 import cc.carm.plugin.minesql.conf.PluginConfiguration;
 import cc.carm.plugin.minesql.conf.SQLSourceGroup;
-import cc.carm.plugin.minesql.lib.PluginLibraries;
 import cc.carm.plugin.minesql.util.DBPropertiesUtil;
-import cn.beecp.BeeDataSource;
-import cn.beecp.BeeDataSourceConfig;
 import co.aikar.commands.CommandManager;
 import co.aikar.commands.InvalidCommandArgument;
 import co.aikar.commands.Locales;
-import net.byteflux.libby.Library;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.stone.beecp.BeeDataSource;
+import org.stone.beecp.BeeDataSourceConfig;
 
 import javax.sql.DataSource;
 import java.io.File;
@@ -50,17 +48,6 @@ public class MineSQLCore implements IMineSQL {
         instance = this;
         this.platform = platform;
 
-        getLogger().info("加载数据库依赖文件...");
-        getPlatform().getLibraryManager().addMavenLocal();
-        getPlatform().getLibraryManager().addMavenCentral();
-        getPlatform().getLibraryManager().addSonatype();
-
-        for (PluginLibraries value : PluginLibraries.values()) {
-            Library lib = value.getLibrary();
-            getLogger().info("  加载 " + lib.getArtifactId() + " (" + lib.getVersion() + ") ...");
-            getPlatform().getLibraryManager().loadLibrary(value.getLibrary());
-        }
-
         getLogger().info("加载配置文件...");
         this.configProvider = EasyConfiguration.from(new File(platform.getPluginFolder(), "config.yml"));
         this.config = new PluginConfiguration();
@@ -124,7 +111,7 @@ public class MineSQLCore implements IMineSQL {
     }
 
     @Override
-    public @NotNull SQLManagerImpl create(@NotNull String name, @NotNull SQLSourceConfig conf) {
+    public @NotNull SQLManagerImpl create(@NotNull String name, @NotNull SQLSourceConfig conf) throws Exception {
         BeeDataSourceConfig config = new BeeDataSourceConfig();
         config.setDriverClassName(conf.getDriverClassName());
         config.setJdbcUrl(conf.getJdbcURL());
@@ -143,11 +130,16 @@ public class MineSQLCore implements IMineSQL {
         Optional.ofNullable(conf.getSettings().getReadOnly()).ifPresent(config::setDefaultReadOnly);
         Optional.ofNullable(conf.getSettings().getSchema()).ifPresent(config::setDefaultSchema);
 
-        Optional.ofNullable(conf.getSettings().getValidationSQL()).ifPresent(config::setValidTestSql);
-        Optional.ofNullable(conf.getSettings().getValidationTimeout()).ifPresent(config::setValidTestTimeout);
-        Optional.ofNullable(conf.getSettings().getValidationInterval()).ifPresent(config::setValidAssumeTime);
+        Optional.ofNullable(conf.getSettings().getValidationSQL()).ifPresent(config::setAliveTestSql);
+        Optional.ofNullable(conf.getSettings().getValidationTimeout()).ifPresent(config::setAliveTestTimeout);
+        Optional.ofNullable(conf.getSettings().getValidationInterval()).ifPresent(config::setTimerCheckInterval);
 
-        return create(name, config);
+        SQLManagerImpl manager = create(name, config);
+        if (conf.getInitializer() != null) {
+            conf.getInitializer().accept(manager);
+        }
+
+        return manager;
     }
 
     @Override

core/src/main/java/cc/carm/plugin/minesql/MineSQLPlatform.java

@@ -1,7 +1,6 @@
 package cc.carm.plugin.minesql;
 
 import co.aikar.commands.CommandManager;
-import net.byteflux.libby.LibraryManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -16,6 +15,4 @@ public interface MineSQLPlatform {
 
     @Nullable CommandManager<?, ?, ?, ?, ?, ?> getCommandManager();
 
-    @NotNull LibraryManager getLibraryManager();
-
 }

core/src/main/java/cc/carm/plugin/minesql/lib/PluginLibraries.java

@@ -1,7 +1,6 @@
 package cc.carm.plugin.minesql.lib;
 
 import cc.carm.plugin.minesql.util.VersionReader;
-import net.byteflux.libby.Library;
 import org.jetbrains.annotations.NotNull;
 
 public enum PluginLibraries {
@@ -21,16 +20,8 @@ public enum PluginLibraries {
         this.artifactID = artifactID;
     }
 
-    public @NotNull Library getLibrary() {
-        return Library.builder().id(name())
-                .groupId(this.groupID).artifactId(this.artifactID)
-                .version(getVersion())
-                .build();
-    }
-
     public @NotNull String getVersion() {
         return READER.get(name().toLowerCase().replace('_', '-'));
     }
 
-
 }

platforms/bukkit/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>minesql-parent</artifactId>
         <groupId>cc.carm.plugin</groupId>
-        <version>1.4.0</version>
+        <version>1.4.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

platforms/bukkit/src/main/java/cc/carm/plugin/minesql/MineSQLBukkit.java

@@ -85,11 +85,6 @@ public class MineSQLBukkit extends EasyPlugin implements MineSQLPlatform {
         return commandManager;
     }
 
-    @Override
-    public @NotNull LibraryManager getLibraryManager() {
-        return this.libraryManager;
-    }
-
     @Override
     public @NotNull File getPluginFolder() {
         return getDataFolder();

platforms/bungee/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>minesql-parent</artifactId>
         <groupId>cc.carm.plugin</groupId>
-        <version>1.4.0</version>
+        <version>1.4.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -56,15 +56,6 @@
         <url>https://github.com/CarmJos/MineSQL/actions/workflows/maven.yml</url>
     </ciManagement>
 
-    <repositories>
-
-        <repository>
-            <id>bungeecord-repo</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </repository>
-
-    </repositories>
-
     <dependencies>
 
         <dependency>
@@ -75,28 +66,12 @@
         </dependency>
 
         <dependency>
-            <groupId>net.md-5</groupId>
-            <artifactId>bungeecord-api</artifactId>
-            <version>1.16-R0.5-SNAPSHOT</version>
-            <type>jar</type>
+            <groupId>io.github.waterfallmc</groupId>
+            <artifactId>waterfall-api</artifactId>
+            <version>1.21-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>net.md-5</groupId>
-            <artifactId>bungeecord-api</artifactId>
-            <version>1.16-R0.5-SNAPSHOT</version>
-            <type>javadoc</type>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>net.byteflux</groupId>
-            <artifactId>libby-bungee</artifactId>
-            <version>${deps.libby.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bungeecord</artifactId>

platforms/bungee/src/main/java/cc/carm/plugin/minesql/MineSQLBungee.java

@@ -5,8 +5,6 @@ import cc.carm.lib.easyplugin.utils.JarResourceUtils;
 import cc.carm.plugin.minesql.conf.PluginConfiguration;
 import co.aikar.commands.BungeeCommandManager;
 import co.aikar.commands.CommandManager;
-import net.byteflux.libby.BungeeLibraryManager;
-import net.byteflux.libby.LibraryManager;
 import net.md_5.bungee.api.ProxyServer;
 import net.md_5.bungee.api.plugin.Plugin;
 import org.bstats.bungeecord.Metrics;
@@ -22,8 +20,6 @@ public class MineSQLBungee extends Plugin implements MineSQLPlatform {
 
     protected static MineSQLBungee instance;
 
-    protected BungeeLibraryManager libraryManager;
-
     protected MineSQLCore core;
     protected BungeeCommandManager commandManager;
 
@@ -31,9 +27,6 @@ public class MineSQLBungee extends Plugin implements MineSQLPlatform {
     public void onLoad() {
         MineSQLBungee.instance = this;
 
-        getLogger().info("加载依赖管理器...");
-        this.libraryManager = new BungeeLibraryManager(this);
-
         getLogger().info("加载基础核心...");
         this.core = new MineSQLCore(this);
     }
@@ -99,11 +92,6 @@ public class MineSQLBungee extends Plugin implements MineSQLPlatform {
         return this.commandManager;
     }
 
-    @Override
-    public @NotNull LibraryManager getLibraryManager() {
-        return this.libraryManager;
-    }
-
     @SuppressWarnings("deprecation")
     public void outputInfo() {
         Optional.ofNullable(JarResourceUtils.readResource(this.getResourceAsStream("PLUGIN_INFO")))

platforms/sponge8/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>minesql-parent</artifactId>
         <groupId>cc.carm.plugin</groupId>
-        <version>1.4.0</version>
+        <version>1.4.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -84,13 +84,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>net.byteflux</groupId>
-            <artifactId>libby-sponge</artifactId>
-            <version>${deps.libby.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-sponge</artifactId>

platforms/sponge8/src/main/java/cc/carm/plugin/minesql/MineSQLSponge.java

@@ -5,8 +5,6 @@ import cc.carm.lib.easyplugin.utils.JarResourceUtils;
 import cc.carm.plugin.minesql.conf.PluginConfiguration;
 import co.aikar.commands.CommandManager;
 import com.google.inject.Inject;
-import net.byteflux.libby.LibraryManager;
-import net.byteflux.libby.SpongeLibraryManager;
 import net.kyori.adventure.text.Component;
 import org.bstats.charts.SimplePie;
 import org.bstats.sponge.Metrics;
@@ -43,17 +41,13 @@ public class MineSQLSponge implements MineSQLPlatform {
     private final PluginContainer pluginContainer;
     private final Metrics.Factory metricsFactory;
 
-    protected final SpongeLibraryManager<MineSQLSponge> libraryManager;
     protected final MineSQLCore core;
 //    protected SpongeCommandManager commandManager;
 
     @Inject
-    public MineSQLSponge(Metrics.Factory factory,
-                         PluginContainer pluginContainer,
-                         SpongeLibraryManager<MineSQLSponge> libraryManager) {
+    public MineSQLSponge(Metrics.Factory factory, PluginContainer pluginContainer) {
         this.pluginContainer = pluginContainer;
         this.metricsFactory = factory;
-        this.libraryManager = libraryManager;
 
         getLogger().info("加载基础核心...");
         this.core = new MineSQLCore(this);
@@ -115,11 +109,6 @@ public class MineSQLSponge implements MineSQLPlatform {
         return null;
     }
 
-    @Override
-    public @NotNull LibraryManager getLibraryManager() {
-        return this.libraryManager;
-    }
-
     public String getVersion() {
         return pluginContainer.metadata().version().toString();
     }

platforms/velocity/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>minesql-parent</artifactId>
         <groupId>cc.carm.plugin</groupId>
-        <version>1.4.0</version>
+        <version>1.4.2</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -82,13 +82,6 @@
             <scope>compile</scope>
         </dependency>
 
-        <dependency>
-            <groupId>net.byteflux</groupId>
-            <artifactId>libby-velocity</artifactId>
-            <version>${deps.libby.version}</version>
-            <scope>compile</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-velocity</artifactId>

platforms/velocity/src/main/java/cc/carm/plugin/minesql/MineSQLVelocity.java

@@ -1,8 +1,5 @@
 package cc.carm.plugin.minesql;
 
-
-import cc.carm.lib.easyplugin.utils.ColorParser;
-import cc.carm.lib.easyplugin.utils.JarResourceUtils;
 import cc.carm.plugin.minesql.conf.PluginConfiguration;
 import co.aikar.commands.CommandManager;
 import co.aikar.commands.VelocityCommandManager;
@@ -16,22 +13,16 @@ import com.velocitypowered.api.plugin.PluginContainer;
 import com.velocitypowered.api.plugin.PluginDescription;
 import com.velocitypowered.api.plugin.annotation.DataDirectory;
 import com.velocitypowered.api.proxy.ProxyServer;
-import net.byteflux.libby.LibraryManager;
-import net.byteflux.libby.VelocityLibraryManager;
-import net.kyori.adventure.text.Component;
 import org.bstats.charts.SimplePie;
 import org.bstats.velocity.Metrics;
 import org.jetbrains.annotations.NotNull;
-import org.slf4j.LoggerFactory;
 
 import java.io.File;
 import java.nio.file.Path;
-import java.util.Arrays;
-import java.util.Optional;
 import java.util.logging.Logger;
 
 
-@Plugin(id = "minesql", name = "MineSQL (EasySQL-Plugin)", version = "1.4.0",
+@Plugin(id = "minesql", name = "MineSQL (EasySQL-Plugin)", version = "1.4.2",
         description = "EasySQL Plugin For Velocity",
         url = "https://github.com/CarmJos/MineSQL",
         authors = {"CarmJos", "GhostChu"}
@@ -43,7 +34,6 @@ public class MineSQLVelocity implements MineSQLPlatform {
     private final File dataFolder;
 
     private final Metrics.Factory metricsFactory;
-    protected VelocityLibraryManager<MineSQLVelocity> libraryManager;
 
     protected MineSQLCore core;
     protected VelocityCommandManager commandManager;
@@ -56,18 +46,14 @@ public class MineSQLVelocity implements MineSQLPlatform {
         this.logger = logger;
         this.dataFolder = dataDirectory.toFile();
         this.metricsFactory = metricsFactory;
-        this.libraryManager = new VelocityLibraryManager<>(
-                LoggerFactory.getLogger("minesql"), dataDirectory,
-                server.getPluginManager(), this
-        );
+
+        getLogger().info("加载基础核心...");
+        this.core = new MineSQLCore(this);
     }
 
     @Subscribe(order = PostOrder.FIRST)
     public void onInitialize(ProxyInitializeEvent event) {
-        outputInfo();
 
-        getLogger().info("加载基础核心...");
-        this.core = new MineSQLCore(this);
 
         getLogger().info("初始化指令管理器...");
         this.commandManager = new VelocityCommandManager(server, this);
@@ -98,7 +84,6 @@ public class MineSQLVelocity implements MineSQLPlatform {
 
     @Subscribe(order = PostOrder.LAST)
     public void onShutdown(ProxyShutdownEvent event) {
-        outputInfo();
         getLogger().info("终止全部数据库连接...");
         this.core.shutdownAll();
     }
@@ -122,25 +107,12 @@ public class MineSQLVelocity implements MineSQLPlatform {
         return this.dataFolder;
     }
 
-
     @Override
     public @NotNull CommandManager<?, ?, ?, ?, ?, ?> getCommandManager() {
         return commandManager;
     }
 
-    @Override
-    public @NotNull LibraryManager getLibraryManager() {
-        return this.libraryManager;
-    }
-
     public @NotNull PluginConfiguration getConfiguration() {
         return this.core.getConfig();
     }
-
-    public void outputInfo() {
-        Optional.ofNullable(JarResourceUtils.readResource(this.getClass().getResourceAsStream("PLUGIN_INFO")))
-                .map(v -> ColorParser.parse(Arrays.asList(v)))
-                .ifPresent(list -> list.forEach(s -> getServer().getConsoleCommandSource().sendMessage(Component.text(s))));
-    }
-
 }

plugin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>minesql-parent</artifactId>
         <groupId>cc.carm.plugin</groupId>
-        <version>1.4.0</version>
+        <version>1.4.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>

pom.xml

@@ -12,17 +12,17 @@
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
 
         <deps.easysql.version>0.4.7</deps.easysql.version>
-        <deps.easyconf.version>3.3.1</deps.easyconf.version>
-        <deps.easyplugin.version>1.4.18</deps.easyplugin.version>
-        <deps.beecp.version>3.3.9</deps.beecp.version>
+        <deps.easyconf.version>3.5.1</deps.easyconf.version>
+        <deps.easyplugin.version>1.5.12</deps.easyplugin.version>
+        <deps.beecp.version>4.1.7</deps.beecp.version>
 
         <deps.libby.version>1.1.5</deps.libby.version>
         <deps.acf.version>0.5.1-SNAPSHOT</deps.acf.version>
         <deps.bstats.version>3.0.0</deps.bstats.version>
 
-        <deps.mysql-driver.version>8.0.31</deps.mysql-driver.version>
+        <deps.mysql-driver.version>8.2.0</deps.mysql-driver.version>
         <deps.mariadb-driver.version>3.1.0</deps.mariadb-driver.version>
-        <deps.h2-driver.version>2.1.214</deps.h2-driver.version>
+        <deps.h2-driver.version>2.2.220</deps.h2-driver.version>
 
         <code.package>cc.carm.plugin.minesql</code.package>
     </properties>
@@ -30,7 +30,7 @@
     <groupId>cc.carm.plugin</groupId>
     <artifactId>minesql-parent</artifactId>
     <packaging>pom</packaging>
-    <version>1.4.0</version>
+    <version>1.4.2</version>
     <modules>
         <module>api</module>
         <module>core</module>
@@ -105,11 +105,6 @@
             <url>https://repo.aikar.co/content/groups/aikar/</url>
         </repository>
 
-        <repository>
-            <id>AlessioDP</id>
-            <url>https://repo.alessiodp.com/releases/</url>
-        </repository>
-
         <repository>
             <id>central</id>
             <url>https://repo1.maven.org/maven2/</url>
@@ -128,7 +123,7 @@
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>23.1.0</version>
+            <version>24.0.1</version>
             <scope>provided</scope>
         </dependency>
 
@@ -161,7 +156,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>31.0.1-jre</version>
+                <version>32.0.0-jre</version>
             </dependency>
 
             <!-- https://mvnrepository.com/artifact/org.mariadb.jdbc/mariadb-java-client -->
@@ -209,7 +204,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.1</version>
+                <version>2.22.2</version>
                 <configuration>
                     <useSystemClassLoader>false</useSystemClassLoader>
                 </configuration>

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}