From 0c0249cab615bb6550122fed4401542c4a28fb17 Mon Sep 17 00:00:00 2001 From: carm Date: Sun, 19 Feb 2023 03:49:35 +0800 Subject: [PATCH] =?UTF-8?q?ci(deploy):=20=E5=B0=9D=E8=AF=95=E4=B8=AD?= =?UTF-8?q?=E5=A4=AE=E5=BA=93=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 46 ++++++++++---------- README.md | 13 +++--- base/color/pom.xml | 11 ++++- base/command/pom.xml | 12 +++++- base/conf/pom.xml | 81 ------------------------------------ base/database/pom.xml | 73 -------------------------------- base/gui/pom.xml | 11 ++++- base/listener/pom.xml | 80 ----------------------------------- base/main/pom.xml | 11 ++++- base/messages/pom.xml | 64 ++++++++++++++++++++++++---- base/storage/pom.xml | 10 ++++- base/utils/pom.xml | 12 +++++- collection/all/pom.xml | 12 +++++- collection/bom/pom.xml | 30 ++++++------- collection/common/pom.xml | 15 ++++--- extension/gh-checker/pom.xml | 11 ++++- extension/papi/pom.xml | 11 ++++- extension/vault/pom.xml | 12 +++++- pom.xml | 5 +-- 19 files changed, 212 insertions(+), 308 deletions(-) delete mode 100644 base/conf/pom.xml delete mode 100644 base/database/pom.xml delete mode 100644 base/listener/pom.xml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c1efa0a..302003a 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -109,26 +109,26 @@ jobs: git commit -m "API Document generated." git push origin HEAD:gh-pages --force -# central-deploy: -# name: "Deploy Project (Central)" -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v2 -# - name: "Set up JDK" -# uses: actions/setup-java@v2 -# with: -# java-version: '11' -# distribution: 'adopt' -# cache: maven -# server-id: ossrh -# server-username: MAVEN_USERNAME -# server-password: MAVEN_PASSWORD -# gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import -# gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase -# -# - name: "Central Deploy" -# run: mvn -B -Possrh deploy --file pom.xml -DskipTests -# env: -# MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} -# MAVEN_PASSWORD: ${{ secrets.OSSRH_PASS }} -# MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} + central-deploy: + name: "Deploy Project (Central)" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: "Set up JDK" + uses: actions/setup-java@v2 + with: + java-version: '11' + distribution: 'adopt' + cache: maven + server-id: ossrh + server-username: MAVEN_USERNAME + server-password: MAVEN_PASSWORD + gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }} # Value of the GPG private key to import + gpg-passphrase: MAVEN_GPG_PASSPHRASE # env variable for GPG private key passphrase + + - name: "Central Deploy" + run: mvn -B -Possrh deploy --file pom.xml -DskipTests + env: + MAVEN_USERNAME: ${{ secrets.OSSRH_USER }} + MAVEN_PASSWORD: ${{ secrets.OSSRH_PASS }} + MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }} diff --git a/README.md b/README.md index 871f27c..83f4bc0 100644 --- a/README.md +++ b/README.md @@ -58,14 +58,13 @@ - 支持多种消息配置，包括文本消息、ActionBar消息、Title消息、声音、粒子效果播放等。 - 支持消息间的延迟发送。 -> 以下项目均已独立出单独项目，仅仅是按照包名规则打包到EasyPlugin的子项目中。 -> -> 如需使用，**强烈建议自行引用对应的项目**，以支持完整的Javadoc并获取源码内容！ +### 独立项目部分 -- _Listener_ [`easyplugin-listener`](base/listener) (打包自 [**EasyListener**](https://github.com/CarmJos/EasyListener)) -- _Configuration_ [`easyplugin-conf`](base/conf) (打包自 [**MineConfiguration - **](https://github.com/CarmJos/MineConfiguration)) -- _Database_ [`easyplugin-database`](base/database) (打包自 [**EasySQL**](https://github.com/CarmJos/EasySQL)) +> 以下项目均已独立出单独项目,如需使用，**强烈建议自行引用对应的项目**，以支持完整的Javadoc并获取源码内容！ + +- _Listener_ -> [**EasyListener**](https://github.com/CarmJos/EasyListener) +- _Configuration_ -> [**MineConfiguration**](https://github.com/CarmJos/MineConfiguration) +- _Database_ -> [**EasySQL**](https://github.com/CarmJos/EasySQL) ### 附属部分 (`/extension`) diff --git a/base/color/pom.xml b/base/color/pom.xml index cfe6444..b56464f 100644 --- a/base/color/pom.xml +++ b/base/color/pom.xml @@ -6,7 +6,7 @@ cc.carm.lib easyplugin-parent - 1.5.0 + 1.5.1 ../../pom.xml @@ -47,4 +47,13 @@ https://github.com/CarmJos/EasyPlugin/actions/workflows/maven.yml + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + \ No newline at end of file diff --git a/base/command/pom.xml b/base/command/pom.xml index 6156543..aec9f6b 100644 --- a/base/command/pom.xml +++ b/base/command/pom.xml @@ -5,7 +5,7 @@ easyplugin-parent cc.carm.lib - 1.5.0 + 1.5.1 ../../pom.xml 4.0.0 @@ -48,4 +48,14 @@ https://github.com/CarmJos/EasyPlugin/actions/workflows/maven.yml + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + \ No newline at end of file diff --git a/base/conf/pom.xml b/base/conf/pom.xml deleted file mode 100644 index b2386c1..0000000 --- a/base/conf/pom.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - easyplugin-parent - cc.carm.lib - 1.5.0 - ../../pom.xml - - 4.0.0 - - ${project.jdk.version} - ${project.jdk.version} - UTF-8 - UTF-8 - - easyplugin-conf - jar - - EasyPlugin-Configuration - 轻松插件配置文件接口模块，基于 MineConfiguration 项目。 - https://github.com/CarmJos/EasyPlugin - - - - - cc.carm.lib - mineconfiguration-bukkit - compile - true - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.3.0 - - - package - - shade - - - false - - - - - - - cc.carm.lib.configuration.core - cc.carm.lib.easyplugin.conf - - - cc.carm.lib.mineconfiguration.common - cc.carm.lib.easyplugin.conf - - - cc.carm.lib.mineconfiguration.bukkit - cc.carm.lib.easyplugin.conf - - - - - *:* - - META-INF/MANIFEST.MF - META-INF/*.txt - - - - - - - - - \ No newline at end of file diff --git a/base/database/pom.xml b/base/database/pom.xml deleted file mode 100644 index b7498e9..0000000 --- a/base/database/pom.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - easyplugin-parent - cc.carm.lib - 1.5.0 - ../../pom.xml - - 4.0.0 - - ${project.jdk.version} - ${project.jdk.version} - UTF-8 - UTF-8 - - easyplugin-database - jar - - EasyPlugin-Database - 轻松插件数据库接口模块，基于 EasySQL 项目。 - https://github.com/CarmJos/EasyPlugin - - - - - cc.carm.lib - easysql-beecp - compile - true - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.3.0 - - - package - - shade - - - false - - - - - - - cc.carm.lib.easysql - cc.carm.lib.easyplugin.database - - - - - *:* - - META-INF/MANIFEST.MF - META-INF/*.txt - - - - - - - - - \ No newline at end of file diff --git a/base/gui/pom.xml b/base/gui/pom.xml index 034ec6c..f3ee9ea 100644 --- a/base/gui/pom.xml +++ b/base/gui/pom.xml @@ -5,7 +5,7 @@ easyplugin-parent cc.carm.lib - 1.5.0 + 1.5.1 ../../pom.xml 4.0.0 @@ -59,4 +59,13 @@ + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + \ No newline at end of file diff --git a/base/listener/pom.xml b/base/listener/pom.xml deleted file mode 100644 index 9490a78..0000000 --- a/base/listener/pom.xml +++ /dev/null @@ -1,80 +0,0 @@ - - - - easyplugin-parent - cc.carm.lib - 1.5.0 - ../../pom.xml - - 4.0.0 - - ${project.jdk.version} - ${project.jdk.version} - UTF-8 - UTF-8 - - easyplugin-listener - - EasyPlugin-Listener - 轻松插件监听器接口模块，基于 EasyListener 项目。 - https://github.com/CarmJos/EasyPlugin - - - - GNU LESSER GENERAL PUBLIC LICENSE - https://www.gnu.org/licenses/lgpl-3.0.html - - - - - - - cc.carm.lib - easylistener - compile - true - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.3.0 - - - package - - shade - - - false - - - - - - - cc.carm.lib.easylistener - cc.carm.lib.easyplugin.listener - - - - - *:* - - META-INF/MANIFEST.MF - META-INF/*.txt - - - - - - - - - - \ No newline at end of file diff --git a/base/main/pom.xml b/base/main/pom.xml index a5de375..c982304 100644 --- a/base/main/pom.xml +++ b/base/main/pom.xml @@ -5,7 +5,7 @@ easyplugin-parent cc.carm.lib - 1.5.0 + 1.5.1 ../../pom.xml 4.0.0 @@ -68,4 +68,13 @@ + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + \ No newline at end of file diff --git a/base/messages/pom.xml b/base/messages/pom.xml index 80ce35f..6c76d19 100644 --- a/base/messages/pom.xml +++ b/base/messages/pom.xml @@ -6,16 +6,66 @@ cc.carm.lib easyplugin-parent - 1.5.0 + 1.5.1 ../../pom.xml - + + ${project.jdk.version} + ${project.jdk.version} + UTF-8 + UTF-8 + true + easyplugin-messages - - 17 - 17 - UTF-8 - + EasyPlugin-Messages + + 轻松插件消息配置模块，支持多种消息配置，包括文本消息、ActionBar消息、Title消息、声音、粒子效果播放等。 + + https://github.com/CarmJos/EasyPlugin + + + + ${project.groupId} + easyplugin-color + ${project.version} + compile + + + + + + CarmJos + Carm Jos + carm@carm.cc + https://www.carm.cc + + + + + + The MIT License + https://opensource.org/licenses/MIT + + + + + GitHub Issues + https://github.com/CarmJos/EasyPlugin/issues + + + + GitHub Actions + https://github.com/CarmJos/EasyPlugin/actions/workflows/maven.yml + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + \ No newline at end of file diff --git a/base/storage/pom.xml b/base/storage/pom.xml index 0fb05ff..005f7d4 100644 --- a/base/storage/pom.xml +++ b/base/storage/pom.xml @@ -5,7 +5,7 @@ easyplugin-parent cc.carm.lib - 1.5.0 + 1.5.1 ../../pom.xml 4.0.0 @@ -23,5 +23,13 @@ 轻松插件存储接口模块，包含存储相关的统一接口。 https://github.com/CarmJos/EasyPlugin + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + \ No newline at end of file diff --git a/base/utils/pom.xml b/base/utils/pom.xml index f65428a..5f64cae 100644 --- a/base/utils/pom.xml +++ b/base/utils/pom.xml @@ -5,7 +5,7 @@ easyplugin-parent cc.carm.lib - 1.5.0 + 1.5.1 ../../pom.xml 4.0.0 @@ -57,4 +57,14 @@ https://github.com/CarmJos/EasyPlugin/actions/workflows/maven.yml + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + \ No newline at end of file diff --git a/collection/all/pom.xml b/collection/all/pom.xml index 7e86b53..dfa67a9 100644 --- a/collection/all/pom.xml +++ b/collection/all/pom.xml @@ -5,7 +5,7 @@ easyplugin-parent cc.carm.lib - 1.5.0 + 1.5.1 ../../pom.xml 4.0.0 @@ -62,4 +62,14 @@ + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + \ No newline at end of file diff --git a/collection/bom/pom.xml b/collection/bom/pom.xml index 822108c..32a2032 100644 --- a/collection/bom/pom.xml +++ b/collection/bom/pom.xml @@ -5,7 +5,7 @@ easyplugin-parent cc.carm.lib - 1.5.0 + 1.5.1 ../../pom.xml 4.0.0 @@ -75,23 +75,7 @@ ${project.parent.groupId} - easyplugin-listener - ${project.parent.version} - - - ${project.parent.groupId} - easyplugin-database - ${project.parent.version} - - - ${project.parent.groupId} - easyplugin-conf - ${project.parent.version} - - - - ${project.parent.groupId} - easyplugin-papi + easyplugin-placeholderapi ${project.parent.version} @@ -137,4 +121,14 @@ + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + \ No newline at end of file diff --git a/collection/common/pom.xml b/collection/common/pom.xml index 4867879..43dbc50 100644 --- a/collection/common/pom.xml +++ b/collection/common/pom.xml @@ -5,7 +5,7 @@ easyplugin-parent cc.carm.lib - 1.5.0 + 1.5.1 ../../pom.xml 4.0.0 @@ -68,10 +68,6 @@ cc.carm.lib easyplugin-vault - - cc.carm.lib - easyplugin-database - cc.carm.lib easyplugin-storage @@ -82,4 +78,13 @@ + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + \ No newline at end of file diff --git a/extension/gh-checker/pom.xml b/extension/gh-checker/pom.xml index b8914f3..0af7b3a 100644 --- a/extension/gh-checker/pom.xml +++ b/extension/gh-checker/pom.xml @@ -5,7 +5,7 @@ easyplugin-parent cc.carm.lib - 1.5.0 + 1.5.1 ../../pom.xml 4.0.0 @@ -22,6 +22,7 @@ + cc.carm.lib githubreleases4j @@ -30,5 +31,13 @@ + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + \ No newline at end of file diff --git a/extension/papi/pom.xml b/extension/papi/pom.xml index 4207d87..a178465 100644 --- a/extension/papi/pom.xml +++ b/extension/papi/pom.xml @@ -5,7 +5,7 @@ easyplugin-parent cc.carm.lib - 1.5.0 + 1.5.1 ../../pom.xml 4.0.0 @@ -32,4 +32,13 @@ + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + \ No newline at end of file diff --git a/extension/vault/pom.xml b/extension/vault/pom.xml index 720b14d..35f3e7e 100644 --- a/extension/vault/pom.xml +++ b/extension/vault/pom.xml @@ -5,7 +5,7 @@ easyplugin-parent cc.carm.lib - 1.5.0 + 1.5.1 ../../pom.xml 4.0.0 @@ -33,4 +33,14 @@ + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index a6f0093..5ecc800 100644 --- a/pom.xml +++ b/pom.xml @@ -15,19 +15,16 @@ cc.carm.lib easyplugin-parent pom - 1.5.0 + 1.5.1 base/color base/utils base/main - base/conf base/messages base/gui base/command base/storage - base/listener - base/database extension/papi extension/vault