Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

for-jdk17 #263

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
85ee7b8
支持对nGQL语句片段引用的支持,类似于mybatis中的include一个sql片段。目前仅支持同文件的nGQL片段引用
1244453393 Sep 6, 2023
e90c234
Merge remote-tracking branch 'upstream/master'
1244453393 Sep 7, 2023
1892878
Merge branch 'master' of github.com:1244453393/ngbatis
1244453393 Sep 7, 2023
2659e2a
ng.include函数支持跨mapper文件引用nGQL
1244453393 Sep 7, 2023
d551fe5
修改代码风格符合规范
1244453393 Sep 7, 2023
736e56c
合并测试
1244453393 Sep 7, 2023
2045457
Revert "合并测试"
1244453393 Sep 7, 2023
64f0e72
ng.include函数支持额外参数
1244453393 Sep 7, 2023
1ae88e9
增加了一个适用于ngbatis-mapper文件的dtd约束,使得开发mapper能有所提示
1244453393 Sep 9, 2023
3dbb1cb
Merge pull request #212 from 1244453393/master
wey-gu Sep 10, 2023
3a63ac4
fix: ngbatis doc quick fix
wey-gu Sep 10, 2023
43c6637
Merge pull request #218 from nebula-contrib/fix_docs
wey-gu Sep 10, 2023
5bdde10
docs: i18n for ng.include
wey-gu Sep 10, 2023
9184866
docs: i18n for ng.include #219
wey-gu Sep 10, 2023
133ba92
ci: add .mk linter and formater
wey-gu Sep 10, 2023
beeda02
fix ci node setup
wey-gu Sep 10, 2023
a1bf451
ci: add .mk linter and formater #220
wey-gu Sep 10, 2023
e5035b7
ci: skip javadoc in maven publish
wey-gu Sep 10, 2023
f70259f
Merge pull request #221 from nebula-contrib/ci_skip_javadoc
wey-gu Sep 10, 2023
8443a74
fix maven_args in action-maven-publish@v1
wey-gu Sep 10, 2023
ed51dbe
#222 fix maven_args
wey-gu Sep 10, 2023
40c88fe
ci drop old gh action, use mvn directly
wey-gu Sep 10, 2023
ef14e07
Merge pull request #224 from nebula-contrib/drop_maven_gh_action
wey-gu Sep 10, 2023
93cd46d
路径查询实体 NgPath 增加 点、边 的详细数据
1244453393 Sep 11, 2023
f6c9ac7
?
1244453393 Sep 11, 2023
d9ea3e4
修改daobasic中shortestPath方法doc注释
1244453393 Sep 12, 2023
52771aa
给扩展后的NgPath实体增加javadoc
1244453393 Sep 13, 2023
37021bf
ci: fix publishing ci
wey-gu Sep 13, 2023
5495c1a
fix MAVEN_PASSWORD
wey-gu Sep 13, 2023
58282e5
Merge pull request #229 from nebula-contrib/ci_publish
wey-gu Sep 13, 2023
0bc8202
Extending NgPath from 1244453393 dieyi #228
wey-gu Sep 13, 2023
adb4646
ci: not setting up pages in doc dryrun
wey-gu Sep 13, 2023
4a888ea
fix: ci not setting up pages in doc dryrun #231
wey-gu Sep 13, 2023
a4c6a99
修改文件名称
shbone Sep 28, 2023
01580ad
Merge pull request #235 from shbone/shb_dev
wey-gu Sep 29, 2023
bfed2c3
Create .nojekyll
wey-gu Sep 29, 2023
d6b73ea
Merge pull request #238 from nebula-contrib/add-nojekyll
wey-gu Sep 29, 2023
6f9588f
test: add test space create script and instruction
shbone Oct 2, 2023
b9a74b2
test: add test space create script and instruction
shbone Oct 2, 2023
9d22549
Merge branch 'nebula-contrib:master' into shb_dev
shbone Oct 2, 2023
59dbbd1
Merge branch 'master' into shb_dev
shbone Oct 2, 2023
24b4f4a
test: add docker-compose.yaml to deploy and test automation
shbone Oct 2, 2023
c80fdc8
Merge branch 'shb_dev' of https://github.com/shbone/ngbatis into shb_dev
shbone Oct 2, 2023
d9bb53a
Merge pull request #1 from shbone/shb_dev
shbone Oct 2, 2023
d10eaa4
fix:class 'ResultSetUtil.java' parse datetime type error #240
jerryekohe Oct 7, 2023
fbeb601
Merge pull request #239 from shbone/master
wey-gu Oct 8, 2023
581185f
feat: add insertEdgeBatch interface, define the NgTriplet for the use…
shbone Oct 10, 2023
05ffeab
test: add test module
shbone Oct 10, 2023
cbe6d36
Merge branch 'shb_dev'
shbone Oct 10, 2023
202481f
move NgTriplet.java file position to main project
shbone Oct 13, 2023
6e040e7
Merge branch 'shb_dev'
shbone Oct 13, 2023
fde5976
edit the codestyle according to nebula_java_style_checks.xml
shbone Oct 14, 2023
b27d4e2
feat: add deleteByIdBatch interface (#2)
shbone Oct 14, 2023
9cdbe9c
feat: add deleteByIdBatch interface and my information
shbone Oct 16, 2023
2d48962
update change format
shbone Oct 16, 2023
b1b00a0
Revert "update change format"
shbone Oct 16, 2023
91275ed
edit deleteByIdBatch delete method
shbone Oct 22, 2023
5e75595
Merge pull request #241 from bobobod/master
CorvusYe Oct 23, 2023
c67c017
Merge pull request #244 from shbone/master
CorvusYe Oct 23, 2023
4c97021
update deleteByIdBatch delete method
shbone Oct 24, 2023
be5f3f6
Merge branch 'master' into shb_dev2
wey-gu Oct 24, 2023
b2ee3d2
fix change loss in rebasing
wey-gu Oct 24, 2023
70abae2
Merge pull request #247 from shbone/shb_dev2
wey-gu Oct 25, 2023
5775f04
Update operation-sequence.md
syedzubeen Oct 25, 2023
069595e
add EXECUTION-PROCESS.md to docs
syedzubeen Oct 25, 2023
7202a50
ci: remove file scope of vitepress
wey-gu Oct 26, 2023
0cc650f
Fix linter issues
syedzubeen Oct 26, 2023
797695a
Fix dead link in operation-sequence.md
syedzubeen Oct 27, 2023
5a2dee7
Merge pull request #251 from nebula-contrib/fix_vitpress
wey-gu Oct 28, 2023
983ddcc
Merge pull request #250 from syedzubeen/master
wey-gu Oct 28, 2023
6f1dab4
fix: remove duplicate methods in test case.
CorvusYe Nov 10, 2023
11bdbf1
fix: support methods in mapper tags to set space to null.
CorvusYe Nov 10, 2023
985a8de
lint: fix CHANGELOG.md lint
CorvusYe Nov 10, 2023
386b730
Merge pull request #254 from CorvusYe/master
wey-gu Nov 12, 2023
ab3b3ef
fix: code style
CorvusYe Nov 13, 2023
11b6cf9
chore: beetl and anltr4 version upgrade
CorvusYe Nov 13, 2023
7e3d38c
Merge pull request #255 from CorvusYe/master
wey-gu Nov 14, 2023
c90bcf2
fix: disable automatic space switching when the current space is null
CorvusYe Nov 14, 2023
0fb7704
v1.2.0-beta
CorvusYe Nov 14, 2023
9fd0589
v1.2.0-beta
CorvusYe Nov 14, 2023
4ecec68
v1.2.0-beta
CorvusYe Nov 14, 2023
ea999cd
Merge pull request #256 from CorvusYe/master
CorvusYe Nov 15, 2023
4887ead
chore: modify the 'release' workflow to include Javadoc
CorvusYe Nov 15, 2023
a9a7826
Merge pull request #257 from CorvusYe/master
Nicole00 Nov 15, 2023
fdd2e89
ci: fix mvn deploy gpg signing
wey-gu Nov 15, 2023
14c6018
Merge pull request #258 from nebula-contrib/wey-gu-gpg-ci-fix
Nicole00 Nov 15, 2023
f0a9a1c
supports jdk17
CorvusYe Nov 21, 2023
e0604f3
Merge remote-tracking branch 'remotes/upstream/for-jdk17' into 1.2.0-…
CorvusYe Nov 21, 2023
eca999e
supports jdk17
CorvusYe Nov 21, 2023
805b475
lint: CHANGELOG.md
CorvusYe Nov 21, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .github/workflows/doc_en.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
57 changes: 57 additions & 0 deletions .github/workflows/doc_en_pull_request_dryrun.yaml
Original file line number Diff line number Diff line change
@@ -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
29 changes: 29 additions & 0 deletions .github/workflows/markdown_lint.yaml
Original file line number Diff line number Diff line change
@@ -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
6 changes: 6 additions & 0 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,12 @@ on:
branches:
- master
- 'v[0-9]+.*'
paths:
- 'src/**'
- 'ngbatis-demo/**'
- '**/*.xml'
- '*.xml'
- '.github/workflows/**'

jobs:
build:
Expand Down
28 changes: 16 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
28 changes: 19 additions & 9 deletions .github/workflows/snapshot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: snapshot

on:
push:
branches: [ master ]
branches: [ for-jdk17 ]
schedule:
- cron: '0 6 * * *'

Expand All @@ -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
Expand All @@ -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 }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ build/

### vitepress ###
.vitepress
node_modules/
8 changes: 8 additions & 0 deletions .markdownlint.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"default": true,
"MD013": false,
"MD041": false,
"MD033": false,
"MD024": false,
"MD001": false,
}
Loading