Skip to content

Merge release/6.4.0 into master #1621

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

Merged
merged 33 commits into from
Nov 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
4bfb61b
Attempting to fix testStopBeforeListenerisComplete
rjrudin Sep 11, 2023
3b73a4a
Refactored logic for determining SSL inputs
rjrudin Oct 2, 2023
f849cf4
Merge pull request #1607 from marklogic/feature/ssl-cleanup
rjrudin Oct 2, 2023
9e47be9
Added test for certificate auth with file and password
rjrudin Oct 2, 2023
b0a0710
Merge pull request #1608 from marklogic/feature/certificate-file-auth…
rjrudin Oct 3, 2023
0059fed
Added vscode to gitignore
rjrudin Oct 6, 2023
2acbd67
Trying to fix NOTICE
rjrudin Oct 16, 2023
ac237b7
#1603 Deprecating the `directory` method that receives a depth value
rjrudin Oct 18, 2023
97da46c
Merge pull request #1610 from marklogic/feature/1603-docs
rjrudin Oct 18, 2023
546dd45
Renamed some things in SSL tests to improve clarity
rjrudin Oct 24, 2023
421350d
Merge pull request #1611 from marklogic/feature/ssl-test-renaming
rjrudin Oct 24, 2023
30ae066
DEVEXP-563 Added geohashSubhashes to Optic plan builder
rjrudin Oct 24, 2023
0c245f9
DEVEXP-585 Can now configure 2-way SSL
rjrudin Oct 24, 2023
1b0bb02
Merge pull request #1613 from marklogic/feature/563-optic-part-1
rjrudin Oct 24, 2023
b09199e
DEVEXP-563 Added support for other 11.1 Optic methods
rjrudin Oct 24, 2023
2e968cb
Merge pull request #1615 from marklogic/feature/563-optic-methods
rjrudin Oct 25, 2023
d37662a
Merge pull request #1614 from marklogic/feature/585-2way-ssl
rjrudin Oct 25, 2023
42692da
Improved SetMaxBatchesTest
rjrudin Nov 7, 2023
7dc8104
Merge pull request #1616 from marklogic/feature/set-max-batches-test
rjrudin Nov 7, 2023
df70a1e
Small cleanup before 6.4.0 release
rjrudin Nov 8, 2023
8b5ffa2
Merge pull request #1617 from marklogic/feature/cleanup
rjrudin Nov 8, 2023
7c76dbb
Trying to fix Jenkins tests
rjrudin Nov 8, 2023
b55f9c4
Merge pull request #1618 from marklogic/feature/test-fixes
rjrudin Nov 8, 2023
a0f605b
Trying to fix tests still
rjrudin Nov 8, 2023
2c901b7
Another attempt to fix tests
rjrudin Nov 9, 2023
4fe6bb9
Small fix for ColumnInfoTest
rjrudin Nov 14, 2023
d9f71e9
Updated Jenkinsfile to use latest releases
rjrudin Nov 14, 2023
4eeca8b
Merge pull request #1619 from marklogic/feature/jenkinsfile
rjrudin Nov 14, 2023
cd1d847
Fixing compiler warnings
rjrudin Nov 14, 2023
0e5bb77
Merge pull request #1620 from marklogic/feature/compiler-warnings
rjrudin Nov 14, 2023
83bee80
Fixed small typo in deprecation notice
rjrudin Nov 14, 2023
254654e
Bumped to 6.4.0
rjrudin Nov 8, 2023
bf0ff0c
Merge branch 'master' into release/6.4.0
rjrudin Nov 14, 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
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,5 @@ xml-with-props.xml

ml-development-tools/src/test/ml-modules
ml-development-tools/src/test/java/com/marklogic/client/test/dbfunction/generated

.vscode
20 changes: 10 additions & 10 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ def runAllTests(String type, String version, Boolean useReverseProxy){
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
cd java-client-api
./gradlew -i mlDeploy -PmlForestDataDirectory=/space
./gradlew -i mlDeploy mlReloadSchemas -PmlForestDataDirectory=/space
'''

if (useReverseProxy) {
Expand Down Expand Up @@ -152,16 +152,16 @@ pipeline{
}
}
steps {
copyRPM 'Latest','11'
copyRPM 'Release','11.1.0'
setUpML '$WORKSPACE/xdmp/src/Mark*.rpm'
copyConvertersRPM 'Latest','11'
copyConvertersRPM 'Release','11.1.0'
setUpMLConverters '$WORKSPACE/xdmp/src/Mark*Converters*.rpm'
sh label:'deploy test app', script: '''#!/bin/bash
export JAVA_HOME=$JAVA_HOME_DIR
export GRADLE_USER_HOME=$WORKSPACE/$GRADLE_DIR
export PATH=$GRADLE_USER_HOME:$JAVA_HOME/bin:$PATH
cd java-client-api
./gradlew -i mlDeploy -PmlForestDataDirectory=/space
./gradlew -i mlDeploy mlReloadSchemas -PmlForestDataDirectory=/space
'''
sh label:'run marklogic-client-api tests', script: '''#!/bin/bash
export JAVA_HOME=$JAVA_HOME_DIR
Expand Down Expand Up @@ -192,41 +192,41 @@ pipeline{
'''
}
}
stage('regressions-11-Latest') {
stage('regressions-11-Release') {
when {
allOf {
branch 'develop'
expression {return params.regressions}
}
}
steps {
runAllTests('Latest', '11', false)
runAllTests('Release', '11.1.0', false)
junit '**/build/**/TEST*.xml'
}
}

stage('regressions-11-Latest-reverseProxy') {
stage('regressions-11-Release-reverseProxy') {
when {
allOf {
branch 'develop'
expression {return params.regressions}
}
}
steps {
runAllTests('Latest', '11', true)
runAllTests('Release', '11.1.0', true)
junit '**/build/**/TEST*.xml'
}
}

stage('regressions-10.0-9') {
stage('regressions-10.0-10.2') {
when {
allOf {
branch 'develop'
expression {return params.regressions}
}
}
steps {
runAllTests('Release', '10.0-9.5', false)
runAllTests('Release', '10.0-10.2', false)
junit '**/build/**/TEST*.xml'
}
}
Expand Down
Loading