Skip to content

Commit a8258c9

Browse files
jamesfredleyjamesfredley
committed
Merge remote-tracking branch 'neo4j/8.2.x' into 9.0.x
2 parents 2f4335a + 2b3618c commit a8258c9

File tree

403 files changed

+47221
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

403 files changed

+47221
-0
lines changed

‎neo4j/.github/dependabot.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: gradle
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
open-pull-requests-limit: 10
8+
target-branch: 7.3.x
9+
ignore:
10+
- dependency-name: "*"
11+
update-types: [ "version-update:semver-patch", "version-update:semver-minor" ]

‎neo4j/.github/release-drafter.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name-template: $RESOLVED_VERSION
2+
tag-template: v$RESOLVED_VERSION
3+
categories:
4+
- title: ✨ Features
5+
labels:
6+
- "type: enhancement"
7+
- "type: new feature"
8+
- "type: major"
9+
- title: 🐛 Bug Fixes/Improvements
10+
labels:
11+
- "type: improvement"
12+
- "type: bug"
13+
- "type: minor"
14+
- title: 🛠 Dependency upgrades
15+
labels:
16+
- "type: dependency upgrade"
17+
- "dependencies"
18+
- title: ⚙️ Build/CI
19+
labels:
20+
- "type: ci"
21+
- "type: build"
22+
change-template: '- $TITLE @$AUTHOR (#$NUMBER)'
23+
version-resolver:
24+
major:
25+
labels:
26+
- 'type: major'
27+
minor:
28+
labels:
29+
- 'type: minor'
30+
patch:
31+
labels:
32+
- 'type: patch'
33+
default: patch
34+
template: |
35+
## What's Changed
36+
37+
$CHANGES
38+
39+
## Contributors
40+
41+
$CONTRIBUTORS

‎neo4j/.github/renovate.json‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
{
2+
"extends": [
3+
"config:base"
4+
],
5+
"labels": [
6+
"type: dependency upgrade"
7+
],
8+
"packageRules": [
9+
{
10+
"matchPackagePatterns": [
11+
"*"
12+
],
13+
"allowedVersions": "!/SNAPSHOT$/"
14+
},
15+
{
16+
"matchPackagePatterns": [
17+
"^org\\.codehaus\\.groovy"
18+
],
19+
"groupName": "groovy monorepo"
20+
},
21+
{
22+
"matchPackageNames": [
23+
"org.grails:grails-datastore-core",
24+
"org.grails:grails-datastore-web",
25+
"org.grails:grails-datastore-aync",
26+
"org.grails:grails-datastore-gorm",
27+
"org.grails:grails-datastore-gorm-support",
28+
"org.grails:grails-datastore-gorm-async",
29+
"org.grails:grails-datastore-gorm-rx",
30+
"org.grails:grails-datastore-gorm-test",
31+
"org.grails:grails-datastore-gorm-tck",
32+
"org.grails:grails-datastore-gorm-validation"
33+
],
34+
"groupName": "gorm-datastore monorepo"
35+
},
36+
{
37+
"matchPackageNames": [
38+
"org.grails:grails-bom",
39+
"org.grails:grails-bootstrap",
40+
"org.grails:grails-codecs",
41+
"org.grails:grails-console",
42+
"org.grails:grails-core",
43+
"org.grails:grails-databinding",
44+
"org.grails:grails-dependencies",
45+
"org.grails:grails-docs",
46+
"org.grails:grails-encoder",
47+
"org.grails:grails-gradle-model",
48+
"org.grails:grails-logging",
49+
"org.grails:grails-plugin-codecs",
50+
"org.grails:grails-plugin-controllers",
51+
"org.grails:grails-plugin-databinding",
52+
"org.grails:grails-plugin-datasource",
53+
"org.grails:grails-plugin-domain-class",
54+
"org.grails:grails-plugin-i18n",
55+
"org.grails:grails-plugin-interceptors",
56+
"org.grails:grails-plugin-mimetypes",
57+
"org.grails:grails-plugin-rest",
58+
"org.grails:grails-plugin-services",
59+
"org.grails:grails-plugin-url-mappings",
60+
"org.grails:grails-plugin-url-validation",
61+
"org.grails:grails-shell",
62+
"org.grails:grails-spring",
63+
"org.grails:grails-test",
64+
"org.grails:grails-validation",
65+
"org.grails:grails-web",
66+
"org.grails:grails-web-boot",
67+
"org.grails:grails-web-common",
68+
"org.grails:grails-web-databinding",
69+
"org.grails:grails-web-fileupload",
70+
"org.grails:grails-web-mvc",
71+
"org.grails:grails-web-url-mappings",
72+
"org.grails:grails-gradle-plugin"
73+
],
74+
"groupName": "grails monorepo"
75+
}
76+
]
77+
}

