From f7ebbadcc46c1867aafa97869612f1a158122a78 Mon Sep 17 00:00:00 2001 From: James Welch Date: Tue, 13 Aug 2024 16:12:24 +0100 Subject: [PATCH] More fixes to buildscripts and repositories and dependencies --- .github/workflows/gradle.yml | 2 +- build.gradle | 3 +-- gradle.properties | 2 +- mdm-bom/build.gradle | 6 +++--- mdm-common/build.gradle | 16 ++++++++++++++-- mdm-core/build.gradle | 6 +++--- mdm-plugin-authentication-apikey/build.gradle | 6 +++--- mdm-plugin-authentication-basic/build.gradle | 6 +++--- mdm-plugin-dataflow/build.gradle | 6 +++--- mdm-plugin-datamodel/build.gradle | 6 +++--- mdm-plugin-email-proxy/build.gradle | 6 +++--- mdm-plugin-federation/build.gradle | 6 +++--- mdm-plugin-profile/build.gradle | 6 +++--- mdm-plugin-referencedata/build.gradle | 6 +++--- mdm-plugin-terminology/build.gradle | 6 +++--- mdm-security/build.gradle | 6 +++--- mdm-testing-framework/build.gradle | 10 +++++++++- mdm-testing-functional/build.gradle | 6 +++--- 18 files changed, 65 insertions(+), 46 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 38178e62c..f0ff11950 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -63,7 +63,7 @@ jobs: ./gradlew -v ./gradlew jvmArgs sysProps - - name: Mdm-core gradle info + - name: Mdm-core grails info working-directory: ./mdm-core run: | ./grailsw -v diff --git a/build.gradle b/build.gradle index b5545d9af..c33ef8b10 100644 --- a/build.gradle +++ b/build.gradle @@ -15,8 +15,7 @@ buildscript { maven {url 'https://plugins.gradle.org/m2/'} } dependencies { - classpath "uk.ac.ox.softeng.maurodatamapper.gradle:mdm-gradle-plugin:$mdmGradlePluginVersion" - classpath "uk.ac.ox.softeng.maurodatamapper.gradle:mdm-gradle-plugin:$mdmGradlePluginVersion" + classpath "org.maurodata:mdm-gradle-plugin:$mdmGradlePluginVersion" } configurations.all { // check for updates every build diff --git a/gradle.properties b/gradle.properties index 061eb5a39..2ba1e40c5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ org.gradle.caching=true sourceCompatibility=17 targetCompatibility=17 # Deployment & Build -mdmGradlePluginVersion=1.3.0 +mdmGradlePluginVersion=8.0.1 # Explode all plugins exploded=true # Grails diff --git a/mdm-bom/build.gradle b/mdm-bom/build.gradle index 14270ae29..4b265d2e1 100644 --- a/mdm-bom/build.gradle +++ b/mdm-bom/build.gradle @@ -9,7 +9,7 @@ buildscript { maven {url 'https://plugins.gradle.org/m2/'} } dependencies { - classpath "uk.ac.ox.softeng.maurodatamapper.gradle:mdm-gradle-plugin:$mdmGradlePluginVersion" + classpath "org.maurodata:mdm-gradle-plugin:$mdmGradlePluginVersion" } } @@ -24,8 +24,8 @@ apply plugin: 'ox.softeng.ox-brc-artifactory' repositories { mavenLocal() mavenCentral() - maven {url 'https://mauro-repository.com/libs-snapshot'} - maven {url 'https://mauro-repository.com/libs-release'} + maven {url 'https://mauro-repository.com/libs-snapshot-local'} + maven {url 'https://mauro-repository.com/libs-release-local'} } publishing { diff --git a/mdm-common/build.gradle b/mdm-common/build.gradle index 76576de7a..e0bda5989 100644 --- a/mdm-common/build.gradle +++ b/mdm-common/build.gradle @@ -10,7 +10,7 @@ buildscript { maven {url 'https://plugins.gradle.org/m2/'} } dependencies { - classpath "uk.ac.ox.softeng.maurodatamapper.gradle:mdm-gradle-plugin:$mdmGradlePluginVersion" + classpath "org.maurodata:mdm-gradle-plugin:$mdmGradlePluginVersion" } } @@ -20,4 +20,16 @@ plugins { apply plugin: 'uk.ac.ox.softeng.maurodatamapper.gradle.mdm-gradle' -apply from: 'dependencies.gradle' \ No newline at end of file +apply from: 'dependencies.gradle' + +repositories { + mavenLocal() + mavenCentral() + maven {url "https://mauro-repository.com/libs-release-local"} + maven {url "https://mauro-repository.com/libs-snapshot-local"} + maven {url "https://repo.grails.org/grails/core"} +} + +tasks.cpdCheck { + ignoreFailures true +} diff --git a/mdm-core/build.gradle b/mdm-core/build.gradle index 4d50b696f..7c32c1e9e 100644 --- a/mdm-core/build.gradle +++ b/mdm-core/build.gradle @@ -9,7 +9,7 @@ buildscript { maven {url 'https://plugins.gradle.org/m2/'} } dependencies { - classpath "uk.ac.ox.softeng.maurodatamapper.gradle:mdm-gradle-plugin:$mdmGradlePluginVersion" + classpath "org.maurodata:mdm-gradle-plugin:$mdmGradlePluginVersion" classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion" classpath "org.grails.plugins:hibernate5:$grailsHibernate5Version" classpath "org.grails.plugins:views-gradle:$grailsViewsVersion" @@ -34,8 +34,8 @@ apply plugin: 'uk.ac.ox.softeng.maurodatamapper.gradle.mdm-grails' repositories { mavenLocal() mavenCentral() - maven {url "https://mauro-repository.com/libs-release"} - maven {url "https://mauro-repository.com/libs-snapshot"} + maven {url "https://mauro-repository.com/libs-release-local"} + maven {url "https://mauro-repository.com/libs-snapshot-local"} maven {url "https://repo.grails.org/grails/core"} } diff --git a/mdm-plugin-authentication-apikey/build.gradle b/mdm-plugin-authentication-apikey/build.gradle index ef497a5f7..a08c4b24f 100644 --- a/mdm-plugin-authentication-apikey/build.gradle +++ b/mdm-plugin-authentication-apikey/build.gradle @@ -9,7 +9,7 @@ buildscript { maven {url 'https://plugins.gradle.org/m2/'} } dependencies { - classpath "uk.ac.ox.softeng.maurodatamapper.gradle:mdm-gradle-plugin:$mdmGradlePluginVersion" + classpath "org.maurodata:mdm-gradle-plugin:$mdmGradlePluginVersion" classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion" classpath "org.grails.plugins:hibernate5:$grailsHibernate5Version" classpath "org.grails.plugins:views-gradle:$grailsViewsVersion" @@ -25,8 +25,8 @@ apply plugin: 'uk.ac.ox.softeng.maurodatamapper.gradle.mdm-grails' repositories { mavenLocal() mavenCentral() - maven {url "https://mauro-repository.com/libs-release"} - maven {url "https://mauro-repository.com/libs-snapshot"} + maven {url "https://mauro-repository.com/libs-release-local"} + maven {url "https://mauro-repository.com/libs-snapshot-local"} maven {url "https://repo.grails.org/grails/core"} } diff --git a/mdm-plugin-authentication-basic/build.gradle b/mdm-plugin-authentication-basic/build.gradle index ef497a5f7..a08c4b24f 100644 --- a/mdm-plugin-authentication-basic/build.gradle +++ b/mdm-plugin-authentication-basic/build.gradle @@ -9,7 +9,7 @@ buildscript { maven {url 'https://plugins.gradle.org/m2/'} } dependencies { - classpath "uk.ac.ox.softeng.maurodatamapper.gradle:mdm-gradle-plugin:$mdmGradlePluginVersion" + classpath "org.maurodata:mdm-gradle-plugin:$mdmGradlePluginVersion" classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion" classpath "org.grails.plugins:hibernate5:$grailsHibernate5Version" classpath "org.grails.plugins:views-gradle:$grailsViewsVersion" @@ -25,8 +25,8 @@ apply plugin: 'uk.ac.ox.softeng.maurodatamapper.gradle.mdm-grails' repositories { mavenLocal() mavenCentral() - maven {url "https://mauro-repository.com/libs-release"} - maven {url "https://mauro-repository.com/libs-snapshot"} + maven {url "https://mauro-repository.com/libs-release-local"} + maven {url "https://mauro-repository.com/libs-snapshot-local"} maven {url "https://repo.grails.org/grails/core"} } diff --git a/mdm-plugin-dataflow/build.gradle b/mdm-plugin-dataflow/build.gradle index 80e441689..2c91fc18f 100644 --- a/mdm-plugin-dataflow/build.gradle +++ b/mdm-plugin-dataflow/build.gradle @@ -9,7 +9,7 @@ buildscript { maven {url 'https://plugins.gradle.org/m2/'} } dependencies { - classpath "uk.ac.ox.softeng.maurodatamapper.gradle:mdm-gradle-plugin:$mdmGradlePluginVersion" + classpath "org.maurodata:mdm-gradle-plugin:$mdmGradlePluginVersion" classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion" classpath "org.grails.plugins:hibernate5:$grailsHibernate5Version" classpath "org.grails.plugins:views-gradle:$grailsViewsVersion" @@ -29,8 +29,8 @@ apply plugin: 'uk.ac.ox.softeng.maurodatamapper.gradle.mdm-grails' repositories { mavenLocal() mavenCentral() - maven {url "https://mauro-repository.com/libs-release"} - maven {url "https://mauro-repository.com/libs-snapshot"} + maven {url "https://mauro-repository.com/libs-release-local"} + maven {url "https://mauro-repository.com/libs-snapshot-local"} maven {url "https://repo.grails.org/grails/core"} } diff --git a/mdm-plugin-datamodel/build.gradle b/mdm-plugin-datamodel/build.gradle index 8e3bebed2..af9f0a873 100644 --- a/mdm-plugin-datamodel/build.gradle +++ b/mdm-plugin-datamodel/build.gradle @@ -9,7 +9,7 @@ buildscript { maven {url 'https://plugins.gradle.org/m2/'} } dependencies { - classpath "uk.ac.ox.softeng.maurodatamapper.gradle:mdm-gradle-plugin:$mdmGradlePluginVersion" + classpath "org.maurodata:mdm-gradle-plugin:$mdmGradlePluginVersion" classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion" classpath "org.grails.plugins:hibernate5:$grailsHibernate5Version" classpath "org.grails.plugins:views-gradle:$grailsViewsVersion" @@ -29,8 +29,8 @@ apply plugin: 'uk.ac.ox.softeng.maurodatamapper.gradle.mdm-grails' repositories { mavenLocal() mavenCentral() - maven {url "https://mauro-repository.com/libs-release"} - maven {url "https://mauro-repository.com/libs-snapshot"} + maven {url "https://mauro-repository.com/libs-release-local"} + maven {url "https://mauro-repository.com/libs-snapshot-local"} maven {url "https://repo.grails.org/grails/core"} } diff --git a/mdm-plugin-email-proxy/build.gradle b/mdm-plugin-email-proxy/build.gradle index 960db2171..bccb3d8bd 100644 --- a/mdm-plugin-email-proxy/build.gradle +++ b/mdm-plugin-email-proxy/build.gradle @@ -8,7 +8,7 @@ buildscript { maven {url 'https://plugins.gradle.org/m2/'} } dependencies { - classpath "uk.ac.ox.softeng.maurodatamapper.gradle:mdm-gradle-plugin:$mdmGradlePluginVersion" + classpath "org.maurodata:mdm-gradle-plugin:$mdmGradlePluginVersion" classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion" classpath "org.grails.plugins:hibernate5:$grailsHibernate5Version" classpath "org.grails.plugins:views-gradle:$grailsViewsVersion" @@ -24,8 +24,8 @@ apply plugin: 'uk.ac.ox.softeng.maurodatamapper.gradle.mdm-grails' repositories { mavenLocal() mavenCentral() - maven {url "https://mauro-repository.com/libs-release"} - maven {url "https://mauro-repository.com/libs-snapshot"} + maven {url "https://mauro-repository.com/libs-release-local"} + maven {url "https://mauro-repository.com/libs-snapshot-local"} maven {url "https://repo.grails.org/grails/core"} } diff --git a/mdm-plugin-federation/build.gradle b/mdm-plugin-federation/build.gradle index c85625f02..672277e76 100644 --- a/mdm-plugin-federation/build.gradle +++ b/mdm-plugin-federation/build.gradle @@ -9,7 +9,7 @@ buildscript { maven {url 'https://plugins.gradle.org/m2/'} } dependencies { - classpath "uk.ac.ox.softeng.maurodatamapper.gradle:mdm-gradle-plugin:$mdmGradlePluginVersion" + classpath "org.maurodata:mdm-gradle-plugin:$mdmGradlePluginVersion" classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion" classpath "org.grails.plugins:hibernate5:$grailsHibernate5Version" classpath "org.grails.plugins:views-gradle:$grailsViewsVersion" @@ -28,8 +28,8 @@ apply plugin: 'uk.ac.ox.softeng.maurodatamapper.gradle.mdm-grails' repositories { mavenLocal() mavenCentral() - maven {url "https://mauro-repository.com/libs-release"} - maven {url "https://mauro-repository.com/libs-snapshot"} + maven {url "https://mauro-repository.com/libs-release-local"} + maven {url "https://mauro-repository.com/libs-snapshot-local"} maven {url "https://repo.grails.org/grails/core"} } diff --git a/mdm-plugin-profile/build.gradle b/mdm-plugin-profile/build.gradle index 256946726..7678cd8a1 100644 --- a/mdm-plugin-profile/build.gradle +++ b/mdm-plugin-profile/build.gradle @@ -9,7 +9,7 @@ buildscript { maven {url 'https://plugins.gradle.org/m2/'} } dependencies { - classpath "uk.ac.ox.softeng.maurodatamapper.gradle:mdm-gradle-plugin:$mdmGradlePluginVersion" + classpath "org.maurodata:mdm-gradle-plugin:$mdmGradlePluginVersion" classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion" classpath "org.grails.plugins:hibernate5:$grailsHibernate5Version" classpath "org.grails.plugins:views-gradle:$grailsViewsVersion" @@ -29,8 +29,8 @@ apply plugin: 'uk.ac.ox.softeng.maurodatamapper.gradle.mdm-grails' repositories { mavenLocal() mavenCentral() - maven {url "https://mauro-repository.com/libs-release"} - maven {url "https://mauro-repository.com/libs-snapshot"} + maven {url "https://mauro-repository.com/libs-release-local"} + maven {url "https://mauro-repository.com/libs-snapshot-local"} maven {url "https://repo.grails.org/grails/core"} } diff --git a/mdm-plugin-referencedata/build.gradle b/mdm-plugin-referencedata/build.gradle index 8e3bebed2..af9f0a873 100644 --- a/mdm-plugin-referencedata/build.gradle +++ b/mdm-plugin-referencedata/build.gradle @@ -9,7 +9,7 @@ buildscript { maven {url 'https://plugins.gradle.org/m2/'} } dependencies { - classpath "uk.ac.ox.softeng.maurodatamapper.gradle:mdm-gradle-plugin:$mdmGradlePluginVersion" + classpath "org.maurodata:mdm-gradle-plugin:$mdmGradlePluginVersion" classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion" classpath "org.grails.plugins:hibernate5:$grailsHibernate5Version" classpath "org.grails.plugins:views-gradle:$grailsViewsVersion" @@ -29,8 +29,8 @@ apply plugin: 'uk.ac.ox.softeng.maurodatamapper.gradle.mdm-grails' repositories { mavenLocal() mavenCentral() - maven {url "https://mauro-repository.com/libs-release"} - maven {url "https://mauro-repository.com/libs-snapshot"} + maven {url "https://mauro-repository.com/libs-release-local"} + maven {url "https://mauro-repository.com/libs-snapshot-local"} maven {url "https://repo.grails.org/grails/core"} } diff --git a/mdm-plugin-terminology/build.gradle b/mdm-plugin-terminology/build.gradle index 8e3bebed2..af9f0a873 100644 --- a/mdm-plugin-terminology/build.gradle +++ b/mdm-plugin-terminology/build.gradle @@ -9,7 +9,7 @@ buildscript { maven {url 'https://plugins.gradle.org/m2/'} } dependencies { - classpath "uk.ac.ox.softeng.maurodatamapper.gradle:mdm-gradle-plugin:$mdmGradlePluginVersion" + classpath "org.maurodata:mdm-gradle-plugin:$mdmGradlePluginVersion" classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion" classpath "org.grails.plugins:hibernate5:$grailsHibernate5Version" classpath "org.grails.plugins:views-gradle:$grailsViewsVersion" @@ -29,8 +29,8 @@ apply plugin: 'uk.ac.ox.softeng.maurodatamapper.gradle.mdm-grails' repositories { mavenLocal() mavenCentral() - maven {url "https://mauro-repository.com/libs-release"} - maven {url "https://mauro-repository.com/libs-snapshot"} + maven {url "https://mauro-repository.com/libs-release-local"} + maven {url "https://mauro-repository.com/libs-snapshot-local"} maven {url "https://repo.grails.org/grails/core"} } diff --git a/mdm-security/build.gradle b/mdm-security/build.gradle index 8db2ad1e1..9d97166d3 100644 --- a/mdm-security/build.gradle +++ b/mdm-security/build.gradle @@ -9,7 +9,7 @@ buildscript { maven {url 'https://plugins.gradle.org/m2/'} } dependencies { - classpath "uk.ac.ox.softeng.maurodatamapper.gradle:mdm-gradle-plugin:$mdmGradlePluginVersion" + classpath "org.maurodata:mdm-gradle-plugin:$mdmGradlePluginVersion" classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion" classpath "org.grails.plugins:hibernate5:$grailsHibernate5Version" classpath "org.grails.plugins:views-gradle:$grailsViewsVersion" @@ -25,8 +25,8 @@ apply plugin: 'uk.ac.ox.softeng.maurodatamapper.gradle.mdm-grails' repositories { mavenLocal() mavenCentral() - maven {url "https://mauro-repository.com/libs-release"} - maven {url "https://mauro-repository.com/libs-snapshot"} + maven {url "https://mauro-repository.com/libs-release-local"} + maven {url "https://mauro-repository.com/libs-snapshot-local"} maven {url "https://repo.grails.org/grails/core"} } diff --git a/mdm-testing-framework/build.gradle b/mdm-testing-framework/build.gradle index b5e357a33..2b73b3773 100644 --- a/mdm-testing-framework/build.gradle +++ b/mdm-testing-framework/build.gradle @@ -9,7 +9,7 @@ buildscript { maven {url 'https://plugins.gradle.org/m2/'} } dependencies { - classpath "uk.ac.ox.softeng.maurodatamapper.gradle:mdm-gradle-plugin:$mdmGradlePluginVersion" + classpath "org.maurodata:mdm-gradle-plugin:$mdmGradlePluginVersion" } } @@ -23,4 +23,12 @@ apply from: 'dependencies.gradle' sonarqube { skipProject = true +} + +repositories { + mavenLocal() + mavenCentral() + maven {url "https://mauro-repository.com/libs-release-local"} + maven {url "https://mauro-repository.com/libs-snapshot-local"} + maven {url "https://repo.grails.org/grails/core"} } \ No newline at end of file diff --git a/mdm-testing-functional/build.gradle b/mdm-testing-functional/build.gradle index 4bf7341d8..7d56630c1 100644 --- a/mdm-testing-functional/build.gradle +++ b/mdm-testing-functional/build.gradle @@ -9,7 +9,7 @@ buildscript { maven {url 'https://plugins.gradle.org/m2/'} } dependencies { - classpath "uk.ac.ox.softeng.maurodatamapper.gradle:mdm-gradle-plugin:$mdmGradlePluginVersion" + classpath "org.maurodata:mdm-gradle-plugin:$mdmGradlePluginVersion" classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion" classpath "org.grails.plugins:hibernate5:$grailsHibernate5Version" classpath "org.grails.plugins:views-gradle:$grailsViewsVersion" @@ -27,8 +27,8 @@ apply plugin: 'uk.ac.ox.softeng.maurodatamapper.gradle.mdm-grails' repositories { mavenLocal() mavenCentral() - maven {url "https://mauro-repository.com/libs-release"} - maven {url "https://mauro-repository.com/libs-snapshot"} + maven {url "https://mauro-repository.com/libs-release-local"} + maven {url "https://mauro-repository.com/libs-snapshot-local"} maven {url "https://repo.grails.org/grails/core"} }