Merge remote-tracking branch 'origin/master'

# Conflicts: # easyplugin-all/pom.xml # easyplugin-bom/pom.xml # easyplugin-command/pom.xml # easyplugin-common/pom.xml # easyplugin-configuration/pom.xml # easyplugin-database/pom.xml # easyplugin-gui/pom.xml # easyplugin-lp/pom.xml # easyplugin-main/pom.xml # easyplugin-placeholderapi/pom.xml # easyplugin-vault/pom.xml # pom.xml
2024-09-19 19:25:45 +00:00 · 2022-02-25 22:12:52 +08:00 · 2022-02-25 22:12:52 +08:00 · 30e57e3945
commit 30e57e3945
parent acea995996 511d8d77c4
12 changed files with 18 additions and 22 deletions
--- a/easyplugin-all/pom.xml
+++ b/easyplugin-all/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.3.6</version>
+        <version>1.3.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/easyplugin-bom/pom.xml
+++ b/easyplugin-bom/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.3.6</version>
+        <version>1.3.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/easyplugin-command/pom.xml
+++ b/easyplugin-command/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.3.6</version>
+        <version>1.3.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/easyplugin-common/pom.xml
+++ b/easyplugin-common/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.3.6</version>
+        <version>1.3.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@ -59,6 +59,10 @@
            <type>pom</type>

            <exclusions>
+                <exclusion>
+                    <groupId>cc.carm.lib</groupId>
+                    <artifactId>easyplugin-github</artifactId>
+                </exclusion>
                <exclusion>
                    <groupId>cc.carm.lib</groupId>
                    <artifactId>easyplugin-placeholderapi</artifactId>
--- a/easyplugin-configuration/pom.xml
+++ b/easyplugin-configuration/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.3.6</version>
+        <version>1.3.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@ -69,7 +69,7 @@
            <optional>true</optional>
            <scope>compile</scope>
        </dependency>
-        
+
    </dependencies>

    <build>
--- a/easyplugin-database/pom.xml
+++ b/easyplugin-database/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.3.6</version>
+        <version>1.3.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

@ -54,7 +54,7 @@
        <dependency>
            <groupId>cc.carm.lib</groupId>
            <artifactId>easysql-beecp</artifactId>
-            <version>0.3.8</version>
+            <version>0.3.5</version>
            <optional>true</optional>
            <scope>compile</scope>
        </dependency>
--- a/easyplugin-gui/pom.xml
+++ b/easyplugin-gui/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.3.6</version>
+        <version>1.3.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/easyplugin-lp/pom.xml
+++ b/easyplugin-lp/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.3.6</version>
+        <version>1.3.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/easyplugin-main/pom.xml
+++ b/easyplugin-main/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.3.6</version>
+        <version>1.3.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/easyplugin-placeholderapi/pom.xml
+++ b/easyplugin-placeholderapi/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.3.6</version>
+        <version>1.3.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/easyplugin-vault/pom.xml
+++ b/easyplugin-vault/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>easyplugin-parent</artifactId>
        <groupId>cc.carm.lib</groupId>
-        <version>1.3.6</version>
+        <version>1.3.8</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/pom.xml
+++ b/pom.xml
@ -14,7 +14,7 @@
    <groupId>cc.carm.lib</groupId>
    <artifactId>easyplugin-parent</artifactId>
    <packaging>pom</packaging>
-    <version>1.3.6</version>
+    <version>1.3.8</version>
    <modules>

        <module>easyplugin-main</module>
@ -86,11 +86,6 @@
            <url>https://repo1.maven.org/maven2/</url>
        </repository>

-        <repository>
-            <id>minebench-repo</id>
-            <url>https://repo.minebench.de/</url>
-        </repository>
-
        <repository>
            <id>sonatype</id>
            <url>https://oss.sonatype.org/content/groups/public</url>
@ -165,9 +160,6 @@
                    <version>3.2.0</version>
                    <configuration>
                        <classifier>javadoc</classifier>
-                        <links>
-                            <link>https://javadoc.io/doc/org.jetbrains/annotations/</link>
-                        </links>
                        <detectJavaApiLink>false</detectJavaApiLink>
                        <encoding>UTF-8</encoding>
                        <charset>UTF-8</charset>