More fixes to buildscripts and repositories and dependencies

MauroDataMapper · Aug 13, 2024 · f7ebbad · f7ebbad
1 parent 4b2bc40
commit f7ebbad
Show file tree

Hide file tree

Showing 18 changed files with 65 additions and 46 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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'
+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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"}
 }
diff --git 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"}
 }