Merge 23.7 to 23.10

LabKey · Oct 17, 2023 · 4d1b98b · 4d1b98b
2 parents c13ad93 + 6588fe0
commit 4d1b98b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -157,9 +157,13 @@ 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 {
-                            excludeGroupByRegex "org\\.labkey.*"
+                            includeGroup "pentaho"
+                            includeGroup "org.pentaho"
+                            includeGroup "org.olap4j"
+                            includeGroup "javacup"
+                            includeGroup "eigenbase"
                         }
                     }
                 }

diff --git a/gradle.properties b/gradle.properties
@@ -243,7 +243,7 @@ mysqlDriverVersion=8.0.33
 mssqlJdbcVersion=12.2.0.jre11
 
 # forced compatibility between docker and UserReg-WS
-nettyVersion=4.1.94.Final
+nettyVersion=4.1.100.Final
 
 objenesisVersion=1.0