diff --git a/.github/workflows/commit_lint.yml b/.github/workflows/commit_lint.yml new file mode 100644 index 0000000..0bd90b9 --- /dev/null +++ b/.github/workflows/commit_lint.yml @@ -0,0 +1,12 @@ +name: commit lint +on: + pull_request: + branches: + - main + +jobs: + commitlint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: wagoid/commitlint-github-action@v5 diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/java_checkstyle.yml similarity index 74% rename from .github/workflows/checkstyle.yml rename to .github/workflows/java_checkstyle.yml index 0c7ba44..7a537f4 100644 --- a/.github/workflows/checkstyle.yml +++ b/.github/workflows/java_checkstyle.yml @@ -1,14 +1,17 @@ -name: checkstyle +name: java checkstyle on: + push: + branches: + - main pull_request: branches: - main jobs: - checkstyle: + java_checkstyle: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Maven Central Repository uses: actions/setup-java@v3 with: diff --git a/.github/workflows/spotbugs.yml b/.github/workflows/java_spotbugs.yml similarity index 76% rename from .github/workflows/spotbugs.yml rename to .github/workflows/java_spotbugs.yml index 4b0b090..1f9b25d 100644 --- a/.github/workflows/spotbugs.yml +++ b/.github/workflows/java_spotbugs.yml @@ -1,14 +1,17 @@ -name: spot bugs +name: java spotbugs on: + push: + branches: + - main pull_request: branches: - main jobs: - spotbugs: + java_spotbugs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Maven Central Repository uses: actions/setup-java@v3 with: diff --git a/.github/workflows/java_spotless.yml b/.github/workflows/java_spotless.yml new file mode 100644 index 0000000..579e058 --- /dev/null +++ b/.github/workflows/java_spotless.yml @@ -0,0 +1,21 @@ +name: java spotless +on: + push: + branches: + - main + pull_request: + branches: + - main + +jobs: + java_spotless: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Set up Maven Central Repository + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + - name: spotless + run: mvn -B spotless:check diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/java_unit_tests.yml similarity index 57% rename from .github/workflows/unit-tests.yml rename to .github/workflows/java_unit_tests.yml index 3e9030b..c29dab5 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/java_unit_tests.yml @@ -1,4 +1,4 @@ -name: unit tests +name: java unit tests on: push: branches: @@ -8,10 +8,10 @@ on: - main jobs: - unit-tests: + java_unit_tests: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up Maven Central Repository uses: actions/setup-java@v3 with: @@ -19,7 +19,3 @@ jobs: distribution: 'temurin' - name: unit tests run: mvn -B clean test - - uses: codecov/codecov-action@v2 - with: - files: ./java-tool/target/site/jacoco/jacoco.xml,./sdk-codec-bk/target/site/jacoco/jacoco.xml - flags: unittests diff --git a/.github/workflows/typo_check.yml b/.github/workflows/typo_check.yml new file mode 100644 index 0000000..b89a9f9 --- /dev/null +++ b/.github/workflows/typo_check.yml @@ -0,0 +1,13 @@ +name: typo check +on: + pull_request: + branches: + - main +jobs: + typo_check: + name: typo check + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Check typos + uses: crate-ci/typos@master diff --git a/bookkeeper-admin-jdk/pom.xml b/bookkeeper-admin-jdk/pom.xml new file mode 100644 index 0000000..9723843 --- /dev/null +++ b/bookkeeper-admin-jdk/pom.xml @@ -0,0 +1,14 @@ + + + 4.0.0 + + io.github.protocol-laboratory + bookkeeper-admin-parent + 0.0.1 + + + bookkeeper-admin-jdk + + diff --git a/src/main/java/io/github/protocol/bookkeeper/Auditor.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/Auditor.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/Auditor.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/Auditor.java diff --git a/src/main/java/io/github/protocol/bookkeeper/AutoRecovery.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/AutoRecovery.java similarity index 95% rename from src/main/java/io/github/protocol/bookkeeper/AutoRecovery.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/AutoRecovery.java index 8ac9a3f..e7f7eaa 100644 --- a/src/main/java/io/github/protocol/bookkeeper/AutoRecovery.java +++ b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/AutoRecovery.java @@ -6,7 +6,7 @@ public interface AutoRecovery { void recoveryBookie(RecoveryBookieReqData reqData) throws BookkeeperAdminException; - UnderReplicatedLedger listUnderReplicatedLedger(ListUnderReplicatedLedgerReqData reqData) + UnderReplicatedLedger listUnderReplicatedLedger(ListUnderReplicatedLedgerReqData reqData) throws BookkeeperAdminException; Auditor whoIsAuditor() throws BookkeeperAdminException; diff --git a/src/main/java/io/github/protocol/bookkeeper/AutoRecoveryImpl.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/AutoRecoveryImpl.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/AutoRecoveryImpl.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/AutoRecoveryImpl.java diff --git a/src/main/java/io/github/protocol/bookkeeper/AutoRecoveryStatus.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/AutoRecoveryStatus.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/AutoRecoveryStatus.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/AutoRecoveryStatus.java diff --git a/src/main/java/io/github/protocol/bookkeeper/BookieInfo.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/BookieInfo.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/BookieInfo.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/BookieInfo.java diff --git a/src/main/java/io/github/protocol/bookkeeper/BookieStatus.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/BookieStatus.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/BookieStatus.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/BookieStatus.java diff --git a/src/main/java/io/github/protocol/bookkeeper/Bookies.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/Bookies.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/Bookies.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/Bookies.java diff --git a/src/main/java/io/github/protocol/bookkeeper/BookiesImpl.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/BookiesImpl.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/BookiesImpl.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/BookiesImpl.java diff --git a/src/main/java/io/github/protocol/bookkeeper/BookkeeperAdmin.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/BookkeeperAdmin.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/BookkeeperAdmin.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/BookkeeperAdmin.java diff --git a/src/main/java/io/github/protocol/bookkeeper/BookkeeperAdminBuilder.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/BookkeeperAdminBuilder.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/BookkeeperAdminBuilder.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/BookkeeperAdminBuilder.java diff --git a/src/main/java/io/github/protocol/bookkeeper/BookkeeperAdminBuilderImpl.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/BookkeeperAdminBuilderImpl.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/BookkeeperAdminBuilderImpl.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/BookkeeperAdminBuilderImpl.java diff --git a/src/main/java/io/github/protocol/bookkeeper/BookkeeperAdminException.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/BookkeeperAdminException.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/BookkeeperAdminException.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/BookkeeperAdminException.java diff --git a/src/main/java/io/github/protocol/bookkeeper/BookkeeperAdminImpl.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/BookkeeperAdminImpl.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/BookkeeperAdminImpl.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/BookkeeperAdminImpl.java diff --git a/src/main/java/io/github/protocol/bookkeeper/Configs.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/Configs.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/Configs.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/Configs.java diff --git a/src/main/java/io/github/protocol/bookkeeper/ConfigsImpl.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/ConfigsImpl.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/ConfigsImpl.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/ConfigsImpl.java diff --git a/src/main/java/io/github/protocol/bookkeeper/Configuration.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/Configuration.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/Configuration.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/Configuration.java diff --git a/src/main/java/io/github/protocol/bookkeeper/DiskFile.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/DiskFile.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/DiskFile.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/DiskFile.java diff --git a/src/main/java/io/github/protocol/bookkeeper/GarbageCollectionStatus.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/GarbageCollectionStatus.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/GarbageCollectionStatus.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/GarbageCollectionStatus.java diff --git a/src/main/java/io/github/protocol/bookkeeper/GcSuspendStatus.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/GcSuspendStatus.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/GcSuspendStatus.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/GcSuspendStatus.java diff --git a/src/main/java/io/github/protocol/bookkeeper/Heartbeat.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/Heartbeat.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/Heartbeat.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/Heartbeat.java diff --git a/src/main/java/io/github/protocol/bookkeeper/HeartbeatImpl.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/HeartbeatImpl.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/HeartbeatImpl.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/HeartbeatImpl.java diff --git a/src/main/java/io/github/protocol/bookkeeper/InnerHttpClient.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/InnerHttpClient.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/InnerHttpClient.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/InnerHttpClient.java diff --git a/src/main/java/io/github/protocol/bookkeeper/JacksonService.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/JacksonService.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/JacksonService.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/JacksonService.java diff --git a/src/main/java/io/github/protocol/bookkeeper/LastLogMark.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/LastLogMark.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/LastLogMark.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/LastLogMark.java diff --git a/src/main/java/io/github/protocol/bookkeeper/ListUnderReplicatedLedgerReqData.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/ListUnderReplicatedLedgerReqData.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/ListUnderReplicatedLedgerReqData.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/ListUnderReplicatedLedgerReqData.java diff --git a/src/main/java/io/github/protocol/bookkeeper/RecoveryBookieReqData.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/RecoveryBookieReqData.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/RecoveryBookieReqData.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/RecoveryBookieReqData.java diff --git a/src/main/java/io/github/protocol/bookkeeper/UnderReplicatedLedger.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/UnderReplicatedLedger.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/UnderReplicatedLedger.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/UnderReplicatedLedger.java diff --git a/src/main/java/io/github/protocol/bookkeeper/UrlConst.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/UrlConst.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/UrlConst.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/UrlConst.java diff --git a/src/main/java/io/github/protocol/bookkeeper/package-info.java b/bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/package-info.java similarity index 100% rename from src/main/java/io/github/protocol/bookkeeper/package-info.java rename to bookkeeper-admin-jdk/src/main/java/io/github/protocol/bookkeeper/package-info.java diff --git a/src/test/java/io/github/protocol/bookkeeper/AutoRecoveryImplTest.java b/bookkeeper-admin-jdk/src/test/java/io/github/protocol/bookkeeper/AutoRecoveryImplTest.java similarity index 100% rename from src/test/java/io/github/protocol/bookkeeper/AutoRecoveryImplTest.java rename to bookkeeper-admin-jdk/src/test/java/io/github/protocol/bookkeeper/AutoRecoveryImplTest.java diff --git a/src/test/java/io/github/protocol/bookkeeper/BookiesImplTest.java b/bookkeeper-admin-jdk/src/test/java/io/github/protocol/bookkeeper/BookiesImplTest.java similarity index 100% rename from src/test/java/io/github/protocol/bookkeeper/BookiesImplTest.java rename to bookkeeper-admin-jdk/src/test/java/io/github/protocol/bookkeeper/BookiesImplTest.java diff --git a/src/test/java/io/github/protocol/bookkeeper/ConfigsImplTest.java b/bookkeeper-admin-jdk/src/test/java/io/github/protocol/bookkeeper/ConfigsImplTest.java similarity index 100% rename from src/test/java/io/github/protocol/bookkeeper/ConfigsImplTest.java rename to bookkeeper-admin-jdk/src/test/java/io/github/protocol/bookkeeper/ConfigsImplTest.java diff --git a/src/test/java/io/github/protocol/bookkeeper/HeartbeatTest.java b/bookkeeper-admin-jdk/src/test/java/io/github/protocol/bookkeeper/HeartbeatTest.java similarity index 100% rename from src/test/java/io/github/protocol/bookkeeper/HeartbeatTest.java rename to bookkeeper-admin-jdk/src/test/java/io/github/protocol/bookkeeper/HeartbeatTest.java diff --git a/src/test/resources/log4j2.xml b/bookkeeper-admin-jdk/src/test/resources/log4j2.xml similarity index 100% rename from src/test/resources/log4j2.xml rename to bookkeeper-admin-jdk/src/test/resources/log4j2.xml diff --git a/pom.xml b/pom.xml index c2bb20a..091d580 100644 --- a/pom.xml +++ b/pom.xml @@ -5,8 +5,13 @@ 4.0.0 io.github.protocol-laboratory - bookkeeper-admin-java + bookkeeper-admin-parent 0.0.1 + pom + + + bookkeeper-admin-jdk + 17 @@ -15,19 +20,20 @@ src/main/java 0.0.1 - 2.14.2 - 5.9.2 + 2.17.2 + 5.11.0 2.20.0 3.10.1 3.2.0 3.4.1 - 1.18.26 - 10.9.3 + 1.18.34 + 10.18.0 3.0.0-M6 - 2.0.0 + 2.1.0 3.2.1 4.7.2.0 + 2.43.0 3.0.0-M9 1.6.13 @@ -121,6 +127,25 @@ false + + com.diffplug.spotless + spotless-maven-plugin + ${spotless-maven-plugi.version} + + + + ,java,static others + + + + + + true + 4 + + + + org.apache.maven.plugins maven-release-plugin