Merge 21.3.5 to develop

Author: labkey-teamcity

.gitignore

@@ -2,6 +2,9 @@
 demo/node_modules
 demo/resources/web/demo/gen
 demo/resources/views/gen
+dependencies.txt
+enlistment.properties
+build/
 
 # Gradle
 .gradle

standalone/README.txt

@@ -0,0 +1,12 @@
+A simple LabKey module to illustrate how to build outside of the LabKey enlistment.
+
+This simple module was created using LabKey's 'createModule' command and then 
+removing a few things.  It does not include any JSP or XSD files.  To include
+these, you may need additional tasks for creating additional Jar files, or you
+can use the LabKey Gradle plugins.  The file `withPlugins_build.gradle` provides
+an example of how to use the plugins with a standalone module.  
+
+For more details see:
+- https://www.labkey.org/Documentation/wiki-page.view?name=gradleModules
+- https://github.com/LabKey/gradlePlugin - the repository for the plugins used to
+  build LabKey

standalone/api-src/org/labkey/api/standalone/SomeUtils.java

@@ -0,0 +1,16 @@
+package org.labkey.api.standalone;
+
+public class SomeUtils
+{
+    private Integer usefulCount = 0;
+
+    public void doSomethingUseful()
+    {
+        usefulCount++;
+    }
+
+    public Integer getUsefulCount()
+    {
+        return usefulCount;
+    }
+}

standalone/build.gradle

@@ -0,0 +1,31 @@
+// This is a sample gradle file for creating a stand-alone Java module that can be deployed in a LabKey server
+// instance.  This file applies some of the LabKey Gradle plugins and thus assumes the module layout described 
+// in the LabKey documentation
+// (https://labkey.org/Documentation/wiki-page.view?name=moduleDirectoryStructures)
+// For simplicity, the source code does not include JSP files that would be compiled and collected into a JSP jar file
+// or XSD files that would be transformed into XMLBeans objects and include in the main jar.
+//
+// You can refer to the gradlePlugins source code (https://github.com/LabKey/gradlePlugin) for more details on the
+// full build process implemented for modules within the LabKey source tree.  
+//
+// To build this module, run:
+//     ./gradlew module
+// This will create a .module file for your project and deposit it in the build directory
+// for your standalone module.
+//
+// See the Gradle documentation for more information (https://docs.gradle.org).
+//
+import org.labkey.gradle.util.BuildUtils
+
+plugins {
+    // This plugin brings in the standard tasks for building a LabKey Java module that may include JSPs, XSDs, or npm builds
+    id 'org.labkey.build.module'
+}
+
+project.version="0.0.1-SNAPSHOT" // this can use your own versioning scheme
+
+dependencies
+        {
+            implementation "org.labkey.api:issues:${labkeyVersion}" // An example of declaring a dependency on the API jar for a module
+            external "commons-beanutils:commons-beanutils:${commonsBeanutilsVersion}" // An external dependency to be included in the module's lib directory
+        }

standalone/gradle.properties

@@ -0,0 +1,17 @@
+# Location of the repository for various artifacts used in the build
+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
+
+# versions of artifacts required as dependencies
+labkeyVersion=21.3.4
+labkeyClientApiVersion=1.3.2
+
+# used by the LabKey Jsp Gradle plugin for declaring dependencies
+apacheTomcatVersion=8.5.51
+servletApiVersion=3.0
+
+# Example external dependency used in build file
+commonsBeanutilsVersion=1.7.0

standalone/gradle/wrapper/gradle-wrapper.jar

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists

standalone/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,7 @@
+ModuleClass: org.labkey.standalone.StandaloneModule
+RequiredServerVersion: 21.3
+Label: Example Standalone LabKey module
+Description: A simple example of a module that can be built outside of a LabKey enlistment.
+URL: http://example.com/FIXME
+License: Apache 2.0
+LicenseURL: http://www.apache.org/licenses/LICENSE-2.0