Skip to content

Commit 6fd1bbf

Browse files
authored
Merge pull request #245 from marklogic/release/2.0.0
MLE-25780 Merging release/2.0.0 into master
2 parents e4ee239 + 30e0b0e commit 6fd1bbf

File tree

166 files changed

+1536
-3352
lines changed

Some content is hidden

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

166 files changed

+1536
-3352
lines changed

.copyrightconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# COPYRIGHT VALIDATION CONFIG
2+
# ---------------------------------
3+
# Required start year (keep fixed; end year auto-updates in check output)
4+
startyear: 2018
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: .github/*, docs/*, README.md, Jenkinsfile, gradle/*, docker-compose.yml, *.gradle, gradle.properties, gradlew, gradlew.bat, **/test/resources/**, *.md, *.txt

.env

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
# Defines environment variables for docker-compose.
2+
# Can be overridden via e.g. `MARKLOGIC_IMAGE=latest-10.0 docker-compose up -d --build`.
3+
MARKLOGIC_IMAGE=ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi-rootless:latest-12
4+
5+
# Defaults to a useful value for local development.
6+
MARKLOGIC_LOGS_VOLUME=./docker/marklogic/logs

.github/workflows/pr-workflow.yaml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: PR Workflow
2+
3+
on:
4+
# Using pull_request_target instead of pull_request to handle PRs from forks
5+
pull_request_target:
6+
types: [opened, edited, reopened, synchronize]
7+
8+
jobs:
9+
jira-pr-check:
10+
name: 🏷️ Validate JIRA ticket ID
11+
# Use the reusable workflow from the central repository
12+
uses: marklogic/pr-workflows/.github/workflows/jira-id-check.yml@main
13+
with:
14+
# Pass the PR title from the event context
15+
pr-title: ${{ github.event.pull_request.title }}
16+
copyright-validation:
17+
name: © Validate Copyright Headers
18+
uses: marklogic/pr-workflows/.github/workflows/copyright-check.yml@main
19+
permissions:
20+
contents: read
21+
pull-requests: write
22+
issues: write

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,6 @@ out
1010
marklogic-unit-test-client/bin/
1111
gradle-local.properties
1212
.vscode
13-
bin
13+
bin
14+
docker/
15+
dep.txt

.travis/install-dependencies.sh

Lines changed: 0 additions & 6 deletions
This file was deleted.

.travis/run-tests.sh

Lines changed: 0 additions & 6 deletions
This file was deleted.

.travis/setup-marklogic.sh

Lines changed: 0 additions & 12 deletions
This file was deleted.

.travis/travis-install-ml.sh

Lines changed: 0 additions & 77 deletions
This file was deleted.

CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
# Each line is a file pattern followed by one or more owners.
33

44
# These owners will be the default owners for everything in the repo.
5-
* @anu3990 @billfarber @rjrudin
5+
* @billfarber @rjrudin @stevebio

CONTRIBUTING.md

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Contributing to marklogic-unit-test
22

3-
marklogic-unit-test welcomes new contributors. This document will guide you through
4-
the process.
3+
marklogic-unit-test welcomes new contributors. This document will guide you through the process.
54

65
- [Building and Testing](#building)
76
- [Issues and Bugs](#issue)
@@ -10,20 +9,24 @@ the process.
109

1110
## <a name="building"></a> Building and Testing
1211

13-
After cloning this repository (or a fork of it), you can build and run the tests for marklogic-unit-test locally
14-
via the following steps:
12+
After cloning this repository (or a fork of it), you can build and run the tests for marklogic-unit-test
13+
locally.
14+
15+
Then create a Docker MarkLogic container, deploy the test-app to the container, and then run the tests via
16+
the following steps:
1517

1618
```
17-
echo "mlPassword=your admin user password" > marklogic-junit5/gradle-local.properties
19+
docker compose up -d --build
20+
./gradlew mlDeploy
1821
./gradlew test
1922
```
2023

21-
The `test` task will both deploy a test application to your MarkLogic instance - assumed to be running at `localhost` -
22-
and run a set of tests with this application. The application will include a MarkLogic app server on port 8008,
23-
which is defined by the `mlRestPort` property in marklogic-unit-test-client/gradle.properties. Some tests in
24-
the marklogic-junit5 subproject will also hit the MarkLogic App-Services app server on port 8000.
24+
The `mlDeploy` task will deploy a test application to your MarkLogic container. Then the `test` task will run
25+
a set of tests with this application. The test application will include a MarkLogic app server on port 8003,
26+
which is defined by the `mlRestPort` property in test-app/gradle.properties. Some tests in the
27+
marklogic-junit5 subproject will also hit the MarkLogic App-Services app server on port 8000.
2528

26-
After running `./gradlew test`, you can also point your browser at http://localhost:8008/test to access the
29+
After running `./gradlew test`, you can also point your browser at http://localhost:8003/test to access the
2730
marklogic-unit-test UI for running tests.
2831

2932
## Testing the documentation locally

0 commit comments

Comments
 (0)