Skip to content

Update to Mauro Core 5.4.0-SNAPSHOT #45

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.

Sign up for GitHub

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

Open
jamesrwelch wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Update to Mauro Core 5.4.0-SNAPSHOT #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3360544
Update to use new code coverage plugin. Also re-enable zulip notific…
jamesrwelch May 17, 2024
20b6d47
Fix mistake in modification
jamesrwelch May 17, 2024
6a11dec
enable Zulip notification
jamesrwelch May 17, 2024
a362d6d
Update to Mauro Core 5.4.0-SNAPSHOT and fix 2 tests:
- Paths are now …
jamesrwelch May 17, 2024
72e5940
Merge branch 'feature/updateJenkinsFile' into feature/gh-43
jamesrwelch May 17, 2024
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
4 changes: 2 additions & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,11 @@ pipeline {
recordIssues enabledForFailure: true, tool: spotBugs(pattern: '**/reports/spotbugs/*.xml', useRankAsPriority: true)
recordIssues enabledForFailure: true, tool: pmdParser(pattern: '**/reports/pmd/*.xml')

publishCoverage adapters: [jacocoAdapter('**/reports/jacoco/jacocoTestReport.xml')]
recordCoverage(tools: [[parser: 'JACOCO', pattern: '**/reports/jacoco/jacocoTestReport.xml']])
outputTestResults()
jacoco classPattern: '**/build/classes', execPattern: '**/build/jacoco/*.exec', sourceInclusionPattern: '**/*.java,**/*.groovy', sourcePattern: '**/src/main/groovy,**/grails-app/controllers,**/grails-app/domain,**/grails-app/DTOs,**/grails-app/services,**/grails-app/utils'
archiveArtifacts allowEmptyArchive: true, artifacts: '**/*.log'
//zulipNotification(topic: 'mdm-plugin-explorer')
zulipNotification(topic: 'mdm-plugin-explorer')
}
}
}
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ targetCompatibility=17
artifactory_contextUrl=https://jenkins.cs.ox.ac.uk/artifactory
mdmGradlePluginVersion=1.3.0
# Mauro Data Mapper
mdmCoreVersion=5.3.0
mdmCoreVersion=5.4.0-SNAPSHOT
# Grails
grailsVersion=5.3.2
grailsGradlePluginVersion=5.3.0
Expand Down
2 changes: 1 addition & 1 deletion ...st/groovy/uk/ac/ox/softeng/maurodatamapper/plugins/explorer/ExplorerFunctionalSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ class ExplorerFunctionalSpec extends BaseFunctionalSpec {
void 'root data model: should get root data model'() {
given:
loginUser('admin@maurodatamapper.com', 'password')
updateApiProperty('explorer.config.root_data_model_path', "fo:${rootFolder.label}|dm:${rootDataModel.label}")
updateApiProperty('explorer.config.root_data_model_path', "fo:${rootFolder.label}|dm:${rootDataModel.label}\$main")

when: 'get the root data model'
GET("/rootDataModel")
Expand Down
3 changes: 3 additions & 0 deletions ...vy/uk/ac/ox/softeng/maurodatamapper/plugins/explorer/research/SearchFunctionalSpec.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,6 +394,7 @@ class SearchFunctionalSpec extends BaseFunctionalSpec implements SecurityDefinit
"domainType": "DataClass"
}
],
"path": "dm:Search Functional Test Data Model$main|dc:patient|de:date_of_birth",
"profileFields": [
{
"fieldName":"Identifiable Data",
Expand Down Expand Up @@ -498,6 +499,7 @@ class SearchFunctionalSpec extends BaseFunctionalSpec implements SecurityDefinit
"domainType": "DataClass"
}
],
"path":"dm:Search Functional Test Data Model$main|dc:diagnosis|de:diagnosis_date",
"profileFields": [
{
"fieldName": "Identifiable Data",
Expand Down Expand Up @@ -626,6 +628,7 @@ class SearchFunctionalSpec extends BaseFunctionalSpec implements SecurityDefinit
"domainType": "DataClass"
}
],
"path":"dm:Search Functional Test Data Model$main|dc:lab_test|de:test_date",
"profileFields": [
{
"fieldName": "Identifiable Data",
Expand Down