‎neo4j/.github/workflows/gradle.yml‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
name: Java CI
2+
on:
3+
push:
4+
branches:
5+
- '[7-9]+.[0-9]+.x'
6+
pull_request:
7+
branches:
8+
- '[7-9]+.[0-9]+.x'
9+
workflow_dispatch:
10+
jobs:
11+
build:
12+
runs-on: ubuntu-latest
13+
env:
14+
WORKSPACE: ${{ github.workspace }}
15+
GRADLE_OPTS: -Xmx1500m -Dfile.encoding=UTF-8
16+
steps:
17+
- uses: actions/checkout@v4
18+
- name: Set up JDK
19+
uses: actions/setup-java@v4
20+
with:
21+
distribution: 'adopt'
22+
java-version: '11'
23+
- name: Run Build
24+
id: build
25+
uses: gradle/gradle-build-action@v2
26+
env:
27+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
28+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
29+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
30+
with:
31+
arguments: build -Dgeb.env=chromeHeadless
32+
publish:
33+
runs-on: ubuntu-latest
34+
needs: ['build']
35+
if: github.event_name == 'push'
36+
steps:
37+
- uses: actions/checkout@v4
38+
- name: Set up JDK
39+
uses: actions/setup-java@v4
40+
with:
41+
distribution: 'adopt'
42+
java-version: '11'
43+
- name: Publish Artifacts (repo.grails.org)
44+
id: publish
45+
uses: gradle/gradle-build-action@v2
46+
if: steps.build.outcome == 'success' && github.event_name == 'push'
47+
env:
48+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
49+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
50+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
51+
ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
52+
ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
53+
with:
54+
arguments: -Dorg.gradle.internal.publish.checksums.insecure=true publish
55+
- name: Build Docs
56+
id: docs
57+
if: steps.build.outcome == 'success' && github.event_name == 'push'
58+
uses: gradle/gradle-build-action@v2
59+
env:
60+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
61+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
62+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
63+
with:
64+
arguments: docs:docs
65+
- name: Determine docs target repository
66+
if: steps.docs.outcome == 'success' && github.event_name == 'push'
67+
uses: haya14busa/action-cond@v1
68+
id: docs_target
69+
with:
70+
cond: ${{ github.repository == 'grails/gorm-hibernate5' }}
71+
if_true: "grails/grails-data-mapping"
72+
if_false: ${{ github.repository }}
73+
- name: Publish to Github Pages
74+
if: steps.docs.outcome == 'success' && github.event_name == 'push'
75+
uses: micronaut-projects/github-pages-deploy-action@grails
76+
env:
77+
TARGET_REPOSITORY: ${{ steps.docs_target.outputs.value }}
78+
GH_TOKEN: ${{ secrets.GH_TOKEN }}
79+
BRANCH: gh-pages
80+
FOLDER: docs/build/docs
81+
DOC_SUB_FOLDER: neo4j
82+
DOC_FOLDER: gh-pages
83+
COMMIT_EMAIL: [email protected]
84+
COMMIT_NAME: Puneet Behl

