[OpenNMS/opennms] 156776: NMS-20099: Remove the XMPP (Jabber) notification c...
Marshall Massengill via opennms-cvs <[email protected]> Thu, 30 Jul 2026 10:48:44 -0700
| Newsgroups | gmane.network.opennms.cvs |
|---|---|
| Message-ID | <OpenNMS/opennms/push/refs/heads/mm/NMS-20098-smoke/[email protected]> |
Branch: refs/heads/mm/NMS-20098-smoke
Home: https://github.com/OpenNMS/opennms
Commit: 156776f85224cdeaa3b00cf15e7b9c1e05f30686
https://github.com/OpenNMS/opennms/commit/156776f85224cdeaa3b00cf15e7b9c1e05f30686
Author: Marshall Massengill <[email protected]>
Date: 2026-07-29 (Wed, 29 Jul 2026)
Changed paths:
M core/lib/src/main/java/org/opennms/core/utils/ConfigFileConstants.java
M dependencies/pom.xml
R dependencies/smack/pom.xml
M docs/modules/operation/pages/deep-dive/meta-data.adoc
M docs/modules/operation/pages/deep-dive/notifications/commands.adoc
M docs/modules/operation/pages/deep-dive/notifications/introduction.adoc
M docs/modules/reference/pages/daemons/daemon-config-files/notifd.adoc
M docs/modules/releasenotes/pages/changelog.adoc
M opennms-base-assembly/src/main/filtered/etc/examples/destinationPaths.xml
M opennms-base-assembly/src/main/filtered/etc/examples/notificationCommands.xml
M opennms-base-assembly/src/main/filtered/etc/notificationCommands.xml
R opennms-base-assembly/src/main/filtered/etc/xmpp-configuration.properties
M opennms-config-api/src/main/java/org/opennms/netmgt/config/api/UserConfig.java
M opennms-config-model/src/main/resources/xsds/users.xsd
M opennms-config-tester/src/main/resources/META-INF/opennms/applicationContext-configTester.xml
M opennms-config-tester/src/test/java/org/opennms/netmgt/config/tester/ConfigTesterTest.java
M opennms-config/src/main/java/org/opennms/netmgt/config/NotificationManager.java
M opennms-config/src/main/java/org/opennms/netmgt/config/UserManager.java
M opennms-services/pom.xml
M opennms-services/src/main/java/org/opennms/netmgt/notifd/BSFNotificationStrategy.java
M opennms-services/src/main/java/org/opennms/netmgt/notifd/HttpNotificationStrategy.java
M opennms-services/src/main/java/org/opennms/netmgt/notifd/NotificationTask.java
R opennms-services/src/main/java/org/opennms/netmgt/notifd/XMPPGroupNotificationStrategy.java
R opennms-services/src/main/java/org/opennms/netmgt/notifd/XMPPNotificationManager.java
R opennms-services/src/main/java/org/opennms/netmgt/notifd/XMPPNotificationStrategy.java
R opennms-services/src/test/java/org/opennms/netmgt/notifd/XMPPNotificationTest.java
M opennms-webapp/src/main/java/org/opennms/web/admin/users/UpdateUserServlet.java
M opennms-webapp/src/main/java/org/opennms/web/admin/users/parsers/NotificationInfo.java
M opennms-webapp/src/main/webapp/admin/userGroupView/users/list.jsp
M opennms-webapp/src/main/webapp/admin/userGroupView/users/modifyUser.jsp
M opennms-webapp/src/main/webapp/admin/userGroupView/users/userDetail.jsp
M pom.xml
M smoke-test/src/test/java/org/opennms/smoketest/UserIT.java
Log Message:
-----------
NMS-20099: Remove the XMPP (Jabber) notification channel
Removes the XMPPNotificationStrategy, XMPPGroupNotificationStrategy,
and XMPPNotificationManager along with the smack dependency module,
etc/xmpp-configuration.properties, the xmppMessage/xmppGroupMessage
default notification commands, the -xmpp notification parameter, and
the XMPP address field in the user admin pages.
The xmppAddress contact type remains valid in users.xsd and ContactType
because the user admin page wrote an empty xmppAddress contact on every
save, so existing users.xml files would otherwise fail validation.
Commit: 38686a8e992af2efe8b3be657db2962662fc2bc1
https://github.com/OpenNMS/opennms/commit/38686a8e992af2efe8b3be657db2962662fc2bc1
Author: Marshall Massengill <[email protected]>
Date: 2026-07-30 (Thu, 30 Jul 2026)
Changed paths:
M pom.xml
Log Message:
-----------
Merge remote-tracking branch 'upstream/release-36.x' into mm/NMS-20099-smoke
Commit: 67f611b3a54c19c382b2761b7ed07aaa1274a2a0
https://github.com/OpenNMS/opennms/commit/67f611b3a54c19c382b2761b7ed07aaa1274a2a0
Author: Marshall Massengill <[email protected]>
Date: 2026-07-30 (Thu, 30 Jul 2026)
Changed paths:
M core/lib/src/main/java/org/opennms/core/utils/ConfigFileConstants.java
M dependencies/pom.xml
R dependencies/smack/pom.xml
M docs/modules/operation/pages/deep-dive/meta-data.adoc
M docs/modules/operation/pages/deep-dive/notifications/commands.adoc
M docs/modules/operation/pages/deep-dive/notifications/introduction.adoc
M docs/modules/reference/pages/daemons/daemon-config-files/notifd.adoc
M docs/modules/releasenotes/pages/changelog.adoc
M opennms-base-assembly/src/main/filtered/etc/examples/destinationPaths.xml
M opennms-base-assembly/src/main/filtered/etc/examples/notificationCommands.xml
M opennms-base-assembly/src/main/filtered/etc/notificationCommands.xml
R opennms-base-assembly/src/main/filtered/etc/xmpp-configuration.properties
M opennms-config-api/src/main/java/org/opennms/netmgt/config/api/UserConfig.java
M opennms-config-model/src/main/resources/xsds/users.xsd
M opennms-config-tester/src/main/resources/META-INF/opennms/applicationContext-configTester.xml
M opennms-config-tester/src/test/java/org/opennms/netmgt/config/tester/ConfigTesterTest.java
M opennms-config/src/main/java/org/opennms/netmgt/config/NotificationManager.java
M opennms-config/src/main/java/org/opennms/netmgt/config/UserManager.java
M opennms-services/pom.xml
M opennms-services/src/main/java/org/opennms/netmgt/notifd/BSFNotificationStrategy.java
M opennms-services/src/main/java/org/opennms/netmgt/notifd/HttpNotificationStrategy.java
M opennms-services/src/main/java/org/opennms/netmgt/notifd/NotificationTask.java
R opennms-services/src/main/java/org/opennms/netmgt/notifd/XMPPGroupNotificationStrategy.java
R opennms-services/src/main/java/org/opennms/netmgt/notifd/XMPPNotificationManager.java
R opennms-services/src/main/java/org/opennms/netmgt/notifd/XMPPNotificationStrategy.java
R opennms-services/src/test/java/org/opennms/netmgt/notifd/XMPPNotificationTest.java
M opennms-webapp/src/main/java/org/opennms/web/admin/users/UpdateUserServlet.java
M opennms-webapp/src/main/java/org/opennms/web/admin/users/parsers/NotificationInfo.java
M opennms-webapp/src/main/webapp/admin/userGroupView/users/list.jsp
M opennms-webapp/src/main/webapp/admin/userGroupView/users/modifyUser.jsp
M opennms-webapp/src/main/webapp/admin/userGroupView/users/userDetail.jsp
M pom.xml
M smoke-test/src/test/java/org/opennms/smoketest/UserIT.java
Log Message:
-----------
Merge pull request #8690 from OpenNMS/mm/NMS-20099-smoke
NMS-20099: Remove the XMPP (Jabber) notification channel
Commit: bd944700cd6bce1a531c5456ac4801ca39e76b3d
https://github.com/OpenNMS/opennms/commit/bd944700cd6bce1a531c5456ac4801ca39e76b3d
Author: Marshall Massengill <[email protected]>
Date: 2026-07-30 (Thu, 30 Jul 2026)
Changed paths:
M core/lib/src/main/java/org/opennms/core/utils/ConfigFileConstants.java
M dependencies/pom.xml
R dependencies/smack/pom.xml
M docs/modules/operation/pages/deep-dive/meta-data.adoc
M docs/modules/operation/pages/deep-dive/notifications/commands.adoc
M docs/modules/operation/pages/deep-dive/notifications/introduction.adoc
M docs/modules/reference/pages/daemons/daemon-config-files/notifd.adoc
M docs/modules/releasenotes/pages/changelog.adoc
M opennms-base-assembly/src/main/filtered/etc/examples/destinationPaths.xml
M opennms-base-assembly/src/main/filtered/etc/examples/notificationCommands.xml
M opennms-base-assembly/src/main/filtered/etc/notificationCommands.xml
R opennms-base-assembly/src/main/filtered/etc/xmpp-configuration.properties
M opennms-config-api/src/main/java/org/opennms/netmgt/config/api/UserConfig.java
M opennms-config-model/src/main/resources/xsds/users.xsd
M opennms-config-tester/src/main/resources/META-INF/opennms/applicationContext-configTester.xml
M opennms-config-tester/src/test/java/org/opennms/netmgt/config/tester/ConfigTesterTest.java
M opennms-config/src/main/java/org/opennms/netmgt/config/NotificationManager.java
M opennms-config/src/main/java/org/opennms/netmgt/config/UserManager.java
M opennms-services/pom.xml
M opennms-services/src/main/java/org/opennms/netmgt/notifd/BSFNotificationStrategy.java
M opennms-services/src/main/java/org/opennms/netmgt/notifd/HttpNotificationStrategy.java
M opennms-services/src/main/java/org/opennms/netmgt/notifd/NotificationTask.java
R opennms-services/src/main/java/org/opennms/netmgt/notifd/XMPPGroupNotificationStrategy.java
R opennms-services/src/main/java/org/opennms/netmgt/notifd/XMPPNotificationManager.java
R opennms-services/src/main/java/org/opennms/netmgt/notifd/XMPPNotificationStrategy.java
R opennms-services/src/test/java/org/opennms/netmgt/notifd/XMPPNotificationTest.java
M opennms-webapp/src/main/java/org/opennms/web/admin/users/UpdateUserServlet.java
M opennms-webapp/src/main/java/org/opennms/web/admin/users/parsers/NotificationInfo.java
M opennms-webapp/src/main/webapp/admin/userGroupView/users/list.jsp
M opennms-webapp/src/main/webapp/admin/userGroupView/users/modifyUser.jsp
M opennms-webapp/src/main/webapp/admin/userGroupView/users/userDetail.jsp
M pom.xml
M smoke-test/src/test/java/org/opennms/smoketest/UserIT.java
Log Message:
-----------
Merge upstream release-36.x into mm/NMS-20098-smoke
Every conflict is the microblog removal (this branch, NMS-20098)
colliding with the XMPP notification removal that landed upstream
(NMS-20099): each side deleted its channel where the other's file
still listed it. Resolved by removing both channels everywhere -
opennms-services keeps neither smack- nor twitter4j-dependencies,
the users.xsd back-compat comment covers both retained tokens, and
the user admin servlet/JSP/smoke test drop both contact fields.
Compare: https://github.com/OpenNMS/opennms/compare/41df8a8d54a3...bd944700cd6b
To unsubscribe from these emails, change your notification settings at https://github.com/OpenNMS/opennms/settings/notifications
_______________________________________________
Please read the OpenNMS Mailing List FAQ:
http://www.opennms.org/wiki/index.php?page=MailingListFaq
opennms-cvs mailing list
To *unsubscribe* or change your subscription options, see the bottom of this page:
https://lists.sourceforge.net/lists/listinfo/opennms-cvs