From c1accfb421034ae1c9c5ba988fee732086e3dc34 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Wed, 30 Mar 2022 08:11:46 -0700
Subject: [PATCH 1/4] Update to new (temporary) virtual repository that
 excludes mavenCentral as a proxy

---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4b8d4ee4fd..125af0bcfe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -109,7 +109,7 @@ allprojects {
                     }
                     maven {
 
-                        url "${artifactory_contextUrl}/libs-release"
+                        url "${artifactory_contextUrl}/libs-release-no-mc"
 
                         if (project.hasProperty('artifactory_user') && project.hasProperty('artifactory_password'))
                         {
@@ -123,7 +123,7 @@ allprojects {
                         }
                     }
                     maven {
-                        url "${artifactory_contextUrl}/libs-snapshot"
+                        url "${artifactory_contextUrl}/libs-snapshot-no-mc"
 
                         if (project.hasProperty('artifactory_user') && project.hasProperty('artifactory_password'))
                         {

From f86d1407a97f460a81387c71b53826fc70cb3607 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Wed, 30 Mar 2022 09:06:30 -0700
Subject: [PATCH 2/4] Update buildScript dependencies to include mavenCentral;
 move mavenCentral first in repositories

---
 build.gradle | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 125af0bcfe..be44127ae6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,8 +7,9 @@ import org.labkey.gradle.task.PurgeNpmAlphaVersions
 
 buildscript {
     repositories {
+        mavenCentral()
         maven {
-            url "${artifactory_contextUrl}/plugins-release"
+            url "${artifactory_contextUrl}/plugins-release-no-mc"
         }
         if (gradlePluginsVersion.contains("SNAPSHOT") || versioningPluginVersion.contains("SNAPSHOT"))
         {
@@ -98,6 +99,7 @@ allprojects {
 
     repositories
             {
+                mavenCentral()
                 // this if statement is necessary because the TeamCity artifactory plugin overrides
                 // the repositories but does not use these artifactory_ urls.  For others who are
                 // developing or building, you do need to specify the three artifactory_ properties
@@ -143,7 +145,7 @@ allprojects {
 //                    	url "https://repository.apache.org/content/repositories/orgapachetomcat-1322/"
 //                    }
                 }
-                mavenCentral()
+
             }
     configurations.all
             {

From 3a0df94693d4b3b34546a9eb283d7eabdf2fde81 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Thu, 14 Apr 2022 17:14:40 -0700
Subject: [PATCH 3/4] Stop publishing buildInfo

---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index d548eb482c..98477e4b00 100644
--- a/build.gradle
+++ b/build.gradle
@@ -278,6 +278,7 @@ if (BuildUtils.shouldPublish(project) || BuildUtils.shouldPublishDistribution(pr
             }
             defaults
                     {
+                        publishBuildInfo = false
                         publishPom = true
                         publishIvy = false
                     }

From 2506ecd905bf2ebc70c0646df519853c588d8063 Mon Sep 17 00:00:00 2001
From: labkey-susanh <susanh@labkey.com>
Date: Mon, 18 Apr 2022 07:25:50 -0700
Subject: [PATCH 4/4] Revert use of temporary repository

---
 build.gradle | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 98477e4b00..f7c5c4f26c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     repositories {
         mavenCentral()
         maven {
-            url "${artifactory_contextUrl}/plugins-release-no-mc"
+            url "${artifactory_contextUrl}/plugins-release"
         }
         if (gradlePluginsVersion.contains("SNAPSHOT") || versioningPluginVersion.contains("SNAPSHOT"))
         {
@@ -115,7 +115,7 @@ allprojects {
                     }
                     maven {
 
-                        url "${artifactory_contextUrl}/libs-release-no-mc"
+                        url "${artifactory_contextUrl}/libs-release"
 
                         if (project.hasProperty('artifactory_user') && project.hasProperty('artifactory_password'))
                         {
@@ -129,7 +129,7 @@ allprojects {
                         }
                     }
                     maven {
-                        url "${artifactory_contextUrl}/libs-snapshot-no-mc"
+                        url "${artifactory_contextUrl}/libs-snapshot"
 
                         if (project.hasProperty('artifactory_user') && project.hasProperty('artifactory_password'))
                         {