Merge 21.3.6 to 21.6

labkey-teamcity · labkey-teamcity · commit d9298293aeaf · 2021-06-10T23:56:08.000Z
diff --git a/standalone/build.gradle b/standalone/build.gradle
@@ -27,6 +27,7 @@ plugins {
 
 dependencies
         {
-            implementation "org.labkey.api:issues:${labkeyVersion}" // An example of declaring a dependency on the API jar for a module
+            // An example of declaring a dependency on the API jar for a module
+            // implementation "org.labkey.api:issues:${labkeyVersion}"
             external "commons-beanutils:commons-beanutils:${commonsBeanutilsVersion}" // An external dependency to be included in the module's lib directory
         }

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ plugins {`
`27`	`27`
`28`	`28`	`dependencies`
`29`	`29`	`{`
`30`		`- implementation "org.labkey.api:issues:${labkeyVersion}" // An example of declaring a dependency on the API jar for a module`
	`30`	`+ // An example of declaring a dependency on the API jar for a module`
	`31`	`+ // implementation "org.labkey.api:issues:${labkeyVersion}"`
`31`	`32`	`external "commons-beanutils:commons-beanutils:${commonsBeanutilsVersion}" // An external dependency to be included in the module's lib directory`
`32`	`33`	`}`