Merge 21.3.6 to 21.6

Author: labkey-teamcity

standalone/build.gradle

@@ -22,7 +22,8 @@ plugins {
     id 'org.labkey.build.module'
 }
 
-project.version="0.0.1-SNAPSHOT" // this can use your own versioning scheme
+// this can use your own versioning scheme
+// project.version="0.0.1-SNAPSHOT"
 
 dependencies
         {

standalone/gradle.properties

@@ -3,10 +3,11 @@ artifactory_contextUrl=https://artifactory.labkey.com/artifactory
 
 # Version 1.17.0 or higher is required to fully support building stand-alone modules with the LabKey Gradle plugins
 # Exact version will vary based on the version of LabKey being built on
-gradlePluginsVersion=1.27.0_standaloneBuild-SNAPSHOT
+gradlePluginsVersion=1.27.0
 
 # versions of artifacts required as dependencies
-labkeyVersion=21.3.4
+#uncomment the version number and set to the desired labkeyVersion
+#labkeyVersion=21.3.4
 labkeyClientApiVersion=1.3.2
 
 # used by the LabKey Jsp Gradle plugin for declaring dependencies

standalone/settings.gradle

@@ -21,6 +21,10 @@ buildscript {
 // This ensures that the module name is correct when cloned to a non-standard directory
 rootProject.name="standalone"
 
+if (!hasProperty("labkeyVersion")) {
+    throw new GradleException("Define 'labkeyVersion' in 'gradle.properties' to build outside of a standard LabKey enlistment")
+}
+
 gradle.beforeProject { project ->
     project.repositories {
         maven {