From ca546525ac85260eb34ca4c76fdbca0ea7fa20dc Mon Sep 17 00:00:00 2001 From: labkey-nicka Date: Tue, 28 Oct 2025 08:23:21 -0700 Subject: [PATCH 1/4] Remove container listener from module template --- .../MODULE_NAMEContainerListener.java | 55 ------------------- .../MODULE_DIR_NAME/MODULE_NAMEModule.java | 2 - 2 files changed, 57 deletions(-) delete mode 100644 moduleTemplate/src/org/labkey/MODULE_DIR_NAME/MODULE_NAMEContainerListener.java diff --git a/moduleTemplate/src/org/labkey/MODULE_DIR_NAME/MODULE_NAMEContainerListener.java b/moduleTemplate/src/org/labkey/MODULE_DIR_NAME/MODULE_NAMEContainerListener.java deleted file mode 100644 index 85acd2be..00000000 --- a/moduleTemplate/src/org/labkey/MODULE_DIR_NAME/MODULE_NAMEContainerListener.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright (c) @@CURRENT_YEAR@@ LabKey Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.labkey.@@MODULE_LOWERCASE_NAME@@; - -import org.jetbrains.annotations.NotNull; -import org.labkey.api.data.Container; -import org.labkey.api.data.ContainerManager.ContainerListener; -import org.labkey.api.security.User; -import java.util.Collections; -import java.util.Collection; - -import java.beans.PropertyChangeEvent; - -public class @@MODULE_NAME@@ContainerListener implements ContainerListener -{ - @Override - public void containerCreated(Container c, User user) - { - } - - @Override - public void containerDeleted(Container c, User user) - { - } - - @Override - public void propertyChange(PropertyChangeEvent evt) - { - } - - @Override - public void containerMoved(Container c, Container oldParent, User user) - { - } - - @NotNull @Override - public Collection canMove(Container c, Container newParent, User user) - { - return Collections.emptyList(); - } -} \ No newline at end of file diff --git a/moduleTemplate/src/org/labkey/MODULE_DIR_NAME/MODULE_NAMEModule.java b/moduleTemplate/src/org/labkey/MODULE_DIR_NAME/MODULE_NAMEModule.java index 11527bc5..5dc15fc1 100644 --- a/moduleTemplate/src/org/labkey/MODULE_DIR_NAME/MODULE_NAMEModule.java +++ b/moduleTemplate/src/org/labkey/MODULE_DIR_NAME/MODULE_NAMEModule.java @@ -66,8 +66,6 @@ protected void init() @Override public void doStartup(ModuleContext moduleContext) { - // add a container listener so we'll know when our container is deleted: - ContainerManager.addContainerListener(new @@MODULE_NAME@@ContainerListener()); } @Override From ca3d0905384855e4b352234e2bfafebaa6099052 Mon Sep 17 00:00:00 2001 From: labkey-nicka Date: Tue, 28 Oct 2025 08:26:19 -0700 Subject: [PATCH 2/4] Prepare release notes --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index eb0cc3d8..76b4263d 100644 --- a/README.md +++ b/README.md @@ -13,9 +13,14 @@ on how to do that, including how to develop and test locally and the versioning ## Release Notes +### 7.1.1 +*Released*: 28 October 2025 +(Earliest compatible LabKey version: 25.10) +- Remove `ContainerListener` from module template + ### 7.1.0 *Released*: 17 October 2025 -(Earliest compatible LabKeyversion: 25.10) +(Earliest compatible LabKey version: 25.10) - [Issue 53244](https://www.labkey.org/home/Developer/issues/issues-details.view?issueId=53244): Update `stopLabKey` task to work without Spring's shutdown endpoint - [Issue 53792](https://www.labkey.org/home/Developer/issues/issues-details.view?issueId=53792): Conditionally enable Java heap dumps in `StartLabKey` task - Fix output destination of `application.properties` for `DeployApp` task From 7fc1f6a06d5837d6a9f0ac110ef297654ea73fb9 Mon Sep 17 00:00:00 2001 From: labkey-nicka Date: Tue, 28 Oct 2025 08:29:09 -0700 Subject: [PATCH 3/4] 7.2.0-containerListener-SNAPSHOT --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 804be6f8..efcb9df3 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ dependencies { } group = 'org.labkey.build' -project.version = "7.2.0-SNAPSHOT" +project.version = "7.2.0-containerListener-SNAPSHOT" gradlePlugin { plugins { From 72cbd89653846d4370913aeabdaefb421026bd5a Mon Sep 17 00:00:00 2001 From: labkey-nicka Date: Wed, 29 Oct 2025 08:40:07 -0700 Subject: [PATCH 4/4] Undo release --- README.md | 4 ++-- build.gradle | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 76b4263d..934bd36d 100644 --- a/README.md +++ b/README.md @@ -13,8 +13,8 @@ on how to do that, including how to develop and test locally and the versioning ## Release Notes -### 7.1.1 -*Released*: 28 October 2025 +### 7.X.X +*Released*: TBD (Earliest compatible LabKey version: 25.10) - Remove `ContainerListener` from module template diff --git a/build.gradle b/build.gradle index efcb9df3..804be6f8 100644 --- a/build.gradle +++ b/build.gradle @@ -43,7 +43,7 @@ dependencies { } group = 'org.labkey.build' -project.version = "7.2.0-containerListener-SNAPSHOT" +project.version = "7.2.0-SNAPSHOT" gradlePlugin { plugins {