Merge remote-tracking branch 'remotes/origin/1.2.0-jdk-17' into for-j…

…dk17-resolve-conflicts

.github/workflows/doc_en.yaml

@@ -28,13 +28,14 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      
+
       - name: Checkout frontend code
         uses: actions/checkout@v3
         with:
           repository: graph-cn/ngbatis-docs
           path: ngbatis-docs
-
+          ref: 7b17bd88148d39643185ba218e3a18ceb3877428
+
       - name: Place markdown file
         run: |
           cp -r docs/en/md/* ngbatis-docs/docs
@@ -46,7 +47,7 @@ jobs:
           node-version: 18
           cache: npm
           cache-dependency-path: ngbatis-docs/package-lock.json
-          
+
       - name: Setup Pages
         uses: actions/configure-pages@v3
       - name: Build with VitePress

.github/workflows/doc_en_pull_request_dryrun.yaml

@@ -0,0 +1,57 @@
+#
+name: Dry run Docs Build in PR
+
+on:
+  pull_request:
+    types: [opened, synchronize, reopened]
+    branches: [master]
+    paths:
+      - 'docs/**'
+      - '.github/workflows/**'
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+
+concurrency:
+  group: pages
+  cancel-in-progress: false
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Checkout frontend code
+        uses: actions/checkout@v3
+        with:
+          repository: graph-cn/ngbatis-docs
+          path: ngbatis-docs
+          ref: 7b17bd88148d39643185ba218e3a18ceb3877428
+
+      - name: Place markdown file
+        run: |
+          cp -r docs/en/md/* ngbatis-docs/docs
+          cp docs/en/vitepress.config.ts ngbatis-docs/docs/.vitepress/config.ts
+
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: npm
+          cache-dependency-path: ngbatis-docs/package-lock.json
+
+      - name: Dryrun Build with VitePress
+        run: |
+          cd ngbatis-docs
+          npm ci
+          npm run docs:build
+          touch docs/.vitepress/dist/.nojekyll

.github/workflows/markdown_lint.yaml

@@ -0,0 +1,29 @@
+#
+name: Lint Markdown
+
+on:
+  pull_request:
+    branches: [ for-jdk17 ]
+    paths:
+      - 'docs/**'
+      - '*.md'
+  workflow_dispatch:
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+          cache: npm
+      - name: Install dependencies and lint markdown
+        run: |
+          cd docs
+          npm ci
+          npm run lint-md

.github/workflows/pull_request.yml

@@ -10,6 +10,12 @@ on:
     branches:
       - master
       - 'v[0-9]+.*'
+    paths:
+      - 'src/**'
+      - 'ngbatis-demo/**'
+      - '**/*.xml'
+      - '*.xml'
+      - '.github/workflows/**'
 
 jobs:
   build:

.github/workflows/release.yml

@@ -11,12 +11,6 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v3
 
-      - name: Install Java and Maven
-        uses: actions/setup-java@v3
-        with:
-          java-version: '8'
-          distribution: 'temurin'
-
       - name: Install nebula-graph
         run: |
           mkdir tmp
@@ -30,10 +24,20 @@ jobs:
           popd
           popd
 
-      - name: Release Maven package
-        uses: samuelmeuli/action-maven-publish@v1
+      - name: Setup Java and Apache Maven Central
+        uses: actions/setup-java@v3
         with:
-          gpg_private_key: ${{ secrets.GPG_SECRET }}
-          gpg_passphrase: ${{ secrets.GPG_PASSWORD }}
-          nexus_username: ${{ secrets.OSSRH_USER }}
-          nexus_password: ${{ secrets.OSSRH_PASSWORD }}
+          java-version: '17'
+          distribution: 'temurin'
+          gpg-private-key: ${{ secrets.GPG_SECRET }}  # Import GPG key
+          gpg-passphrase: ${{ secrets.GPG_PASSWORD }}  # GPG passphrase
+          server-id: ossrh  # Server ID for Maven Central
+          server-username: MAVEN_USERNAME  # Environment variable for Maven username
+          server-password: MAVEN_PASSWORD  # Environment variable for Maven password
+
+      - name: Publish package
+        run: mvn --batch-mode deploy
+        env:
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USER }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSWORD }}

.github/workflows/snapshot.yaml

@@ -2,7 +2,7 @@ name: snapshot
 
 on:
   push:
-    branches: [ master ]
+    branches: [ for-jdk17 ]
   schedule:
     - cron: '0 6 * * *'
 
@@ -13,10 +13,10 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v3
 
-      - name: Install Java and Maven
+      - name: Setup Java
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'temurin'
 
       - name: Install nebula-graph
@@ -32,10 +32,20 @@ jobs:
           popd
           popd
 
-      - name: Deploy Snapshot to Maven package
-        uses: samuelmeuli/action-maven-publish@v1
+      - name: Set up Apache Maven Central
+        uses: actions/setup-java@v3
         with:
-          gpg_private_key: ${{ secrets.GPG_SECRET }}
-          gpg_passphrase: ${{ secrets.GPG_PASSWORD }}
-          nexus_username: ${{ secrets.OSSRH_USER }}
-          nexus_password: ${{ secrets.OSSRH_PASSWORD }}
+          java-version: '17'
+          distribution: 'temurin'
+          gpg-private-key: ${{ secrets.GPG_SECRET }}
+          gpg-passphrase: MAVEN_GPG_PASSPHRASE
+          server-id: ossrh
+          server-username: MAVEN_USERNAME
+          server-password: MAVEN_PASSWORD
+
+      - name: Publish package
+        run: mvn --batch-mode deploy -Dmaven.javadoc.skip=true
+        env:
+          MAVEN_USERNAME: ${{ secrets.OSSRH_USER }}
+          MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSWORD }}

.gitignore

@@ -28,3 +28,4 @@ build/
 
 ### vitepress ###
 .vitepress
+node_modules/

.markdownlint.json

@@ -0,0 +1,8 @@
+{
+  "default": true,
+  "MD013": false,
+  "MD041": false,
+  "MD033": false,
+  "MD024": false,
+  "MD001": false,
+}