Merge pull request #132 from marklogic/release/1.3.1

MLE-26598 Merge release/1.3.1 into master

Author: rjrudin

.copyrightconfig

@@ -0,0 +1,13 @@
+# COPYRIGHT VALIDATION CONFIG
+# ---------------------------------
+# Required start year (keep fixed; end year auto-updates in check output)
+startyear: 2023
+
+# Optional exclusions list (comma-separated). Leave commented if none.
+# Rules:
+#   - Relative paths (no leading ./)
+#   - Simple * wildcard only (no recursive **)
+#   - Use sparingly (third_party, generated, binary assets)
+#   - Dotfiles already skipped automatically
+# Enable by removing the leading '# ' from the next line and editing values.
+filesexcluded: .github/*, README.md, Jenkinsfile, gradle/*, docker-compose.yml, *.gradle, gradle.properties, gradlew, gradlew.bat, CODEOWNERS, *.lock, *.toml

.github/workflows/pr-workflow.yaml

@@ -1,4 +1,4 @@
-name: 🏷️ JIRA ID Validator
+name: PR Workflow
 
 on:
   # Using pull_request_target instead of pull_request to handle PRs from forks
@@ -14,3 +14,10 @@ jobs:
     with:
       # Pass the PR title from the event context
       pr-title: ${{ github.event.pull_request.title }}
+  copyright-validation:
+    name: © Validate Copyright Headers
+    uses: marklogic/pr-workflows/.github/workflows/copyright-check.yml@main
+    permissions:
+      contents: read
+      pull-requests: write
+      issues: write

CODEOWNERS

@@ -2,4 +2,4 @@
 # Each line is a file pattern followed by one or more owners.
 
 # These owners will be the default owners for everything in the repo.
-* @anu3990 @billfarber @rjrudin
+* @stevebio @billfarber @rjrudin

Jenkinsfile

@@ -32,8 +32,7 @@ pipeline{
                 export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
                 export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
                 cd marklogic-python-client/test-app
-                echo "Waiting for MarkLogic server to initialize."
-                sleep 60s
+                ./gradlew -i mlWaitTillReady
                 ./gradlew -i mlDeploy -PmlPassword=admin
               '''
               // 'set -e' causes the script to fail if any command fails.

NOTICE.txt

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "marklogic-python-client"
-version = "1.3.0"
+version = "1.3.1"
 description = "Python client for MarkLogic, built on the requests library"
 authors = ["MarkLogic <general@developer.marklogic.com>"]
 readme = "README.md"
@@ -9,9 +9,12 @@ license = "Apache 2.0"
 
 [tool.poetry.dependencies]
 python = "^3.9"
-requests = "^2.32.4"
+requests = "^2.32.5"
 requests_toolbelt = "^1.0.0"
 
+# Forcing version to eliminate CVEs; transitive dependency of requests.
+urllib3 = "^2.6.3"
+
 [tool.poetry.group.test.dependencies]
 pytest = "^7.4.0"
 
@@ -20,6 +23,9 @@ flake8 = "^7.1.1"
 black = ">=23.3,<25.0"
 ipykernel = "^6.30.1"
 
+# Forcing latest version to eliminate CVEs; transitive dependency of ipykernel.
+jupyter-core = "^5.8.1"
+
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"

poetry.lock

@@ -1,8 +1,22 @@
+buildscript {
+  repositories {
+    mavenCentral()
+    // Needed for ml-gradle 6.2-SNAPSHOT
+    maven {
+      url = "https://bed-artifactory.bedford.progress.com:443/artifactory/ml-maven-snapshots/"
+    }
+  }
+  dependencies {
+    classpath "com.marklogic:ml-gradle:6.2-SNAPSHOT"
+  }
+}
+
 plugins {
-    id 'net.saliman.properties' version '1.5.2'
-    id 'com.marklogic.ml-gradle' version '5.0.0'
+  id "net.saliman.properties" version "1.6.0"
 }
 
+apply plugin: "com.marklogic.ml-gradle"
+
 // Generate a temporary certificate for some simple SSL tests
 ext {
     def command = new com.marklogic.appdeployer.command.security.GenerateTemporaryCertificateCommand()

pyproject.toml

@@ -5,6 +5,10 @@ services:
   marklogic:
     image: "${MARKLOGIC_IMAGE}"
     platform: linux/amd64
+    # The NET_RAW capability allows a process to create raw sockets. Polaris does not like that.
+    # This setting removes the NET_RAW capability from the container.
+    cap_drop:
+      - NET_RAW
     environment:
       - INSTALL_CONVERTERS=true
       - MARKLOGIC_INIT=true