Skip to content

Commit 716e5f2

Browse files
authored
Update standalone module dependencies for Tomcat 10, etc. (#175)
1 parent a30c9d5 commit 716e5f2

File tree

8 files changed

+41
-30
lines changed

8 files changed

+41
-30
lines changed

standalone/README.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
A simple LabKey module to illustrate how to build outside of the LabKey enlistment.
1+
A simple LabKey module to illustrate how to build outside the LabKey enlistment.
22

33
This simple module was created using LabKey's 'createModule' command and then
4-
removing a few things. It does not include any JSP or XSD files. To include
4+
removing a few things. It does not include any JSP or XSD files. To include
55
these, you may need additional tasks for creating additional Jar files, or you
6-
can use the LabKey Gradle plugins. The file `withPlugins_build.gradle` provides
6+
can use the LabKey Gradle plugins. The file `withPlugins_build.gradle` provides
77
an example of how to use the plugins with a standalone module.
88

99
For more details see:

standalone/build.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
// This is a sample gradle file for creating a stand-alone Java module that can be deployed in a LabKey server
2-
// instance. This file applies some of the LabKey Gradle plugins and thus assumes the module layout described
3-
// in the LabKey documentation
4-
// (https://labkey.org/Documentation/wiki-page.view?name=moduleDirectoryStructures)
2+
// instance. This file applies some of the LabKey Gradle plugins and thus assumes the module layout described
3+
// in the LabKey documentation (https://labkey.org/Documentation/wiki-page.view?name=moduleDirectoryStructures).
54
// For simplicity, the source code does not include JSP files that would be compiled and collected into a JSP jar file
65
// or XSD files that would be transformed into XMLBeans objects and include in the main jar.
76
//
87
// You can refer to the gradlePlugins source code (https://github.com/LabKey/gradlePlugin) for more details on the
9-
// full build process implemented for modules within the LabKey source tree.
8+
// full build process implemented for modules within the LabKey source tree.
109
//
1110
// To build this module, run:
1211
// ./gradlew module

standalone/gradle.properties

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
# Location of the repository for various artifacts used in the build
22
artifactory_contextUrl=https://labkey.jfrog.io/artifactory
33

4-
# Exact version will vary based on the version of LabKey being built on
5-
gradlePluginsVersion=1.42.1
4+
# Exact version will vary based on the target LabKey version
5+
gradlePluginsVersion=2.2.2
66

77
# versions of artifacts required as dependencies
88
#uncomment the version number and set to the desired labkeyVersion
9-
#labkeyVersion=23.7-SNAPSHOT
10-
labkeyClientApiVersion=5.3.0
9+
#labkeyVersion=24.3-SNAPSHOT
10+
labkeyClientApiVersion=6.0.0
1111

12-
# used by the LabKey Jsp Gradle plugin for declaring dependencies
13-
apacheTomcatVersion=9.0.83
14-
servletApiVersion=4.0.1
12+
# used by the LabKey JSP Gradle plugin for declaring dependencies
13+
apacheTomcatVersion=10.1.18
14+
servletApiVersion=6.0.0
1515

16-
# Example external dependency used in build file
16+
# Not actually used... just an example to show how to declare an external dependency in the build file
1717
commonsBeanutilsVersion=1.9.4
-16.9 KB
Binary file not shown.
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists

standalone/gradlew

Lines changed: 22 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

standalone/gradlew.bat

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

standalone/module.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ModuleClass: org.labkey.standalone.StandaloneModule
2-
RequiredServerVersion: 21.3
2+
RequiredServerVersion: 24.3
33
Label: Example Standalone LabKey module
44
Description: A simple example of a module that can be built outside of a LabKey enlistment.
55
URL: http://example.com/FIXME

0 commit comments

Comments
 (0)