‎neo4j/.github/workflows/groovy-joint-workflow.yml‎

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
16+
name: "Grails Joint Validation Build"
17+
# GROOVY_2_5_X == Grails 4.0.x
18+
# GROOVY_3_0_X == grails master
19+
# Groovy master branch does not map to any due to changed package names.
20+
on:
21+
push:
22+
branches:
23+
- '[8-9]+.[0-9]+.x'
24+
pull_request:
25+
branches:
26+
- '[8-9]+.[0-9]+.x'
27+
workflow_dispatch:
28+
permissions:
29+
contents: read
30+
env:
31+
CI_GROOVY_VERSION:
32+
jobs:
33+
build_groovy:
34+
strategy:
35+
fail-fast: true
36+
runs-on: ubuntu-latest
37+
outputs:
38+
groovyVersion: ${{ steps.groovy-version.outputs.value }}
39+
steps:
40+
- name: Set up JDK
41+
uses: actions/setup-java@v4
42+
with:
43+
distribution: 'adopt'
44+
java-version: '11.0.6'
45+
- name: Cache local Maven repository & Groovy
46+
uses: actions/cache@v4
47+
with:
48+
path: |
49+
~/groovy
50+
~/.m2/repository
51+
key: cache-local-groovy-maven-${{ github.sha }}
52+
- name: Checkout Groovy 3_0_X (Grails 5 and later)
53+
if: startsWith(github.ref, 'refs/heads/8.') || startsWith(github.base_ref, '8.')
54+
run: cd .. && git clone --depth 1 https://github.com/apache/groovy.git -b GROOVY_3_0_X --single-branch
55+
- name: Set CI_GROOVY_VERSION for Grails
56+
id: groovy-version
57+
run: |
58+
cd ../groovy
59+
echo "CI_GROOVY_VERSION=$(cat gradle.properties | grep groovyVersion | cut -d\= -f2 | tr -d '[:space:]')" >> $GITHUB_ENV
60+
echo "value=$(cat gradle.properties | grep groovyVersion | cut -d\= -f2 | tr -d '[:space:]')" >> $GITHUB_OUTPUT
61+
- name: Prepare GE Set-up Configuration
62+
id: ge_conf
63+
run: |
64+
echo "VALUE<<EOF" >> $GITHUB_OUTPUT
65+
echo "plugins { " >> $GITHUB_OUTPUT
66+
echo " id 'com.gradle.enterprise' version '3.15.1'" >> $GITHUB_OUTPUT
67+
echo " id 'com.gradle.common-custom-user-data-gradle-plugin' version '1.11.3'" >> $GITHUB_OUTPUT
68+
echo "}" >> $GITHUB_OUTPUT
69+
echo "" >> $GITHUB_OUTPUT
70+
echo "gradleEnterprise {" >> $GITHUB_OUTPUT
71+
echo " server = 'https://ge.grails.org'" >> $GITHUB_OUTPUT
72+
echo " buildScan {" >> $GITHUB_OUTPUT
73+
echo " publishAlways()" >> $GITHUB_OUTPUT
74+
echo " publishIfAuthenticated()" >> $GITHUB_OUTPUT
75+
echo " uploadInBackground = System.getenv('CI') == null" >> $GITHUB_OUTPUT
76+
echo " capture {" >> $GITHUB_OUTPUT
77+
echo " taskInputFiles = true" >> $GITHUB_OUTPUT
78+
echo " }" >> $GITHUB_OUTPUT
79+
echo " }" >> $GITHUB_OUTPUT
80+
echo "}" >> $GITHUB_OUTPUT
81+
echo "" >> $GITHUB_OUTPUT
82+
echo "buildCache {" >> $GITHUB_OUTPUT
83+
echo " local { enabled = System.getenv('CI') != 'true' }" >> $GITHUB_OUTPUT
84+
echo " remote(HttpBuildCache) {" >> $GITHUB_OUTPUT
85+
echo " push = System.getenv('CI') == 'true'" >> $GITHUB_OUTPUT
86+
echo " enabled = true" >> $GITHUB_OUTPUT
87+
echo " url = 'https://ge.grails.org/cache/'" >> $GITHUB_OUTPUT
88+
echo " credentials {" >> $GITHUB_OUTPUT
89+
echo " username = System.getenv('GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER')" >> $GITHUB_OUTPUT
90+
echo " password = System.getenv('GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY')" >> $GITHUB_OUTPUT
91+
echo " }" >> $GITHUB_OUTPUT
92+
echo " }" >> $GITHUB_OUTPUT
93+
echo "}" >> $GITHUB_OUTPUT
94+
echo "" >> $GITHUB_OUTPUT
95+
echo "EOF" >> $GITHUB_OUTPUT
96+
- name: Gradle Enterprise Set-up
97+
run: |
98+
cd ../groovy
99+
# Delete exiting plugins and build-scan from settings.gradle file
100+
sed -i '21,31d' settings.gradle
101+
# Add Gradle Enterprise set-up related configuration after line no 20 in settings.gradle
102+
echo "${{ steps.ge_conf.outputs.value}}" | sed -i -e "20r /dev/stdin" settings.gradle
103+
- name: Build and install groovy (no docs)
104+
uses: gradle/gradle-build-action@v2
105+
env:
106+
GRADLE_SCANS_ACCEPT: yes
107+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
108+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
109+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
110+
with:
111+
build-root-directory: ../groovy
112+
arguments: |
113+
install
114+
-x groovydoc
115+
-x javadoc
116+
-x javadocAll
117+
-x groovydocAll
118+
-x asciidoc
119+
-x docGDK
120+
build_gorm_neo4j:
121+
needs: [build_groovy]
122+
strategy:
123+
fail-fast: true
124+
runs-on: ubuntu-latest
125+
steps:
126+
- uses: actions/checkout@v4
127+
- name: Set up JDK
128+
uses: actions/setup-java@v4
129+
with:
130+
distribution: 'adopt'
131+
java-version: '11'
132+
- name: Cache local Maven repository & Groovy
133+
uses: actions/cache@v4
134+
with:
135+
path: |
136+
~/groovy
137+
~/.m2/repository
138+
key: cache-local-groovy-maven-${{ github.sha }}
139+
- name: Set CI_GROOVY_VERSION for Grails
140+
run: |
141+
echo "CI_GROOVY_VERSION=${{needs.build_groovy.outputs.groovyVersion}}" >> $GITHUB_ENV
142+
- name: Build GORM Neo4J
143+
id: build_gorm_neo4j
144+
uses: gradle/gradle-build-action@v2
145+
env:
146+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
147+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
148+
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
149+
with:
150+
arguments: |
151+
build
152+
-Dgeb.env=chromeHeadless
153+
-x groovydoc

0 commit comments

Comments
 (0)