Backport fixes to avoid errors from hitachivantara repository (#705)

* Only use hitachivantara maven repository for relevant artifacts (#589) * Use library substitution to prevent Eigenbase conflicts (#551) --------- Co-authored-by: Ian Sigmon <[email protected]>
LabKey · Feb 1, 2024 · dd19da9 · dd19da9
1 parent 4871dfe
commit dd19da9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/build.gradle b/build.gradle
@@ -157,7 +157,14 @@ allprojects {
                     maven {
                         // Mondrian dependencies are available via this repository. It's a direct dependency of the Query
                         // module but is declared here as many modules depend on Query and therefore need it as well.
-                    	url "https://repo.orl.eng.hitachivantara.com/artifactory/pnt-mvn"
+                        url "https://repo.orl.eng.hitachivantara.com/artifactory/pnt-mvn"
+                        content {
+                            includeGroup "pentaho"
+                            includeGroup "org.pentaho"
+                            includeGroup "org.olap4j"
+                            includeGroup "javacup"
+                            includeGroup "eigenbase"
+                        }
                     }
                 }
 
@@ -290,6 +297,11 @@ allprojects {
 
                         // This library was renamed
                         substitute module('org.codehaus.woodstox:woodstox-core-asl') using module("com.fasterxml.woodstox:woodstox-core:${woodstoxCoreVersion}")
+
+                        // Avoid conflicts with declared dependencies on the newer versions from 'net.hydromatic'
+                        substitute module('eigenbase:eigenbase-properties') using module("net.hydromatic:eigenbase-properties:${eigenbasePropertiesVersion}")
+                        substitute module('eigenbase:eigenbase-resgen') using module("net.hydromatic:eigenbase-resgen:${eigenbaseResgenVersion}")
+                        substitute module('eigenbase:eigenbase-xom') using module("net.hydromatic:eigenbase-xom:${eigenbaseXomVersion}")
                     }
                 }
             }

diff --git a/gradle.properties b/gradle.properties
@@ -140,6 +140,9 @@ datadogVersion=0.108.1
 dom4jVersion=1.6.1
 
 ehcacheCoreVersion=2.6.8
+eigenbasePropertiesVersion=1.1.6
+eigenbaseResgenVersion=1.3.7
+eigenbaseXomVersion=1.3.7
 
 flyingsaucerVersion=R8