From 67ea9bbcbde7adfcab109b89ed0194b1436977f1 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Fri, 29 Dec 2023 13:36:09 -0800 Subject: [PATCH 01/11] Update dependency versions --- gradle.properties | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index f70d4be1..f515986c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,15 +2,15 @@ artifactory_contextUrl=https://labkey.jfrog.io/artifactory artifactoryPluginVersion=4.28.2 -commonsIoVersion=2.11.0 -commonsLang3Version=3.12.0 -commonsTextVersion=1.10.0 +commonsIoVersion=2.15.1 +commonsLang3Version=3.14.0 +commonsTextVersion=1.11.0 -grgitGradleVersion=5.0.0 -graphqlJavaVersion=21.0 +grgitGradleVersion=5.2.1 +graphqlJavaVersion=21.3 httpclientVersion=4.5.14 httpcoreVersion=4.4.16 -jacksonVersion=2.14.1 -jsonVersion=20230227 +jacksonVersion=2.16.1 +jsonVersion=20231013 From 5739ab4a7046e45dba46ff86126bf19c56d424af Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Fri, 29 Dec 2023 13:38:04 -0800 Subject: [PATCH 02/11] Remove old id resource files for plugins --- .../META-INF/gradle-plugins/org.labkey.antBuild.properties | 1 - .../META-INF/gradle-plugins/org.labkey.antlr.properties | 1 - .../resources/META-INF/gradle-plugins/org.labkey.api.properties | 1 - .../resources/META-INF/gradle-plugins/org.labkey.base.properties | 1 - .../META-INF/gradle-plugins/org.labkey.database.properties | 1 - .../META-INF/gradle-plugins/org.labkey.distribution.properties | 1 - .../META-INF/gradle-plugins/org.labkey.fileModule.properties | 1 - .../resources/META-INF/gradle-plugins/org.labkey.gwt.properties | 1 - .../META-INF/gradle-plugins/org.labkey.javaModule.properties | 1 - .../META-INF/gradle-plugins/org.labkey.jsdoc.properties | 1 - .../resources/META-INF/gradle-plugins/org.labkey.jsp.properties | 1 - .../META-INF/gradle-plugins/org.labkey.module.properties | 1 - .../META-INF/gradle-plugins/org.labkey.multiGit.properties | 1 - .../META-INF/gradle-plugins/org.labkey.npmRun.properties | 1 - .../META-INF/gradle-plugins/org.labkey.serverDeploy.properties | 1 - .../META-INF/gradle-plugins/org.labkey.springConfig.properties | 1 - .../META-INF/gradle-plugins/org.labkey.teamCity.properties | 1 - .../META-INF/gradle-plugins/org.labkey.testRunner.properties | 1 - .../META-INF/gradle-plugins/org.labkey.tomcat.properties | 1 - .../META-INF/gradle-plugins/org.labkey.uiTest.properties | 1 - .../META-INF/gradle-plugins/org.labkey.webapp.properties | 1 - .../META-INF/gradle-plugins/org.labkey.xmlBeans.properties | 1 - .../META-INF/gradle-plugins/org.labkey.xsddoc.properties | 1 - 23 files changed, 23 deletions(-) delete mode 100644 src/main/resources/META-INF/gradle-plugins/org.labkey.antBuild.properties delete mode 100644 src/main/resources/META-INF/gradle-plugins/org.labkey.antlr.properties delete mode 100644 src/main/resources/META-INF/gradle-plugins/org.labkey.api.properties delete mode 100644 src/main/resources/META-INF/gradle-plugins/org.labkey.base.properties delete mode 100644 src/main/resources/META-INF/gradle-plugins/org.labkey.database.properties delete mode 100644 src/main/resources/META-INF/gradle-plugins/org.labkey.distribution.properties delete mode 100644 src/main/resources/META-INF/gradle-plugins/org.labkey.fileModule.properties delete mode 100644 src/main/resources/META-INF/gradle-plugins/org.labkey.gwt.properties delete mode 100644 src/main/resources/META-INF/gradle-plugins/org.labkey.javaModule.properties delete mode 100644 src/main/resources/META-INF/gradle-plugins/org.labkey.jsdoc.properties delete mode 100644 src/main/resources/META-INF/gradle-plugins/org.labkey.jsp.properties delete mode 100644 src/main/resources/META-INF/gradle-plugins/org.labkey.module.properties delete mode 100644 src/main/resources/META-INF/gradle-plugins/org.labkey.multiGit.properties delete mode 100644 src/main/resources/META-INF/gradle-plugins/org.labkey.npmRun.properties delete mode 100644 src/main/resources/META-INF/gradle-plugins/org.labkey.serverDeploy.properties delete mode 100644 src/main/resources/META-INF/gradle-plugins/org.labkey.springConfig.properties delete mode 100644 src/main/resources/META-INF/gradle-plugins/org.labkey.teamCity.properties delete mode 100644 src/main/resources/META-INF/gradle-plugins/org.labkey.testRunner.properties delete mode 100644 src/main/resources/META-INF/gradle-plugins/org.labkey.tomcat.properties delete mode 100644 src/main/resources/META-INF/gradle-plugins/org.labkey.uiTest.properties delete mode 100644 src/main/resources/META-INF/gradle-plugins/org.labkey.webapp.properties delete mode 100644 src/main/resources/META-INF/gradle-plugins/org.labkey.xmlBeans.properties delete mode 100644 src/main/resources/META-INF/gradle-plugins/org.labkey.xsddoc.properties diff --git a/src/main/resources/META-INF/gradle-plugins/org.labkey.antBuild.properties b/src/main/resources/META-INF/gradle-plugins/org.labkey.antBuild.properties deleted file mode 100644 index 4009764a..00000000 --- a/src/main/resources/META-INF/gradle-plugins/org.labkey.antBuild.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.labkey.gradle.plugin.AntBuild \ No newline at end of file diff --git a/src/main/resources/META-INF/gradle-plugins/org.labkey.antlr.properties b/src/main/resources/META-INF/gradle-plugins/org.labkey.antlr.properties deleted file mode 100644 index 9554ec52..00000000 --- a/src/main/resources/META-INF/gradle-plugins/org.labkey.antlr.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.labkey.gradle.plugin.Antlr diff --git a/src/main/resources/META-INF/gradle-plugins/org.labkey.api.properties b/src/main/resources/META-INF/gradle-plugins/org.labkey.api.properties deleted file mode 100644 index d789a969..00000000 --- a/src/main/resources/META-INF/gradle-plugins/org.labkey.api.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.labkey.gradle.plugin.Api diff --git a/src/main/resources/META-INF/gradle-plugins/org.labkey.base.properties b/src/main/resources/META-INF/gradle-plugins/org.labkey.base.properties deleted file mode 100644 index d96a30fb..00000000 --- a/src/main/resources/META-INF/gradle-plugins/org.labkey.base.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.labkey.gradle.plugin.LabKey diff --git a/src/main/resources/META-INF/gradle-plugins/org.labkey.database.properties b/src/main/resources/META-INF/gradle-plugins/org.labkey.database.properties deleted file mode 100644 index 130e9537..00000000 --- a/src/main/resources/META-INF/gradle-plugins/org.labkey.database.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.labkey.gradle.plugin.Database \ No newline at end of file diff --git a/src/main/resources/META-INF/gradle-plugins/org.labkey.distribution.properties b/src/main/resources/META-INF/gradle-plugins/org.labkey.distribution.properties deleted file mode 100644 index 22d90cea..00000000 --- a/src/main/resources/META-INF/gradle-plugins/org.labkey.distribution.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.labkey.gradle.plugin.Distribution diff --git a/src/main/resources/META-INF/gradle-plugins/org.labkey.fileModule.properties b/src/main/resources/META-INF/gradle-plugins/org.labkey.fileModule.properties deleted file mode 100644 index ed428c0a..00000000 --- a/src/main/resources/META-INF/gradle-plugins/org.labkey.fileModule.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.labkey.gradle.plugin.FileModule diff --git a/src/main/resources/META-INF/gradle-plugins/org.labkey.gwt.properties b/src/main/resources/META-INF/gradle-plugins/org.labkey.gwt.properties deleted file mode 100644 index b07a5cb5..00000000 --- a/src/main/resources/META-INF/gradle-plugins/org.labkey.gwt.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.labkey.gradle.plugin.Gwt diff --git a/src/main/resources/META-INF/gradle-plugins/org.labkey.javaModule.properties b/src/main/resources/META-INF/gradle-plugins/org.labkey.javaModule.properties deleted file mode 100644 index 92bcf092..00000000 --- a/src/main/resources/META-INF/gradle-plugins/org.labkey.javaModule.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.labkey.gradle.plugin.JavaModule diff --git a/src/main/resources/META-INF/gradle-plugins/org.labkey.jsdoc.properties b/src/main/resources/META-INF/gradle-plugins/org.labkey.jsdoc.properties deleted file mode 100644 index 6160a075..00000000 --- a/src/main/resources/META-INF/gradle-plugins/org.labkey.jsdoc.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.labkey.gradle.plugin.JsDoc diff --git a/src/main/resources/META-INF/gradle-plugins/org.labkey.jsp.properties b/src/main/resources/META-INF/gradle-plugins/org.labkey.jsp.properties deleted file mode 100644 index e0dc529a..00000000 --- a/src/main/resources/META-INF/gradle-plugins/org.labkey.jsp.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.labkey.gradle.plugin.Jsp diff --git a/src/main/resources/META-INF/gradle-plugins/org.labkey.module.properties b/src/main/resources/META-INF/gradle-plugins/org.labkey.module.properties deleted file mode 100644 index e98f0de0..00000000 --- a/src/main/resources/META-INF/gradle-plugins/org.labkey.module.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.labkey.gradle.plugin.Module diff --git a/src/main/resources/META-INF/gradle-plugins/org.labkey.multiGit.properties b/src/main/resources/META-INF/gradle-plugins/org.labkey.multiGit.properties deleted file mode 100644 index 4eeff35a..00000000 --- a/src/main/resources/META-INF/gradle-plugins/org.labkey.multiGit.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.labkey.gradle.plugin.MultiGit \ No newline at end of file diff --git a/src/main/resources/META-INF/gradle-plugins/org.labkey.npmRun.properties b/src/main/resources/META-INF/gradle-plugins/org.labkey.npmRun.properties deleted file mode 100644 index 6a34ffff..00000000 --- a/src/main/resources/META-INF/gradle-plugins/org.labkey.npmRun.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.labkey.gradle.plugin.NpmRun diff --git a/src/main/resources/META-INF/gradle-plugins/org.labkey.serverDeploy.properties b/src/main/resources/META-INF/gradle-plugins/org.labkey.serverDeploy.properties deleted file mode 100644 index 1b4042ef..00000000 --- a/src/main/resources/META-INF/gradle-plugins/org.labkey.serverDeploy.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.labkey.gradle.plugin.ServerDeploy \ No newline at end of file diff --git a/src/main/resources/META-INF/gradle-plugins/org.labkey.springConfig.properties b/src/main/resources/META-INF/gradle-plugins/org.labkey.springConfig.properties deleted file mode 100644 index a06f5882..00000000 --- a/src/main/resources/META-INF/gradle-plugins/org.labkey.springConfig.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.labkey.gradle.plugin.SpringConfig diff --git a/src/main/resources/META-INF/gradle-plugins/org.labkey.teamCity.properties b/src/main/resources/META-INF/gradle-plugins/org.labkey.teamCity.properties deleted file mode 100644 index 79c5990e..00000000 --- a/src/main/resources/META-INF/gradle-plugins/org.labkey.teamCity.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.labkey.gradle.plugin.TeamCity \ No newline at end of file diff --git a/src/main/resources/META-INF/gradle-plugins/org.labkey.testRunner.properties b/src/main/resources/META-INF/gradle-plugins/org.labkey.testRunner.properties deleted file mode 100644 index 483e79d9..00000000 --- a/src/main/resources/META-INF/gradle-plugins/org.labkey.testRunner.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.labkey.gradle.plugin.TestRunner \ No newline at end of file diff --git a/src/main/resources/META-INF/gradle-plugins/org.labkey.tomcat.properties b/src/main/resources/META-INF/gradle-plugins/org.labkey.tomcat.properties deleted file mode 100644 index fd363137..00000000 --- a/src/main/resources/META-INF/gradle-plugins/org.labkey.tomcat.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.labkey.gradle.plugin.Tomcat \ No newline at end of file diff --git a/src/main/resources/META-INF/gradle-plugins/org.labkey.uiTest.properties b/src/main/resources/META-INF/gradle-plugins/org.labkey.uiTest.properties deleted file mode 100644 index e12379ab..00000000 --- a/src/main/resources/META-INF/gradle-plugins/org.labkey.uiTest.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.labkey.gradle.plugin.UiTest diff --git a/src/main/resources/META-INF/gradle-plugins/org.labkey.webapp.properties b/src/main/resources/META-INF/gradle-plugins/org.labkey.webapp.properties deleted file mode 100644 index 829a413a..00000000 --- a/src/main/resources/META-INF/gradle-plugins/org.labkey.webapp.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.labkey.gradle.plugin.Webapp diff --git a/src/main/resources/META-INF/gradle-plugins/org.labkey.xmlBeans.properties b/src/main/resources/META-INF/gradle-plugins/org.labkey.xmlBeans.properties deleted file mode 100644 index 29bd32b3..00000000 --- a/src/main/resources/META-INF/gradle-plugins/org.labkey.xmlBeans.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.labkey.gradle.plugin.XmlBeans diff --git a/src/main/resources/META-INF/gradle-plugins/org.labkey.xsddoc.properties b/src/main/resources/META-INF/gradle-plugins/org.labkey.xsddoc.properties deleted file mode 100644 index 4fced5db..00000000 --- a/src/main/resources/META-INF/gradle-plugins/org.labkey.xsddoc.properties +++ /dev/null @@ -1 +0,0 @@ -implementation-class=org.labkey.gradle.plugin.XsdDoc From 3bdb0792461d33c443712825e74ae84000d853cd Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Fri, 29 Dec 2023 13:39:04 -0800 Subject: [PATCH 03/11] branch version --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 2c1e466f..83221aa3 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ dependencies { } group 'org.labkey.build' -project.version = "1.45.0-SNAPSHOT" +project.version = "1.45.0-miscMaintenance-SNAPSHOT" gradlePlugin { // TODO after transitioning to using these plugin ids, remove the properties files from resources/META-INF.gradle-plugins From 1ff3e3011405b39ad2f88e4e5bc6059fc05a86b8 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Fri, 29 Dec 2023 14:45:38 -0800 Subject: [PATCH 04/11] Utility method for dependency substitution --- .../org/labkey/gradle/util/BuildUtils.groovy | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy b/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy index b512d762..18b3c2ab 100644 --- a/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy +++ b/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy @@ -18,6 +18,9 @@ package org.labkey.gradle.util import org.apache.commons.lang3.StringUtils import org.gradle.api.GradleException import org.gradle.api.Project +import org.gradle.api.UnknownDomainObjectException +import org.gradle.api.artifacts.Configuration +import org.gradle.api.artifacts.DependencySubstitutions import org.gradle.api.artifacts.ModuleDependency import org.gradle.api.artifacts.ProjectDependency import org.gradle.api.initialization.Settings @@ -607,7 +610,6 @@ class BuildUtils distributionProject.logger.info("${distributionProject.path}: Adding ${config} dependency on artifact ${dep}") distributionProject.dependencies.add(config, dep) } - } } } @@ -888,4 +890,34 @@ class BuildUtils return project.rootProject.layout.buildDirectory.get().asFile.path } + static void substituteModuleDependencies(Project project, String configName) + { + try { + project.configurations.named(configName) { Configuration config -> + resolutionStrategy.dependencySubstitution { DependencySubstitutions ds -> + project.rootProject.subprojects { + Project p -> + { + p.logger.debug("Considering substitution for ${p.path}.") + if (shouldBuildFromSource(p)) { + if (p.plugins.hasPlugin('org.labkey.build.module') || + p.plugins.hasPlugin('org.labkey.build.fileModule') || + p.plugins.hasPlugin('org.labkey.build.javaModule') + ) { + ds.substitute ds.module("org.labkey.module:${p.name}") using ds.project(p.path) + p.logger.debug("Substituting org.labkey.module:${p.name} with ${p.path}") + } + if (p.plugins.hasPlugin('org.labkey.build.api')) + { + ds.substitute ds.module("org.labkey.api:${p.name}") + } + } + } + } + } + } + } catch (UnknownDomainObjectException ignore) { + project.logger.debug("No ${configName} configuration found for ${project.path}.") + } + } } From 80213062f77ce8da419d71a03cbc1b2e2eb5c26a Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Fri, 29 Dec 2023 15:33:24 -0800 Subject: [PATCH 05/11] Modifications to allow usage of un-forked versioning plugin --- .../org/labkey/gradle/plugin/LabKey.groovy | 6 ++-- .../org/labkey/gradle/util/BuildUtils.groovy | 34 +++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/src/main/groovy/org/labkey/gradle/plugin/LabKey.groovy b/src/main/groovy/org/labkey/gradle/plugin/LabKey.groovy index 54e112ef..5ed17450 100644 --- a/src/main/groovy/org/labkey/gradle/plugin/LabKey.groovy +++ b/src/main/groovy/org/labkey/gradle/plugin/LabKey.groovy @@ -25,7 +25,6 @@ import org.labkey.gradle.util.BuildUtils /** * Defines a set of extension properties for ease of reference. This also adds a two extensions * for some basic properties. - * Created by susanh on 4/13/16. */ class LabKey implements Plugin { @@ -38,7 +37,10 @@ class LabKey implements Plugin { if (project.hasProperty('includeVcs')) { - project.apply plugin: 'org.labkey.versioning' + if (project.hasProperty('nemerosaVersioningPluginVersion')) + project.apply plugin: 'net.nemerosa.versioning' + else + project.apply plugin: 'org.labkey.versioning' } project.group = LabKeyExtension.LABKEY_GROUP diff --git a/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy b/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy index 18b3c2ab..a58dae55 100644 --- a/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy +++ b/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy @@ -15,6 +15,8 @@ */ package org.labkey.gradle.util +import org.ajoberstar.grgit.Grgit +import org.ajoberstar.grgit.Remote import org.apache.commons.lang3.StringUtils import org.gradle.api.GradleException import org.gradle.api.Project @@ -506,6 +508,25 @@ class BuildUtils ret.setProperty("VcsRevision", vcsProject.versioning.info.commit) ret.setProperty("BuildNumber", buildNumber != null ? buildNumber : vcsProject.versioning.info.build) } + else if (project.plugins.hasPlugin("net.nemerosa.versioning")) + { + // In our fork of the plugin (above), we added the url property to the VersioningInfo object + Project vcsProject = project + String url = getGitUrl(vcsProject) + while (url == null && vcsProject != project.rootProject) + { + vcsProject = vcsProject.parent + url = getGitUr(vcsProject) + } + vcsProject.println("${project.path} versioning info ${ vcsProject.versioning.info}") + ret.setProperty("VcsURL", url) + if (vcsProject.versioning.info.branch != null) + ret.setProperty("VcsBranch", vcsProject.versioning.info.branch) + if (vcsProject.versioning.info.tag != null) + ret.setProperty("VcsTag", vcsProject.versioning.info.tag) + ret.setProperty("VcsRevision", vcsProject.versioning.info.commit) + ret.setProperty("BuildNumber", buildNumber != null ? buildNumber : vcsProject.versioning.info.build) + } else { ret.setProperty("VcsBranch", "Unknown") @@ -528,6 +549,19 @@ class BuildUtils 'tomcat7-websocket' ] + static String getGitUrl(Project project) + { + def grgit = Grgit.open(currentDir: project.projectDir) + List remotes = grgit.remote.list() + grgit.close() + if (remotes) { + return remotes.get(0).url + } else { + return null + } + + } + static void setTomcatLibs(List libs) { TOMCAT_LIBS = new ArrayList(libs) From 976f611a1dbeb7e45ab73129c6ce20a490a7f17c Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 2 Jan 2024 09:25:24 -0800 Subject: [PATCH 06/11] Comment out substitution for api artifact --- src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy b/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy index a58dae55..4dc2973c 100644 --- a/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy +++ b/src/main/groovy/org/labkey/gradle/util/BuildUtils.groovy @@ -941,10 +941,10 @@ class BuildUtils ds.substitute ds.module("org.labkey.module:${p.name}") using ds.project(p.path) p.logger.debug("Substituting org.labkey.module:${p.name} with ${p.path}") } - if (p.plugins.hasPlugin('org.labkey.build.api')) - { - ds.substitute ds.module("org.labkey.api:${p.name}") - } +// if (p.plugins.hasPlugin('org.labkey.build.api')) +// { +// ds.substitute ds.module("org.labkey.api:${p.name}") using ds.project(p.path) +// } } } } From b3303fd70e4c94e0cdd7bc154b052d47f3b659b6 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 2 Jan 2024 10:53:09 -0800 Subject: [PATCH 07/11] release notes --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index ee095d8a..965df334 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,15 @@ on how to do that, including how to develop and test locally and the versioning _Note: 1.28.0 and later require Gradle 7_ +### 2.0.0 +*Released*: TBD +(Earliest compatible LabKey version: 24.2) +* Remove redundant plugin identifiers using org.labkey namespace instead of org.labkey.build + (e.g., org.labkey.module removed in favor of org.labkey.build.module) +* Add support for using the net.nemerosa.versioning plugin directly instead of our forked version +* Update dependency versions +* Add `substituteModuleDependecies` utility method for experimentation with some dependency substitution ([Issue 49316](https://www.labkey.org/home/Developer/issues/Secure/issues-details.view?issueId=49316)) + ### 1.44.1 *Released*: 28 December 2023 (Earliest compatible LabKey version: 23.3) From b0f553d38a3e70b3cdf473988aac5b7262eba878 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 2 Jan 2024 10:57:28 -0800 Subject: [PATCH 08/11] Remove TODO --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index 83221aa3..41b4416f 100644 --- a/build.gradle +++ b/build.gradle @@ -45,7 +45,6 @@ group 'org.labkey.build' project.version = "1.45.0-miscMaintenance-SNAPSHOT" gradlePlugin { - // TODO after transitioning to using these plugin ids, remove the properties files from resources/META-INF.gradle-plugins plugins { antBuild { id = 'org.labkey.build.antBuild' From 611a492f04594c3f4f7346fbbf4046b471447ce0 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Tue, 2 Jan 2024 11:26:24 -0800 Subject: [PATCH 09/11] Remove some backward compatibility code --- src/main/groovy/org/labkey/gradle/task/DoThenSetup.groovy | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/groovy/org/labkey/gradle/task/DoThenSetup.groovy b/src/main/groovy/org/labkey/gradle/task/DoThenSetup.groovy index 086b925b..5d9c77f0 100644 --- a/src/main/groovy/org/labkey/gradle/task/DoThenSetup.groovy +++ b/src/main/groovy/org/labkey/gradle/task/DoThenSetup.groovy @@ -145,12 +145,8 @@ class DoThenSetup extends DefaultTask line = line.replace("#server.ssl", "server.ssl") } if (project.hasProperty("useLocalBuild")) { - // Let properties file specify which properties require 'useLocalBuild' + // Enable properties that require 'useLocalBuild' (e.g. 'context.webAppLocation' and 'spring.devtools.restart.additional-paths') line = line.replace("#useLocalBuild#", "") - - // Old method enables specific properties for 'useLocalBuild' (before 24.1) - line = line.replace("#context.webAppLocation=", "context.webAppLocation=") - line = line.replace("#spring.devtools.restart.additional-paths=", "spring.devtools.restart.additional-paths=") } else { // Remove placeholder From 527b9de24f3a76156e2408776ad5965508238c08 Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Thu, 4 Jan 2024 07:04:46 -0800 Subject: [PATCH 10/11] Remove support for skipBuild --- src/main/groovy/org/labkey/gradle/plugin/FileModule.groovy | 4 ---- .../org/labkey/gradle/plugin/extension/LabKeyExtension.groovy | 2 -- 2 files changed, 6 deletions(-) diff --git a/src/main/groovy/org/labkey/gradle/plugin/FileModule.groovy b/src/main/groovy/org/labkey/gradle/plugin/FileModule.groovy index 87bcd2f4..8598a840 100644 --- a/src/main/groovy/org/labkey/gradle/plugin/FileModule.groovy +++ b/src/main/groovy/org/labkey/gradle/plugin/FileModule.groovy @@ -49,10 +49,6 @@ class FileModule implements Plugin List indicators = new ArrayList<>() if (!project.file(ModuleExtension.MODULE_PROPERTIES_FILE).exists()) indicators.add(ModuleExtension.MODULE_PROPERTIES_FILE + " does not exist") - if (project.hasProperty("skipBuild")) { - project.logger.quiet("${project.path}: The skipBuild property is deprecated and will be removed in version 2.0.0. Use the property excludedModules instead. See https://www.labkey.org/Documentation/wiki-page.view?name=customizingBuild#skip. ") - indicators.add("skipBuild property set for Gradle project") - } if (indicators.size() > 0 && logMessages) { diff --git a/src/main/groovy/org/labkey/gradle/plugin/extension/LabKeyExtension.groovy b/src/main/groovy/org/labkey/gradle/plugin/extension/LabKeyExtension.groovy index c36f048f..ab85c5be 100644 --- a/src/main/groovy/org/labkey/gradle/plugin/extension/LabKeyExtension.groovy +++ b/src/main/groovy/org/labkey/gradle/plugin/extension/LabKeyExtension.groovy @@ -50,8 +50,6 @@ class LabKeyExtension } } - Boolean skipBuild = false // set this to true in an individual module's build.gradle file to skip building - String explodedModuleDir String explodedModuleWebDir String explodedModuleConfigDir From d1f4b8cae079e5e395ae47590de707783280a64d Mon Sep 17 00:00:00 2001 From: labkey-susanh Date: Tue, 9 Jan 2024 11:07:48 -0800 Subject: [PATCH 11/11] Prepare for merge to develop --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 41b4416f..cc175b7f 100644 --- a/build.gradle +++ b/build.gradle @@ -42,7 +42,7 @@ dependencies { } group 'org.labkey.build' -project.version = "1.45.0-miscMaintenance-SNAPSHOT" +project.version = "2.0.0-SNAPSHOT" gradlePlugin { plugins {