Skip to content

Commit 03df827

Browse files
authored
Merge pull request #1847 from marklogic/release/8.0.0
MLE-12345 Merge release/8.0.0 into master
2 parents 69d3d2e + af2b8d3 commit 03df827

File tree

56 files changed

+1392
-1485
lines changed

Some content is hidden

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

56 files changed

+1392
-1485
lines changed

.copyrightconfig

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# COPYRIGHT VALIDATION CONFIG
2+
# ---------------------------------
3+
# Required start year (keep fixed; end year auto-updates in check output)
4+
startyear: 2010
5+
6+
# Optional exclusions list (comma-separated). Leave commented if none.
7+
# Rules:
8+
# - Relative paths (no leading ./)
9+
# - Simple * wildcard only (no recursive **)
10+
# - Use sparingly (third_party, generated, binary assets)
11+
# - Dotfiles already skipped automatically
12+
# Enable by removing the leading '# ' from the next line and editing values.
13+
# filesexcluded: third_party/*, docs/generated/*.md, assets/*.png, scripts/temp_*.py, vendor/lib.js
14+
filesexcluded: .github/*, README.md, Jenkinsfile, gradle/*, docker-compose.yaml, docker-compose.yml, *.gradle, gradle.properties, gradlew, gradlew.bat, **/test/resources/**, *.md, pom.xml

.env

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Defines environment variables for docker-compose.
22
# Can be overridden via e.g. `MARKLOGIC_TAG=latest-10.0 docker-compose up -d --build`.
3-
MARKLOGIC_IMAGE=progressofficial/marklogic-db:latest
43
MARKLOGIC_LOGS_VOLUME=./docker/marklogic/logs
4+
MARKLOGIC_IMAGE=ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12
55

6-
# This image should be used instead of the above image when testing functions that only work with MarkLogic 12.
7-
#MARKLOGIC_IMAGE=ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi:latest-12
6+
# Latest public release
7+
#MARKLOGIC_IMAGE=progressofficial/marklogic-db:latest

.github/workflows/pr-workflow.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: 🏷️ JIRA ID Validator
1+
name: PR Workflow
22

33
on:
44
# Using pull_request_target instead of pull_request to handle PRs from forks
@@ -14,3 +14,10 @@ jobs:
1414
with:
1515
# Pass the PR title from the event context
1616
pr-title: ${{ github.event.pull_request.title }}
17+
copyright-validation:
18+
name: © Validate Copyright Headers
19+
uses: marklogic/pr-workflows/.github/workflows/copyright-check.yml@main
20+
permissions:
21+
contents: read
22+
pull-requests: write
23+
issues: write

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,7 @@ ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/generate
3838

3939
.vscode
4040
docker/
41+
42+
.kotlin
43+
44+
dep.txt

CONTRIBUTING.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,7 @@ To build the client locally, complete the following steps:
77

88
1. Clone this repository on your machine.
99
2. Choose the appropriate branch (usually develop)
10-
3. Ensure you are using Java 8 or Java 11 or Java 17 (the JVM version used to compile should not matter as compiler flags
11-
are set to ensure the compiled code will run on Java 8; Jenkins pipelines also exist to ensure that the tests pass on
12-
Java 8, 11, and 17, and thus they should for you locally as well; note that if you load the project into an IDE, you
13-
should use Java 8 in case your IDE does not process the build.gradle config that conditionally brings in JAXB dependencies
14-
required by Java 9+.)
10+
3. Ensure you are using Java 17.
1511
4. Verify that you can build the client by running `./gradlew build -x test`
1612

1713
"Running the tests" in the context of developing and submitting a pull request refers to running the tests found

0 commit comments

Comments
 (0)