From cb01c050a993a3aebe7b3219db0f0a673a4ccf1c Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Wed, 3 Mar 2021 17:42:33 +0000 Subject: [PATCH 1/8] FISH-468 Rework admin audit upgrade. The admin audit service isn't present in Payara Micro, leading to CNFEs when you try to start it. This reworks the upgrade of this specific service into its own module and service, rather than being done as a part of each notifier upgrade. This allows us to split it out and include it separately. Signed-off-by: Andrew Pielage --- datadog-notifier-console-plugin-l10n/pom.xml | 4 +- datadog-notifier-console-plugin/pom.xml | 4 +- datadog-notifier-core/pom.xml | 4 +- discord-notifier-console-plugin/pom.xml | 4 +- discord-notifier-core/pom.xml | 4 +- email-notifier-console-plugin-l10n/pom.xml | 4 +- email-notifier-console-plugin/pom.xml | 4 +- email-notifier-core/pom.xml | 4 +- .../pom.xml | 70 +++++++ .../AdminAuditNotifiersUpgradeService.java | 193 ++++++++++++++++++ .../pom.xml | 2 +- .../CdiEventBusUpgradeService.java | 12 +- .../pom.xml | 2 +- .../DatadogNotifierUpgradeService.java | 12 +- .../pom.xml | 2 +- .../email/EmailNotifierUpgradeService.java | 51 ++++- .../pom.xml | 2 +- .../EventBusNotifierUpgradeService.java | 12 +- .../pom.xml | 2 +- .../compat/jms/JmsNotifierUpgradeService.java | 12 +- .../pom.xml | 2 +- .../compat/log/LogNotifierUpgradeService.java | 12 +- .../pom.xml | 2 +- .../NewRelicNotifierUpgradeService.java | 12 +- .../pom.xml | 2 +- .../pom.xml | 2 +- ...java => LegacyNotifierUpgradeService.java} | 102 +-------- .../notifiers/compat/UpgradesNotifier.java | 64 ++++++ enterprise-backwards-compatibility/pom.xml | 3 +- .../pom.xml | 2 +- .../slack/SlackNotifierUpgradeService.java | 12 +- .../pom.xml | 2 +- .../snmp/SnmpNotifierUpgradeService.java | 12 +- .../pom.xml | 2 +- .../xmpp/XmppNotifierUpgradeService.java | 12 +- example-notifier-console-plugin/pom.xml | 2 +- example-notifier-core/pom.xml | 2 +- newrelic-notifier-console-plugin-l10n/pom.xml | 4 +- newrelic-notifier-console-plugin/pom.xml | 4 +- newrelic-notifier-core/pom.xml | 4 +- pom.xml | 4 +- slack-notifier-console-plugin-l10n/pom.xml | 4 +- slack-notifier-console-plugin/pom.xml | 4 +- slack-notifier-core/pom.xml | 4 +- snmp-notifier-console-plugin-l10n/pom.xml | 4 +- snmp-notifier-console-plugin/pom.xml | 4 +- snmp-notifier-core/pom.xml | 4 +- teams-notifier-console-plugin/pom.xml | 4 +- teams-notifier-core/pom.xml | 4 +- xmpp-notifier-console-plugin-l10n/pom.xml | 4 +- xmpp-notifier-console-plugin/pom.xml | 4 +- xmpp-notifier-core/pom.xml | 4 +- 52 files changed, 525 insertions(+), 186 deletions(-) create mode 100644 enterprise-backwards-compatibility/admin-audit-notifiers-backwards-compatibility/pom.xml create mode 100644 enterprise-backwards-compatibility/admin-audit-notifiers-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/audit/AdminAuditNotifiersUpgradeService.java rename enterprise-backwards-compatibility/notifier-backwards-compatibility-core/src/main/java/fish/payara/extensions/notifiers/compat/{BaseNotifierUpgradeService.java => LegacyNotifierUpgradeService.java} (68%) create mode 100644 enterprise-backwards-compatibility/notifier-backwards-compatibility-core/src/main/java/fish/payara/extensions/notifiers/compat/UpgradesNotifier.java diff --git a/datadog-notifier-console-plugin-l10n/pom.xml b/datadog-notifier-console-plugin-l10n/pom.xml index e7c0939..b893656 100644 --- a/datadog-notifier-console-plugin-l10n/pom.xml +++ b/datadog-notifier-console-plugin-l10n/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT datadog-notifier-console-plugin-l10n - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT glassfish-jar Datadog Notifier Console L10n Plugin diff --git a/datadog-notifier-console-plugin/pom.xml b/datadog-notifier-console-plugin/pom.xml index 03da9f1..a3e95ae 100644 --- a/datadog-notifier-console-plugin/pom.xml +++ b/datadog-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT datadog-notifier-console-plugin - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT glassfish-jar Datadog Notifier Console Plugin diff --git a/datadog-notifier-core/pom.xml b/datadog-notifier-core/pom.xml index c0dbf04..d39e358 100644 --- a/datadog-notifier-core/pom.xml +++ b/datadog-notifier-core/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT datadog-notifier-core - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT glassfish-jar Datadog Notifier Implementation diff --git a/discord-notifier-console-plugin/pom.xml b/discord-notifier-console-plugin/pom.xml index af39598..e1aae12 100644 --- a/discord-notifier-console-plugin/pom.xml +++ b/discord-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT discord-notifier-console-plugin - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT glassfish-jar Discord Notifier Console Plugin diff --git a/discord-notifier-core/pom.xml b/discord-notifier-core/pom.xml index ed96b4c..6778bf1 100644 --- a/discord-notifier-core/pom.xml +++ b/discord-notifier-core/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT discord-notifier-core - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT glassfish-jar Discord Notifier Implementation diff --git a/email-notifier-console-plugin-l10n/pom.xml b/email-notifier-console-plugin-l10n/pom.xml index 22cf43f..bcbf8ac 100644 --- a/email-notifier-console-plugin-l10n/pom.xml +++ b/email-notifier-console-plugin-l10n/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT email-notifier-console-plugin-l10n - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT glassfish-jar Email Notifier Console L10n Plugin diff --git a/email-notifier-console-plugin/pom.xml b/email-notifier-console-plugin/pom.xml index 563366f..416daf6 100644 --- a/email-notifier-console-plugin/pom.xml +++ b/email-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT email-notifier-console-plugin - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT glassfish-jar Email Notifier Console Plugin diff --git a/email-notifier-core/pom.xml b/email-notifier-core/pom.xml index f107e46..241127b 100644 --- a/email-notifier-core/pom.xml +++ b/email-notifier-core/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT email-notifier-core - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT glassfish-jar Email Notifier Implementation diff --git a/enterprise-backwards-compatibility/admin-audit-notifiers-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/admin-audit-notifiers-backwards-compatibility/pom.xml new file mode 100644 index 0000000..f6f22f4 --- /dev/null +++ b/enterprise-backwards-compatibility/admin-audit-notifiers-backwards-compatibility/pom.xml @@ -0,0 +1,70 @@ + + + + + fish.payara.extensions.notifiers + enterprise-backwards-compatibility + 1.0.1-enterprise-SNAPSHOT + + 4.0.0 + + admin-audit-notifiers-backwards-compatibility + glassfish-jar + + Asadmin Audit Notification Service Backwards Compatibility + + + + fish.payara.extensions.notifiers + notifier-backwards-compatibility-core + ${project.version} + + + fish.payara.extensions.notifiers + email-notifier-backwards-compatibility + 1.0.1-enterprise-SNAPSHOT + compile + + + + \ No newline at end of file diff --git a/enterprise-backwards-compatibility/admin-audit-notifiers-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/audit/AdminAuditNotifiersUpgradeService.java b/enterprise-backwards-compatibility/admin-audit-notifiers-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/audit/AdminAuditNotifiersUpgradeService.java new file mode 100644 index 0000000..2235c08 --- /dev/null +++ b/enterprise-backwards-compatibility/admin-audit-notifiers-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/audit/AdminAuditNotifiersUpgradeService.java @@ -0,0 +1,193 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright (c) 2021 Payara Foundation and/or its affiliates. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can + * obtain a copy of the License at + * https://github.com/payara/Payara/blob/master/LICENSE.txt + * See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at glassfish/legal/LICENSE.txt. + * + * GPL Classpath Exception: + * The Payara Foundation designates this particular file as subject to the "Classpath" + * exception as provided by the Payara Foundation in the GPL Version 2 section of the License + * file that accompanied this code. + * + * Modifications: + * If applicable, add the following below the License Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyright [year] [name of copyright owner]" + * + * Contributor(s): + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. + */ + +package fish.payara.extensions.notifiers.compat.audit; + +import com.sun.enterprise.config.serverbeans.Config; +import com.sun.enterprise.config.serverbeans.Configs; +import com.sun.enterprise.util.StringUtils; +import fish.payara.audit.AdminAuditConfiguration; +import fish.payara.audit.AdminAuditService; +import fish.payara.extensions.notifiers.compat.LegacyNotifierUpgradeService; +import fish.payara.extensions.notifiers.compat.config.Notifier; +import fish.payara.internal.notification.admin.NotificationServiceConfiguration; +import org.glassfish.api.StartupRunLevel; +import org.glassfish.hk2.api.PostConstruct; +import org.glassfish.hk2.api.ServiceLocator; +import org.glassfish.hk2.runlevel.RunLevel; +import org.glassfish.internal.api.Globals; +import org.jvnet.hk2.annotations.Service; +import org.jvnet.hk2.config.ConfigSupport; +import org.jvnet.hk2.config.TransactionFailure; + +import javax.inject.Inject; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * Service that upgrades legacy {@link NotificationServiceConfiguration} on server start for the + * {@link AdminAuditService}. Split out into its own module and service since Micro doesn't have this service present. + * + * @author Andrew Pielage + */ +@Service +@RunLevel(StartupRunLevel.VAL) +public class AdminAuditNotifiersUpgradeService implements PostConstruct { + + @Inject + private Configs configs; + + @Inject + private Logger logger; + + @Inject + private ServiceLocator serviceLocator; + + @Override + public void postConstruct() { + for (Config config : configs.getConfig()) { + // First up, get the notifier configuration for each config + NotificationServiceConfiguration notificationServiceConfiguration = config.getExtensionByType( + NotificationServiceConfiguration.class); + // If there is no notifier configuration whatsoever - just exit out. This **should** be an edge case - + // default config tags for the notification service have existed for a long time + if (notificationServiceConfiguration == null) { + continue; + } + + upgradeAdminAuditService(config); + } + } + + /** + * Upgrades any configured legacy notifiers for a given {@link AdminAuditConfiguration}, before removing + * the legacy config. If there is existing "upgraded" config, it does not override it. + *

+ * Split out from {@link LegacyNotifierUpgradeService} since Micro doesn't have the admin audit service + * and so runs into ClassNotFoundExceptions. + * + * @param config The {@link Config} to upgrade the {@link AdminAuditConfiguration} of. + */ + private void upgradeAdminAuditService(Config config) { + AdminAuditConfiguration adminAuditConfiguration = config.getExtensionByType( + AdminAuditConfiguration.class); + + if (adminAuditConfiguration == null) { + logger.log(Level.WARNING, "Could not find admin audit service configuration to upgrade for config: {0}", + config.getName()); + return; + } + + if (serviceLocator == null) { + serviceLocator = Globals.getDefaultBaseServiceLocator(); + if (serviceLocator == null) { + logger.log(Level.WARNING, "Could not find service locator to upgrade admin audit service. " + + "Notifiers for this service may behave unexpectedly"); + return; + } + } + + // For each legacy notifier in the admin audit configuration, upgrade it + for (Notifier notifier : adminAuditConfiguration.getLegacyNotifierList()) { + // Find all of the notifier upgrade services by searching for the contract + List legacyNotifierUpgradeServices = serviceLocator.getAllServices( + LegacyNotifierUpgradeService.class); + + // Search through the services until we find the upgrade service that matches what we're trying to upgrade + for (LegacyNotifierUpgradeService legacyNotifierUpgradeService : legacyNotifierUpgradeServices) { + // Since we're working with a ConfigBeanProxy we can't simply do notifier.getClass() since this would + // return the proxy class. Instead, we can grab the interfaces of this proxy to what's actually being + // proxied. In this case, each ConfigBeanProxy *should* only only have a single interface: the notifier + // config bean interface that we're trying to get (e.g. EmailNotifier) for our comparison + if (legacyNotifierUpgradeService.getUpgradeNotifierClass().equals( + notifier.getClass().getInterfaces()[0])) { + upgradeAdminAuditService(adminAuditConfiguration, notifier, + legacyNotifierUpgradeService.getNewNotifierName()); + break; + } + } + } + } + + /** + * Upgrades a legacy notifier of the given type for a given {@link AdminAuditConfiguration} before removing the + * legacy config. If there is existing "upgraded" config, it does not override it. + *

+ * Split out from {@link LegacyNotifierUpgradeService} since Micro doesn't have the admin audit service + * and so runs into ClassNotFoundExceptions. + * + * @param adminAuditConfiguration The {@link AdminAuditConfiguration} to upgrade + * @param notifierName The name of the notifier, corresponding to its XML tag in the domain.xml + * @param The type of legacy {@link Notifier} to upgrade + */ + private void upgradeAdminAuditService(AdminAuditConfiguration adminAuditConfiguration, + T notifier, String notifierName) { + + if (StringUtils.ok(notifier.getEnabled()) && Boolean.valueOf(notifier.getEnabled())) { + // Since this is enabled, there might be something for us to do. + // Get the new notifier config list to see if this notifier is enabled - we don't want to override an + // existing value + List notifiers = adminAuditConfiguration.getNotifierList(); + + if (!notifiers.contains(notifierName)) { + // No existing config to override, so let's migrate old to new + try { + ConfigSupport.apply(adminAuditConfigurationProxy -> { + adminAuditConfigurationProxy.getNotifierList().add(notifierName); + return adminAuditConfigurationProxy; + }, adminAuditConfiguration); + } catch (TransactionFailure transactionFailure) { + logger.log(Level.WARNING, "Failed to upgrade legacy notifier configuration", transactionFailure); + } + } + // And finally, delete the legacy config + try { + ConfigSupport.apply(adminAuditConfigurationProxy -> { + adminAuditConfigurationProxy.getLegacyNotifierList().remove(notifier); + return adminAuditConfigurationProxy; + }, adminAuditConfiguration); + } catch (TransactionFailure transactionFailure) { + logger.log(Level.WARNING, "Failed to remove legacy notifier configuration", transactionFailure); + } + } + } + +} \ No newline at end of file diff --git a/enterprise-backwards-compatibility/cdi-eventbus-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/cdi-eventbus-notifier-backwards-compatibility/pom.xml index 1d1db78..8e00d90 100644 --- a/enterprise-backwards-compatibility/cdi-eventbus-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/cdi-eventbus-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/cdi-eventbus-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/cdieventbus/CdiEventBusUpgradeService.java b/enterprise-backwards-compatibility/cdi-eventbus-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/cdieventbus/CdiEventBusUpgradeService.java index b003387..12d6011 100644 --- a/enterprise-backwards-compatibility/cdi-eventbus-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/cdieventbus/CdiEventBusUpgradeService.java +++ b/enterprise-backwards-compatibility/cdi-eventbus-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/cdieventbus/CdiEventBusUpgradeService.java @@ -41,7 +41,8 @@ package fish.payara.extensions.notifiers.compat.cdieventbus; import com.sun.enterprise.config.serverbeans.Config; -import fish.payara.extensions.notifiers.compat.BaseNotifierUpgradeService; +import fish.payara.extensions.notifiers.compat.LegacyNotifierUpgradeService; +import fish.payara.extensions.notifiers.compat.UpgradesNotifier; import fish.payara.internal.notification.admin.NotificationServiceConfiguration; import org.glassfish.api.StartupRunLevel; import org.glassfish.hk2.runlevel.RunLevel; @@ -54,7 +55,8 @@ */ @Service @RunLevel(StartupRunLevel.VAL) -public class CdiEventBusUpgradeService extends BaseNotifierUpgradeService { +@UpgradesNotifier(CdiEventBusNotifier.class) +public class CdiEventBusUpgradeService extends LegacyNotifierUpgradeService { private static final String notifierName = "cdieventbus-notifier"; @@ -74,8 +76,12 @@ public void postConstruct() { upgradeRequestTracingService(config, notifierName, CdiEventBusNotifier.class); upgradeMonitoringService(config, notifierName, CdiEventBusNotifier.class); upgradeHealthCheckService(config, notifierName, CdiEventBusNotifier.class); - upgradeAdminAuditService(config, notifierName, CdiEventBusNotifier.class); } } + @Override + public String getNewNotifierName() { + return notifierName; + } + } diff --git a/enterprise-backwards-compatibility/datadog-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/datadog-notifier-backwards-compatibility/pom.xml index 21a851b..a593003 100644 --- a/enterprise-backwards-compatibility/datadog-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/datadog-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ fish.payara.extensions.notifiers enterprise-backwards-compatibility - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/datadog-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/datadog/DatadogNotifierUpgradeService.java b/enterprise-backwards-compatibility/datadog-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/datadog/DatadogNotifierUpgradeService.java index 8dc7e1d..8134b47 100644 --- a/enterprise-backwards-compatibility/datadog-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/datadog/DatadogNotifierUpgradeService.java +++ b/enterprise-backwards-compatibility/datadog-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/datadog/DatadogNotifierUpgradeService.java @@ -40,7 +40,8 @@ package fish.payara.extensions.notifiers.compat.datadog; import com.sun.enterprise.config.serverbeans.Config; -import fish.payara.extensions.notifiers.compat.BaseNotifierUpgradeService; +import fish.payara.extensions.notifiers.compat.LegacyNotifierUpgradeService; +import fish.payara.extensions.notifiers.compat.UpgradesNotifier; import fish.payara.internal.notification.admin.NotificationServiceConfiguration; import org.glassfish.api.StartupRunLevel; import org.glassfish.hk2.runlevel.RunLevel; @@ -53,7 +54,8 @@ */ @Service @RunLevel(StartupRunLevel.VAL) -public class DatadogNotifierUpgradeService extends BaseNotifierUpgradeService { +@UpgradesNotifier(DatadogNotifier.class) +public class DatadogNotifierUpgradeService extends LegacyNotifierUpgradeService { private static final String notifierName = "datadog-notifier"; @@ -73,7 +75,11 @@ public void postConstruct() { upgradeRequestTracingService(config, notifierName, DatadogNotifier.class); upgradeMonitoringService(config, notifierName, DatadogNotifier.class); upgradeHealthCheckService(config, notifierName, DatadogNotifier.class); - upgradeAdminAuditService(config, notifierName, DatadogNotifier.class); } } + + @Override + public String getNewNotifierName() { + return notifierName; + } } diff --git a/enterprise-backwards-compatibility/email-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/email-notifier-backwards-compatibility/pom.xml index 7987e14..04432b8 100644 --- a/enterprise-backwards-compatibility/email-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/email-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ fish.payara.extensions.notifiers enterprise-backwards-compatibility - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/email-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/email/EmailNotifierUpgradeService.java b/enterprise-backwards-compatibility/email-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/email/EmailNotifierUpgradeService.java index 28b2fa2..0630ffa 100644 --- a/enterprise-backwards-compatibility/email-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/email/EmailNotifierUpgradeService.java +++ b/enterprise-backwards-compatibility/email-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/email/EmailNotifierUpgradeService.java @@ -41,7 +41,8 @@ import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.util.StringUtils; -import fish.payara.extensions.notifiers.compat.BaseNotifierUpgradeService; +import fish.payara.extensions.notifiers.compat.LegacyNotifierUpgradeService; +import fish.payara.extensions.notifiers.compat.UpgradesNotifier; import fish.payara.extensions.notifiers.email.EmailNotifierConfiguration; import fish.payara.internal.notification.admin.NotificationServiceConfiguration; import org.glassfish.api.StartupRunLevel; @@ -59,7 +60,8 @@ */ @Service @RunLevel(StartupRunLevel.VAL) -public class EmailNotifierUpgradeService extends BaseNotifierUpgradeService { +@UpgradesNotifier(EmailNotifier.class) +public class EmailNotifierUpgradeService extends LegacyNotifierUpgradeService { private static final String notifierName = "email-notifier"; @@ -76,8 +78,8 @@ public void postConstruct() { } // Next up, get the email notifier configuration for this config, creating default config tags if required - EmailNotifierConfiguration emailNotifierConfiguration = getNotifierConfiguration( - notificationServiceConfiguration, EmailNotifierConfiguration.class); + EmailNotifierConfiguration emailNotifierConfiguration = getEmailNotifierConfiguration( + notificationServiceConfiguration); // If we don't find the config or fail to create one, exit out - something has gone fundamentally wrong if (emailNotifierConfiguration == null) { logger.log(Level.WARNING, @@ -92,10 +94,44 @@ public void postConstruct() { upgradeRequestTracingService(config, notifierName, EmailNotifier.class); upgradeMonitoringService(config, notifierName, EmailNotifier.class); upgradeHealthCheckService(config, notifierName, EmailNotifier.class); - upgradeAdminAuditService(config, notifierName, EmailNotifier.class); } } + /** + * Retrieves the {@link EmailNotifierConfiguration} for a given {@link NotificationServiceConfiguration}. + * + * @param notificationServiceConfiguration The {@link NotificationServiceConfiguration} to get config from + * @return The {@link EmailNotifierConfiguration} for the specified {@link NotificationServiceConfiguration}, or + * null if it can't be found or created + */ + protected EmailNotifierConfiguration getEmailNotifierConfiguration( + NotificationServiceConfiguration notificationServiceConfiguration) { + EmailNotifierConfiguration emailNotifierConfiguration = notificationServiceConfiguration + .getNotifierConfigurationByType(EmailNotifierConfiguration.class); + // Will be null if no default config tags present + if (emailNotifierConfiguration == null) { + try { + // Create a transaction around the notifier config we want to add the element to, grab it's list + // of notifiers, and add a new child element to it + ConfigSupport.apply(notificationServiceConfigurationProxy -> { + notificationServiceConfigurationProxy.getNotifierConfigurationList().add( + notificationServiceConfigurationProxy.createChild(EmailNotifierConfiguration.class)); + return notificationServiceConfigurationProxy; + }, notificationServiceConfiguration); + } catch (TransactionFailure transactionFailure) { + logger.log(Level.WARNING, "Failed to upgrade legacy notifier configuration", transactionFailure); + return null; + } + + // Get the newly created config element + emailNotifierConfiguration = notificationServiceConfiguration.getNotifierConfigurationByType( + EmailNotifierConfiguration.class); + } + + // Could still be null! + return emailNotifierConfiguration; + } + private void upgradeNotifierService(EmailNotifierConfiguration emailNotifierConfiguration) { // Get the attributes to upgrade String to = emailNotifierConfiguration.getTo(); @@ -128,4 +164,9 @@ private void upgradeNotifierService(EmailNotifierConfiguration emailNotifierConf } } + @Override + public String getNewNotifierName() { + return notifierName; + } + } diff --git a/enterprise-backwards-compatibility/eventbus-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/eventbus-notifier-backwards-compatibility/pom.xml index b1dbb3b..55dbd1d 100644 --- a/enterprise-backwards-compatibility/eventbus-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/eventbus-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/eventbus-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/eventbus/EventBusNotifierUpgradeService.java b/enterprise-backwards-compatibility/eventbus-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/eventbus/EventBusNotifierUpgradeService.java index 88d3068..13b3952 100644 --- a/enterprise-backwards-compatibility/eventbus-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/eventbus/EventBusNotifierUpgradeService.java +++ b/enterprise-backwards-compatibility/eventbus-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/eventbus/EventBusNotifierUpgradeService.java @@ -41,7 +41,8 @@ package fish.payara.extensions.notifiers.compat.eventbus; import com.sun.enterprise.config.serverbeans.Config; -import fish.payara.extensions.notifiers.compat.BaseNotifierUpgradeService; +import fish.payara.extensions.notifiers.compat.LegacyNotifierUpgradeService; +import fish.payara.extensions.notifiers.compat.UpgradesNotifier; import fish.payara.internal.notification.admin.NotificationServiceConfiguration; import org.glassfish.api.StartupRunLevel; import org.glassfish.hk2.runlevel.RunLevel; @@ -54,7 +55,8 @@ */ @Service @RunLevel(StartupRunLevel.VAL) -public class EventBusNotifierUpgradeService extends BaseNotifierUpgradeService { +@UpgradesNotifier(EventBusNotifier.class) +public class EventBusNotifierUpgradeService extends LegacyNotifierUpgradeService { private static final String notifierName = "eventbus-notifier"; @@ -74,7 +76,11 @@ public void postConstruct() { upgradeRequestTracingService(config, notifierName, EventBusNotifier.class); upgradeMonitoringService(config, notifierName, EventBusNotifier.class); upgradeHealthCheckService(config, notifierName, EventBusNotifier.class); - upgradeAdminAuditService(config, notifierName, EventBusNotifier.class); } } + + @Override + public String getNewNotifierName() { + return notifierName; + } } diff --git a/enterprise-backwards-compatibility/jms-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/jms-notifier-backwards-compatibility/pom.xml index 79de9c5..e6f42b8 100644 --- a/enterprise-backwards-compatibility/jms-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/jms-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/jms-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/jms/JmsNotifierUpgradeService.java b/enterprise-backwards-compatibility/jms-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/jms/JmsNotifierUpgradeService.java index cf81a01..26aae9e 100644 --- a/enterprise-backwards-compatibility/jms-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/jms/JmsNotifierUpgradeService.java +++ b/enterprise-backwards-compatibility/jms-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/jms/JmsNotifierUpgradeService.java @@ -41,7 +41,8 @@ package fish.payara.extensions.notifiers.compat.jms; import com.sun.enterprise.config.serverbeans.Config; -import fish.payara.extensions.notifiers.compat.BaseNotifierUpgradeService; +import fish.payara.extensions.notifiers.compat.LegacyNotifierUpgradeService; +import fish.payara.extensions.notifiers.compat.UpgradesNotifier; import fish.payara.internal.notification.admin.NotificationServiceConfiguration; import org.glassfish.api.StartupRunLevel; import org.glassfish.hk2.runlevel.RunLevel; @@ -54,7 +55,8 @@ */ @Service @RunLevel(StartupRunLevel.VAL) -public class JmsNotifierUpgradeService extends BaseNotifierUpgradeService { +@UpgradesNotifier(JmsNotifier.class) +public class JmsNotifierUpgradeService extends LegacyNotifierUpgradeService { private static final String notifierName = "jms-notifier"; @@ -74,7 +76,11 @@ public void postConstruct() { upgradeRequestTracingService(config, notifierName, JmsNotifier.class); upgradeMonitoringService(config, notifierName, JmsNotifier.class); upgradeHealthCheckService(config, notifierName, JmsNotifier.class); - upgradeAdminAuditService(config, notifierName, JmsNotifier.class); } } + + @Override + public String getNewNotifierName() { + return notifierName; + } } diff --git a/enterprise-backwards-compatibility/log-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/log-notifier-backwards-compatibility/pom.xml index 1fd7a1e..a78d14d 100644 --- a/enterprise-backwards-compatibility/log-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/log-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/log-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/log/LogNotifierUpgradeService.java b/enterprise-backwards-compatibility/log-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/log/LogNotifierUpgradeService.java index e41e260..8fcf741 100644 --- a/enterprise-backwards-compatibility/log-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/log/LogNotifierUpgradeService.java +++ b/enterprise-backwards-compatibility/log-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/log/LogNotifierUpgradeService.java @@ -41,7 +41,8 @@ package fish.payara.extensions.notifiers.compat.log; import com.sun.enterprise.config.serverbeans.Config; -import fish.payara.extensions.notifiers.compat.BaseNotifierUpgradeService; +import fish.payara.extensions.notifiers.compat.LegacyNotifierUpgradeService; +import fish.payara.extensions.notifiers.compat.UpgradesNotifier; import fish.payara.internal.notification.admin.NotificationServiceConfiguration; import org.glassfish.api.StartupRunLevel; import org.glassfish.hk2.runlevel.RunLevel; @@ -54,7 +55,8 @@ */ @Service @RunLevel(StartupRunLevel.VAL) -public class LogNotifierUpgradeService extends BaseNotifierUpgradeService { +@UpgradesNotifier(LogNotifier.class) +public class LogNotifierUpgradeService extends LegacyNotifierUpgradeService { private static final String notifierName = "log-notifier"; @@ -74,7 +76,11 @@ public void postConstruct() { upgradeRequestTracingService(config, notifierName, LogNotifier.class); upgradeMonitoringService(config, notifierName, LogNotifier.class); upgradeHealthCheckService(config, notifierName, LogNotifier.class); - upgradeAdminAuditService(config, notifierName, LogNotifier.class); } } + + @Override + public String getNewNotifierName() { + return notifierName; + } } diff --git a/enterprise-backwards-compatibility/newrelic-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/newrelic-notifier-backwards-compatibility/pom.xml index c3032ba..18dee6c 100644 --- a/enterprise-backwards-compatibility/newrelic-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/newrelic-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ fish.payara.extensions.notifiers enterprise-backwards-compatibility - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/newrelic-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/newrelic/NewRelicNotifierUpgradeService.java b/enterprise-backwards-compatibility/newrelic-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/newrelic/NewRelicNotifierUpgradeService.java index 259bc66..eb98287 100644 --- a/enterprise-backwards-compatibility/newrelic-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/newrelic/NewRelicNotifierUpgradeService.java +++ b/enterprise-backwards-compatibility/newrelic-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/newrelic/NewRelicNotifierUpgradeService.java @@ -41,7 +41,8 @@ package fish.payara.extensions.notifiers.compat.newrelic; import com.sun.enterprise.config.serverbeans.Config; -import fish.payara.extensions.notifiers.compat.BaseNotifierUpgradeService; +import fish.payara.extensions.notifiers.compat.LegacyNotifierUpgradeService; +import fish.payara.extensions.notifiers.compat.UpgradesNotifier; import fish.payara.internal.notification.admin.NotificationServiceConfiguration; import org.glassfish.api.StartupRunLevel; import org.glassfish.hk2.runlevel.RunLevel; @@ -54,7 +55,8 @@ */ @Service @RunLevel(StartupRunLevel.VAL) -public class NewRelicNotifierUpgradeService extends BaseNotifierUpgradeService { +@UpgradesNotifier(NewRelicNotifier.class) +public class NewRelicNotifierUpgradeService extends LegacyNotifierUpgradeService { private static final String notifierName = "newrelic-notifier"; @@ -74,7 +76,11 @@ public void postConstruct() { upgradeRequestTracingService(config, notifierName, NewRelicNotifier.class); upgradeMonitoringService(config, notifierName, NewRelicNotifier.class); upgradeHealthCheckService(config, notifierName, NewRelicNotifier.class); - upgradeAdminAuditService(config, notifierName, NewRelicNotifier.class); } } + + @Override + public String getNewNotifierName() { + return notifierName; + } } diff --git a/enterprise-backwards-compatibility/notifier-backwards-compatibility-config/pom.xml b/enterprise-backwards-compatibility/notifier-backwards-compatibility-config/pom.xml index 9c3d249..f9d4cf5 100644 --- a/enterprise-backwards-compatibility/notifier-backwards-compatibility-config/pom.xml +++ b/enterprise-backwards-compatibility/notifier-backwards-compatibility-config/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/notifier-backwards-compatibility-core/pom.xml b/enterprise-backwards-compatibility/notifier-backwards-compatibility-core/pom.xml index 1db6c4e..24d106e 100644 --- a/enterprise-backwards-compatibility/notifier-backwards-compatibility-core/pom.xml +++ b/enterprise-backwards-compatibility/notifier-backwards-compatibility-core/pom.xml @@ -5,7 +5,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/notifier-backwards-compatibility-core/src/main/java/fish/payara/extensions/notifiers/compat/BaseNotifierUpgradeService.java b/enterprise-backwards-compatibility/notifier-backwards-compatibility-core/src/main/java/fish/payara/extensions/notifiers/compat/LegacyNotifierUpgradeService.java similarity index 68% rename from enterprise-backwards-compatibility/notifier-backwards-compatibility-core/src/main/java/fish/payara/extensions/notifiers/compat/BaseNotifierUpgradeService.java rename to enterprise-backwards-compatibility/notifier-backwards-compatibility-core/src/main/java/fish/payara/extensions/notifiers/compat/LegacyNotifierUpgradeService.java index 3fff930..1fc0446 100644 --- a/enterprise-backwards-compatibility/notifier-backwards-compatibility-core/src/main/java/fish/payara/extensions/notifiers/compat/BaseNotifierUpgradeService.java +++ b/enterprise-backwards-compatibility/notifier-backwards-compatibility-core/src/main/java/fish/payara/extensions/notifiers/compat/LegacyNotifierUpgradeService.java @@ -43,15 +43,13 @@ import com.sun.enterprise.config.serverbeans.Config; import com.sun.enterprise.config.serverbeans.Configs; import com.sun.enterprise.util.StringUtils; -import fish.payara.audit.AdminAuditConfiguration; import fish.payara.extensions.notifiers.compat.config.Notifier; -import fish.payara.internal.notification.PayaraNotifierConfiguration; -import fish.payara.internal.notification.admin.NotificationServiceConfiguration; import fish.payara.jmx.monitoring.configuration.MonitoringServiceConfiguration; import fish.payara.nucleus.healthcheck.configuration.HealthCheckServiceConfiguration; import fish.payara.nucleus.requesttracing.configuration.RequestTracingServiceConfiguration; import org.glassfish.api.admin.config.ConfigurationUpgrade; import org.glassfish.hk2.api.PostConstruct; +import org.jvnet.hk2.annotations.Contract; import org.jvnet.hk2.config.ConfigSupport; import org.jvnet.hk2.config.TransactionFailure; @@ -61,11 +59,14 @@ import java.util.logging.Logger; /** - * Base class that the notifier upgrade services pull from, containing generic methods shared by all. + * Contract for notifier upgrade services, containing generic methods shared by all. * * @author Andrew Pielage */ -public abstract class BaseNotifierUpgradeService implements ConfigurationUpgrade, PostConstruct { +@Contract +public abstract class LegacyNotifierUpgradeService implements ConfigurationUpgrade, PostConstruct { + + public static final String UPGRADES_NOTIFIER_METADATA = "UpgradesNotifier"; @Inject protected Configs configs; @@ -73,41 +74,10 @@ public abstract class BaseNotifierUpgradeService implements ConfigurationUpgrade @Inject protected Logger logger; - /** - * Retrieves the {@link PayaraNotifierConfiguration} for a given {@link NotificationServiceConfiguration}. - * - * @param notificationServiceConfiguration The {@link NotificationServiceConfiguration} to get config from - * @param notifierConfigurationClass The {@link PayaraNotifierConfiguration} to get - * @param The type of {@link PayaraNotifierConfiguration} to get - * @return The {@link PayaraNotifierConfiguration} for the specified {@link NotificationServiceConfiguration}, or - * null if it can't be found or created - */ - protected T getNotifierConfiguration( - NotificationServiceConfiguration notificationServiceConfiguration, Class notifierConfigurationClass) { - T notifierConfiguration = notificationServiceConfiguration.getNotifierConfigurationByType( - notifierConfigurationClass); - // Will be null if no default config tags present - if (notifierConfiguration == null) { - try { - // Create a transaction around the notifier config we want to add the element to, grab it's list - // of notifiers, and add a new child element to it - ConfigSupport.apply(notificationServiceConfigurationProxy -> { - notificationServiceConfigurationProxy.getNotifierConfigurationList().add( - notificationServiceConfigurationProxy.createChild(notifierConfigurationClass)); - return notificationServiceConfigurationProxy; - }, notificationServiceConfiguration); - } catch (TransactionFailure transactionFailure) { - logger.log(Level.WARNING, "Failed to upgrade legacy notifier configuration", transactionFailure); - return null; - } - - // Get the newly created config element - notifierConfiguration = notificationServiceConfiguration.getNotifierConfigurationByType( - notifierConfigurationClass); - } + public abstract String getNewNotifierName(); - // Could still be null! - return notifierConfiguration; + public Class getUpgradeNotifierClass() { + return getClass().getAnnotation(UpgradesNotifier.class).value(); } /** @@ -272,58 +242,4 @@ protected void upgradeHealthCheckService(Config config, Str } } - /** - * Upgrades any configured legacy notifiers for a given {@link AdminAuditConfiguration}, before removing - * the legacy config. If there is existing "upgraded" config, it does not override it. - * - * @param config The {@link Config} to upgrade the {@link AdminAuditConfiguration} of. - * @param notifierName The name of the notifier, corresponding to its XML tag in the domain.xml - * @param notifierClass The legacy {@link Notifier} to upgrade - * @param The type of legacy {@link Notifier} to upgrade - */ - protected void upgradeAdminAuditService(Config config, String notifierName, - Class notifierClass) { - AdminAuditConfiguration adminAuditConfiguration = config.getExtensionByType( - AdminAuditConfiguration.class); - - if (adminAuditConfiguration == null) { - logger.log(Level.WARNING, "Could not find admin audit service configuration to upgrade for config: {0}", - config.getName()); - return; - } - - T notifier = adminAuditConfiguration.getLegacyNotifierByType(notifierClass); - if (notifier == null) { - // If no config found, nothing to do! - return; - } - - if (StringUtils.ok(notifier.getEnabled()) && Boolean.valueOf(notifier.getEnabled())) { - // Since this is enabled, there might be something for us to do. - // Get the new notifier config list to see if this notifier is enabled - we don't want to override an - // existing value - List notifiers = adminAuditConfiguration.getNotifierList(); - if (!notifiers.contains(notifierName)) { - // No existing config to override, so let's migrate old to new - try { - ConfigSupport.apply(adminAuditConfigurationProxy -> { - adminAuditConfigurationProxy.getNotifierList().add(notifierName); - return adminAuditConfigurationProxy; - }, adminAuditConfiguration); - } catch (TransactionFailure transactionFailure) { - logger.log(Level.WARNING, "Failed to upgrade legacy notifier configuration", transactionFailure); - } - } - // And finally, delete the legacy config - try { - ConfigSupport.apply(adminAuditConfigurationProxy -> { - adminAuditConfigurationProxy.getLegacyNotifierList().remove(notifier); - return adminAuditConfigurationProxy; - }, adminAuditConfiguration); - } catch (TransactionFailure transactionFailure) { - logger.log(Level.WARNING, "Failed to remove legacy notifier configuration", transactionFailure); - } - } - } - } diff --git a/enterprise-backwards-compatibility/notifier-backwards-compatibility-core/src/main/java/fish/payara/extensions/notifiers/compat/UpgradesNotifier.java b/enterprise-backwards-compatibility/notifier-backwards-compatibility-core/src/main/java/fish/payara/extensions/notifiers/compat/UpgradesNotifier.java new file mode 100644 index 0000000..ad7bcea --- /dev/null +++ b/enterprise-backwards-compatibility/notifier-backwards-compatibility-core/src/main/java/fish/payara/extensions/notifiers/compat/UpgradesNotifier.java @@ -0,0 +1,64 @@ +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright (c) 2021 Payara Foundation and/or its affiliates. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can + * obtain a copy of the License at + * https://github.com/payara/Payara/blob/master/LICENSE.txt + * See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at glassfish/legal/LICENSE.txt. + * + * GPL Classpath Exception: + * The Payara Foundation designates this particular file as subject to the "Classpath" + * exception as provided by the Payara Foundation in the GPL Version 2 section of the License + * file that accompanied this code. + * + * Modifications: + * If applicable, add the following below the License Header, with the fields + * enclosed by brackets [] replaced by your own identifying information: + * "Portions Copyright [year] [name of copyright owner]" + * + * Contributor(s): + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. + */ + +package fish.payara.extensions.notifiers.compat; + +import fish.payara.extensions.notifiers.compat.config.Notifier; +import org.glassfish.hk2.api.Metadata; + +import javax.inject.Qualifier; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Qualifier used to mark and add metadata to the upgrade services implementing the {@link LegacyNotifierUpgradeService} + * contract. + */ +@Qualifier +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface UpgradesNotifier { + + @Metadata(LegacyNotifierUpgradeService.UPGRADES_NOTIFIER_METADATA) + Class value(); + +} \ No newline at end of file diff --git a/enterprise-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/pom.xml index fcf8cd0..f4e9105 100644 --- a/enterprise-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ notifiers-parent fish.payara.extensions.notifiers - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT 4.0.0 @@ -66,6 +66,7 @@ slack-notifier-backwards-compatibility snmp-notifier-backwards-compatibility xmpp-notifier-backwards-compatibility + admin-audit-notifiers-backwards-compatibility \ No newline at end of file diff --git a/enterprise-backwards-compatibility/slack-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/slack-notifier-backwards-compatibility/pom.xml index 9cd52c3..540a081 100644 --- a/enterprise-backwards-compatibility/slack-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/slack-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/slack-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/slack/SlackNotifierUpgradeService.java b/enterprise-backwards-compatibility/slack-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/slack/SlackNotifierUpgradeService.java index 419edcd..bcee717 100644 --- a/enterprise-backwards-compatibility/slack-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/slack/SlackNotifierUpgradeService.java +++ b/enterprise-backwards-compatibility/slack-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/slack/SlackNotifierUpgradeService.java @@ -41,7 +41,8 @@ package fish.payara.extensions.notifiers.compat.slack; import com.sun.enterprise.config.serverbeans.Config; -import fish.payara.extensions.notifiers.compat.BaseNotifierUpgradeService; +import fish.payara.extensions.notifiers.compat.LegacyNotifierUpgradeService; +import fish.payara.extensions.notifiers.compat.UpgradesNotifier; import fish.payara.internal.notification.admin.NotificationServiceConfiguration; import org.glassfish.api.StartupRunLevel; import org.glassfish.hk2.runlevel.RunLevel; @@ -54,7 +55,8 @@ */ @Service @RunLevel(StartupRunLevel.VAL) -public class SlackNotifierUpgradeService extends BaseNotifierUpgradeService { +@UpgradesNotifier(SlackNotifier.class) +public class SlackNotifierUpgradeService extends LegacyNotifierUpgradeService { private static final String notifierName = "slack-notifier"; @@ -74,7 +76,11 @@ public void postConstruct() { upgradeRequestTracingService(config, notifierName, SlackNotifier.class); upgradeMonitoringService(config, notifierName, SlackNotifier.class); upgradeHealthCheckService(config, notifierName, SlackNotifier.class); - upgradeAdminAuditService(config, notifierName, SlackNotifier.class); } } + + @Override + public String getNewNotifierName() { + return notifierName; + } } diff --git a/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/pom.xml index 35e1beb..c9fc632 100644 --- a/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/snmp/SnmpNotifierUpgradeService.java b/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/snmp/SnmpNotifierUpgradeService.java index 0897f54..eed6d50 100644 --- a/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/snmp/SnmpNotifierUpgradeService.java +++ b/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/snmp/SnmpNotifierUpgradeService.java @@ -41,7 +41,8 @@ package fish.payara.extensions.notifiers.compat.snmp; import com.sun.enterprise.config.serverbeans.Config; -import fish.payara.extensions.notifiers.compat.BaseNotifierUpgradeService; +import fish.payara.extensions.notifiers.compat.LegacyNotifierUpgradeService; +import fish.payara.extensions.notifiers.compat.UpgradesNotifier; import fish.payara.internal.notification.admin.NotificationServiceConfiguration; import org.glassfish.api.StartupRunLevel; import org.glassfish.hk2.runlevel.RunLevel; @@ -54,7 +55,8 @@ */ @Service @RunLevel(StartupRunLevel.VAL) -public class SnmpNotifierUpgradeService extends BaseNotifierUpgradeService { +@UpgradesNotifier(SnmpNotifier.class) +public class SnmpNotifierUpgradeService extends LegacyNotifierUpgradeService { private static final String notifierName = "snmp-notifier"; @@ -74,7 +76,11 @@ public void postConstruct() { upgradeRequestTracingService(config, notifierName, SnmpNotifier.class); upgradeMonitoringService(config, notifierName, SnmpNotifier.class); upgradeHealthCheckService(config, notifierName, SnmpNotifier.class); - upgradeAdminAuditService(config, notifierName, SnmpNotifier.class); } } + + @Override + public String getNewNotifierName() { + return notifierName; + } } diff --git a/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/pom.xml index da03ffd..38b2d35 100644 --- a/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/xmpp/XmppNotifierUpgradeService.java b/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/xmpp/XmppNotifierUpgradeService.java index 91f00b9..b593f7a 100644 --- a/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/xmpp/XmppNotifierUpgradeService.java +++ b/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/xmpp/XmppNotifierUpgradeService.java @@ -41,7 +41,8 @@ package fish.payara.extensions.notifiers.compat.xmpp; import com.sun.enterprise.config.serverbeans.Config; -import fish.payara.extensions.notifiers.compat.BaseNotifierUpgradeService; +import fish.payara.extensions.notifiers.compat.LegacyNotifierUpgradeService; +import fish.payara.extensions.notifiers.compat.UpgradesNotifier; import fish.payara.internal.notification.admin.NotificationServiceConfiguration; import org.glassfish.api.StartupRunLevel; import org.glassfish.hk2.runlevel.RunLevel; @@ -54,7 +55,8 @@ */ @Service @RunLevel(StartupRunLevel.VAL) -public class XmppNotifierUpgradeService extends BaseNotifierUpgradeService { +@UpgradesNotifier(XmppNotifier.class) +public class XmppNotifierUpgradeService extends LegacyNotifierUpgradeService { private static final String notifierName = "xmpp-notifier"; @@ -74,7 +76,11 @@ public void postConstruct() { upgradeRequestTracingService(config, notifierName, XmppNotifier.class); upgradeMonitoringService(config, notifierName, XmppNotifier.class); upgradeHealthCheckService(config, notifierName, XmppNotifier.class); - upgradeAdminAuditService(config, notifierName, XmppNotifier.class); } } + + @Override + public String getNewNotifierName() { + return notifierName; + } } diff --git a/example-notifier-console-plugin/pom.xml b/example-notifier-console-plugin/pom.xml index c7a0ce5..a1c1df6 100644 --- a/example-notifier-console-plugin/pom.xml +++ b/example-notifier-console-plugin/pom.xml @@ -44,7 +44,7 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT example-notifier-console-plugin diff --git a/example-notifier-core/pom.xml b/example-notifier-core/pom.xml index 90ccad3..47017b2 100644 --- a/example-notifier-core/pom.xml +++ b/example-notifier-core/pom.xml @@ -44,7 +44,7 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT example-notifier-core diff --git a/newrelic-notifier-console-plugin-l10n/pom.xml b/newrelic-notifier-console-plugin-l10n/pom.xml index 0e1c68c..2552cc7 100644 --- a/newrelic-notifier-console-plugin-l10n/pom.xml +++ b/newrelic-notifier-console-plugin-l10n/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT newrelic-notifier-console-plugin-l10n - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT glassfish-jar New Relic Notifier Console L10n Plugin diff --git a/newrelic-notifier-console-plugin/pom.xml b/newrelic-notifier-console-plugin/pom.xml index 9451e6f..cff4fcc 100644 --- a/newrelic-notifier-console-plugin/pom.xml +++ b/newrelic-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT newrelic-notifier-console-plugin - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT glassfish-jar New Relic Notifier Console Plugin diff --git a/newrelic-notifier-core/pom.xml b/newrelic-notifier-core/pom.xml index b94e618..88529fb 100644 --- a/newrelic-notifier-core/pom.xml +++ b/newrelic-notifier-core/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT newrelic-notifier-core - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT glassfish-jar New Relic Notifier Implementation diff --git a/pom.xml b/pom.xml index 32b56c1..f2779e5 100644 --- a/pom.xml +++ b/pom.xml @@ -43,13 +43,13 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT pom Payara Notifiers Parent - 5.26.0 + 5.27.0-SNAPSHOT 1.8 1.8 diff --git a/slack-notifier-console-plugin-l10n/pom.xml b/slack-notifier-console-plugin-l10n/pom.xml index 5758659..89a8c09 100644 --- a/slack-notifier-console-plugin-l10n/pom.xml +++ b/slack-notifier-console-plugin-l10n/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT slack-notifier-console-plugin-l10n - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT glassfish-jar Slack Notifier Console L10n Plugin diff --git a/slack-notifier-console-plugin/pom.xml b/slack-notifier-console-plugin/pom.xml index 168bccd..35abe90 100644 --- a/slack-notifier-console-plugin/pom.xml +++ b/slack-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT slack-notifier-console-plugin - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT glassfish-jar Slack Notifier Console Plugin diff --git a/slack-notifier-core/pom.xml b/slack-notifier-core/pom.xml index d7142b5..6c18001 100644 --- a/slack-notifier-core/pom.xml +++ b/slack-notifier-core/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT slack-notifier-core - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT glassfish-jar Slack Notifier Implementation diff --git a/snmp-notifier-console-plugin-l10n/pom.xml b/snmp-notifier-console-plugin-l10n/pom.xml index 0bd58ac..b8c5f45 100644 --- a/snmp-notifier-console-plugin-l10n/pom.xml +++ b/snmp-notifier-console-plugin-l10n/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT snmp-notifier-console-plugin-l10n - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT glassfish-jar SNMP Notifier Console L10n Plugin diff --git a/snmp-notifier-console-plugin/pom.xml b/snmp-notifier-console-plugin/pom.xml index e64f527..2bf677e 100644 --- a/snmp-notifier-console-plugin/pom.xml +++ b/snmp-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT snmp-notifier-console-plugin - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT glassfish-jar SNMP Notifier Console Plugin diff --git a/snmp-notifier-core/pom.xml b/snmp-notifier-core/pom.xml index 8f4f386..0c956e1 100644 --- a/snmp-notifier-core/pom.xml +++ b/snmp-notifier-core/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT snmp-notifier-core - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT glassfish-jar SNMP Notifier Implementation diff --git a/teams-notifier-console-plugin/pom.xml b/teams-notifier-console-plugin/pom.xml index 2c0cabd..006b8eb 100644 --- a/teams-notifier-console-plugin/pom.xml +++ b/teams-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT teams-notifier-console-plugin - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT glassfish-jar Microsoft Teams Notifier Console Plugin diff --git a/teams-notifier-core/pom.xml b/teams-notifier-core/pom.xml index 18ebb57..1754d72 100644 --- a/teams-notifier-core/pom.xml +++ b/teams-notifier-core/pom.xml @@ -44,12 +44,12 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT teams-notifier-core glassfish-jar - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT Microsoft Teams Notifier Implementation diff --git a/xmpp-notifier-console-plugin-l10n/pom.xml b/xmpp-notifier-console-plugin-l10n/pom.xml index e076994..aeb7936 100644 --- a/xmpp-notifier-console-plugin-l10n/pom.xml +++ b/xmpp-notifier-console-plugin-l10n/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT xmpp-notifier-console-plugin-l10n - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT glassfish-jar XMPP Notifier Console L10n Plugin diff --git a/xmpp-notifier-console-plugin/pom.xml b/xmpp-notifier-console-plugin/pom.xml index 022bb3f..cb8c8fb 100644 --- a/xmpp-notifier-console-plugin/pom.xml +++ b/xmpp-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT xmpp-notifier-console-plugin - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT glassfish-jar XMPP Notifier Console Plugin diff --git a/xmpp-notifier-core/pom.xml b/xmpp-notifier-core/pom.xml index 2c4727f..552a722 100644 --- a/xmpp-notifier-core/pom.xml +++ b/xmpp-notifier-core/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT xmpp-notifier-core - 1.1-enterprise-SNAPSHOT + 1.0.1-enterprise-SNAPSHOT glassfish-jar XMPP Notifier Implementation From 2ee41e72dca126640ac4fed442a598f00f40739e Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 8 Mar 2021 10:14:27 +0000 Subject: [PATCH 2/8] Don't use SNAPSHOT Signed-off-by: Andrew Pielage --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f2779e5..371bf06 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ Payara Notifiers Parent - 5.27.0-SNAPSHOT + 5.27.0 1.8 1.8 From 55cda2c772c95bd330e7f3449c33782a48a8fd26 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 11 Mar 2021 16:10:26 +0000 Subject: [PATCH 3/8] FISH-1181 FISH-1182 Fix conflicting param names Signed-off-by: Andrew Pielage --- .../notifiers/compat/snmp/SnmpNotificationConfigurer.java | 2 +- .../notifiers/compat/xmpp/XmppNotificationConfigurer.java | 2 +- .../src/main/resources/snmp/SNMPNotifierConfiguration.jsf | 2 +- .../notifiers/snmp/GetSnmpNotifierConfigurationCommand.java | 2 +- .../notifiers/snmp/SetSnmpNotifierConfigurationCommand.java | 2 +- .../src/main/resources/xmpp/xmppNotifierConfiguration.jsf | 2 +- .../notifier/xmpp/GetXmppNotifierConfigurationCommand.java | 2 +- .../notifier/xmpp/SetXmppNotifierConfigurationCommand.java | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/snmp/SnmpNotificationConfigurer.java b/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/snmp/SnmpNotificationConfigurer.java index ebe5fc0..208f94c 100644 --- a/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/snmp/SnmpNotificationConfigurer.java +++ b/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/snmp/SnmpNotificationConfigurer.java @@ -93,7 +93,7 @@ public class SnmpNotificationConfigurer extends BaseSetNotifierConfigurationComm @Param(name = "hostName") private String hostName; - @Param(name = "port", defaultValue = "162", optional = true) + @Param(name = "snmpPort", defaultValue = "162", optional = true, alias = "snmpport") private Integer port; @Override diff --git a/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/xmpp/XmppNotificationConfigurer.java b/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/xmpp/XmppNotificationConfigurer.java index 66fa9e9..751a5d4 100644 --- a/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/xmpp/XmppNotificationConfigurer.java +++ b/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/xmpp/XmppNotificationConfigurer.java @@ -84,7 +84,7 @@ public class XmppNotificationConfigurer extends BaseSetNotifierConfigurationComm @Param(name = "hostName") private String hostName; - @Param(name = "port", defaultValue = "5222", optional = true) + @Param(name = "xmppPort", defaultValue = "5222", optional = true, alias = "xmppport") private Integer port; @Param(name = "serviceName") diff --git a/snmp-notifier-console-plugin/src/main/resources/snmp/SNMPNotifierConfiguration.jsf b/snmp-notifier-console-plugin/src/main/resources/snmp/SNMPNotifierConfiguration.jsf index 4f45da3..3a8e2f2 100644 --- a/snmp-notifier-console-plugin/src/main/resources/snmp/SNMPNotifierConfiguration.jsf +++ b/snmp-notifier-console-plugin/src/main/resources/snmp/SNMPNotifierConfiguration.jsf @@ -143,7 +143,7 @@ holder. label="$resource{i18nsnn.notifier.snmp.configuration.portLabel}" helpText="$resource{i18nsnn.notifier.snmp.configuration.portLabelHelpText}"> + text="#{pageSession.valueMap['snmpPort']}" /> diff --git a/snmp-notifier-core/src/main/java/fish/payara/extensions/notifiers/snmp/GetSnmpNotifierConfigurationCommand.java b/snmp-notifier-core/src/main/java/fish/payara/extensions/notifiers/snmp/GetSnmpNotifierConfigurationCommand.java index f8fe16c..9c0749e 100644 --- a/snmp-notifier-core/src/main/java/fish/payara/extensions/notifiers/snmp/GetSnmpNotifierConfigurationCommand.java +++ b/snmp-notifier-core/src/main/java/fish/payara/extensions/notifiers/snmp/GetSnmpNotifierConfigurationCommand.java @@ -79,7 +79,7 @@ protected Map getNotifierConfiguration(SnmpNotifierConfiguration map.put("OID", configuration.getOid()); map.put("Version", configuration.getVersion()); map.put("Host Name", configuration.getHost()); - map.put("Port", configuration.getPort()); + map.put("SNMP Port", configuration.getPort()); } return map; diff --git a/snmp-notifier-core/src/main/java/fish/payara/extensions/notifiers/snmp/SetSnmpNotifierConfigurationCommand.java b/snmp-notifier-core/src/main/java/fish/payara/extensions/notifiers/snmp/SetSnmpNotifierConfigurationCommand.java index fa3f3ae..fadecd3 100644 --- a/snmp-notifier-core/src/main/java/fish/payara/extensions/notifiers/snmp/SetSnmpNotifierConfigurationCommand.java +++ b/snmp-notifier-core/src/main/java/fish/payara/extensions/notifiers/snmp/SetSnmpNotifierConfigurationCommand.java @@ -83,7 +83,7 @@ public class SetSnmpNotifierConfigurationCommand extends BaseSetNotifierConfigur @Param(name = "hostName") private String hostName; - @Param(name = "port", defaultValue = "162", optional = true) + @Param(name = "snmpPort", defaultValue = "162", optional = true, alias = "snmpport") private Integer port; @Override diff --git a/xmpp-notifier-console-plugin/src/main/resources/xmpp/xmppNotifierConfiguration.jsf b/xmpp-notifier-console-plugin/src/main/resources/xmpp/xmppNotifierConfiguration.jsf index 06bd556..bf459fe 100644 --- a/xmpp-notifier-console-plugin/src/main/resources/xmpp/xmppNotifierConfiguration.jsf +++ b/xmpp-notifier-console-plugin/src/main/resources/xmpp/xmppNotifierConfiguration.jsf @@ -132,7 +132,7 @@ holder. label="$resource{i18nxn.notifier.xmpp.configuration.portLabel}" helpText="$resource{i18nxn.notifier.xmpp.configuration.portLabelHelpText}"> + text="#{pageSession.valueMap['xmppPort']}" /> getNotifierConfiguration(XmppNotifierConfiguration if (configuration != null) { map.put("Host Name", configuration.getHost()); - map.put("Port", configuration.getPort()); + map.put("XMPP Port", configuration.getPort()); map.put("Service Name", configuration.getServiceName()); map.put("Username", configuration.getUsername()); map.put("Password", configuration.getPassword()); diff --git a/xmpp-notifier-core/src/main/java/fish/payara/extensions/notifier/xmpp/SetXmppNotifierConfigurationCommand.java b/xmpp-notifier-core/src/main/java/fish/payara/extensions/notifier/xmpp/SetXmppNotifierConfigurationCommand.java index d716eb2..4ae8c94 100644 --- a/xmpp-notifier-core/src/main/java/fish/payara/extensions/notifier/xmpp/SetXmppNotifierConfigurationCommand.java +++ b/xmpp-notifier-core/src/main/java/fish/payara/extensions/notifier/xmpp/SetXmppNotifierConfigurationCommand.java @@ -74,7 +74,7 @@ public class SetXmppNotifierConfigurationCommand extends BaseSetNotifierConfigur @Param(name = "hostName") private String hostName; - @Param(name = "port", defaultValue = "5222", optional = true) + @Param(name = "xmppPort", defaultValue = "5222", optional = true, alias = "xmppport") private Integer port; @Param(name = "serviceName") From 03e49c0abcda44a220cf9b10d8ad446b4de79cb1 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Thu, 11 Mar 2021 16:39:06 +0000 Subject: [PATCH 4/8] FISH-1182 FISH-1181 Fix param passing Signed-off-by: Andrew Pielage --- .../notifiers/compat/snmp/SnmpNotificationConfigurer.java | 2 +- .../notifiers/compat/xmpp/XmppNotificationConfigurer.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/snmp/SnmpNotificationConfigurer.java b/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/snmp/SnmpNotificationConfigurer.java index 208f94c..bf5cb50 100644 --- a/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/snmp/SnmpNotificationConfigurer.java +++ b/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/snmp/SnmpNotificationConfigurer.java @@ -137,7 +137,7 @@ protected void configureNotifier(AdminCommandContext context, String commandName } if (port != null) { - parameterMap.insert("port", port.toString()); + parameterMap.insert("snmpPort", port.toString()); } try { diff --git a/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/xmpp/XmppNotificationConfigurer.java b/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/xmpp/XmppNotificationConfigurer.java index 751a5d4..ae83aa6 100644 --- a/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/xmpp/XmppNotificationConfigurer.java +++ b/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/src/main/java/fish/payara/extensions/notifiers/compat/xmpp/XmppNotificationConfigurer.java @@ -132,7 +132,7 @@ protected void configureNotifier(AdminCommandContext context, String commandName } if (port != null) { - parameterMap.insert("port", port.toString()); + parameterMap.insert("xmppPort", port.toString()); } if (StringUtils.ok(serviceName)) { From 38f173f7f7d6131a6b8f10bcc84cced0a099c160 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 12 Mar 2021 10:23:14 +0000 Subject: [PATCH 5/8] Use Payara snapshot Signed-off-by: Andrew Pielage --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 371bf06..f2779e5 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,7 @@ Payara Notifiers Parent - 5.27.0 + 5.27.0-SNAPSHOT 1.8 1.8 From 64c535490f47c6354328d5b4b04e656a603ac2aa Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Fri, 12 Mar 2021 10:28:54 +0000 Subject: [PATCH 6/8] Add snapshot repo Signed-off-by: Andrew Pielage --- pom.xml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f2779e5..7978893 100644 --- a/pom.xml +++ b/pom.xml @@ -318,6 +318,17 @@ false + + payara-nexus-enterprise-snapshots + Payara Enterprise Snapshots + https://nexus.payara.fish/repository/payara-enterprise-snapshots-private + + false + + + true + + @@ -347,8 +358,8 @@ https://nexus.payara.fish/repository/payara-enterprise-artifacts-private/ - payara-nexus-snapshots - https://nexus.payara.fish/repository/payara-snapshots/ + payara-nexus-enterprise-snapshots + https://nexus.payara.fish/repository/payara-enterprise-snapshots-private/ From 529f1a1afd72a7a49a32e11f0dbdfb24a0e42365 Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 8 Mar 2021 10:15:26 +0000 Subject: [PATCH 7/8] FISH-468 Final version for tag Signed-off-by: Andrew Pielage --- datadog-notifier-console-plugin-l10n/pom.xml | 4 ++-- datadog-notifier-console-plugin/pom.xml | 4 ++-- datadog-notifier-core/pom.xml | 4 ++-- discord-notifier-console-plugin/pom.xml | 4 ++-- discord-notifier-core/pom.xml | 4 ++-- email-notifier-console-plugin-l10n/pom.xml | 4 ++-- email-notifier-console-plugin/pom.xml | 4 ++-- email-notifier-core/pom.xml | 4 ++-- .../admin-audit-notifiers-backwards-compatibility/pom.xml | 4 ++-- .../cdi-eventbus-notifier-backwards-compatibility/pom.xml | 2 +- .../datadog-notifier-backwards-compatibility/pom.xml | 2 +- .../email-notifier-backwards-compatibility/pom.xml | 2 +- .../eventbus-notifier-backwards-compatibility/pom.xml | 2 +- .../jms-notifier-backwards-compatibility/pom.xml | 2 +- .../log-notifier-backwards-compatibility/pom.xml | 2 +- .../newrelic-notifier-backwards-compatibility/pom.xml | 2 +- .../notifier-backwards-compatibility-config/pom.xml | 2 +- .../notifier-backwards-compatibility-core/pom.xml | 2 +- enterprise-backwards-compatibility/pom.xml | 2 +- .../slack-notifier-backwards-compatibility/pom.xml | 2 +- .../snmp-notifier-backwards-compatibility/pom.xml | 2 +- .../xmpp-notifier-backwards-compatibility/pom.xml | 2 +- example-notifier-console-plugin/pom.xml | 2 +- example-notifier-core/pom.xml | 2 +- newrelic-notifier-console-plugin-l10n/pom.xml | 4 ++-- newrelic-notifier-console-plugin/pom.xml | 4 ++-- newrelic-notifier-core/pom.xml | 4 ++-- pom.xml | 2 +- slack-notifier-console-plugin-l10n/pom.xml | 4 ++-- slack-notifier-console-plugin/pom.xml | 4 ++-- slack-notifier-core/pom.xml | 4 ++-- snmp-notifier-console-plugin-l10n/pom.xml | 4 ++-- snmp-notifier-console-plugin/pom.xml | 4 ++-- snmp-notifier-core/pom.xml | 4 ++-- teams-notifier-console-plugin/pom.xml | 4 ++-- teams-notifier-core/pom.xml | 4 ++-- xmpp-notifier-console-plugin-l10n/pom.xml | 4 ++-- xmpp-notifier-console-plugin/pom.xml | 4 ++-- xmpp-notifier-core/pom.xml | 4 ++-- 39 files changed, 62 insertions(+), 62 deletions(-) diff --git a/datadog-notifier-console-plugin-l10n/pom.xml b/datadog-notifier-console-plugin-l10n/pom.xml index b893656..0adc4c1 100644 --- a/datadog-notifier-console-plugin-l10n/pom.xml +++ b/datadog-notifier-console-plugin-l10n/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise datadog-notifier-console-plugin-l10n - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise glassfish-jar Datadog Notifier Console L10n Plugin diff --git a/datadog-notifier-console-plugin/pom.xml b/datadog-notifier-console-plugin/pom.xml index a3e95ae..381e70d 100644 --- a/datadog-notifier-console-plugin/pom.xml +++ b/datadog-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise datadog-notifier-console-plugin - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise glassfish-jar Datadog Notifier Console Plugin diff --git a/datadog-notifier-core/pom.xml b/datadog-notifier-core/pom.xml index d39e358..6e6de2a 100644 --- a/datadog-notifier-core/pom.xml +++ b/datadog-notifier-core/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise datadog-notifier-core - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise glassfish-jar Datadog Notifier Implementation diff --git a/discord-notifier-console-plugin/pom.xml b/discord-notifier-console-plugin/pom.xml index e1aae12..d11c6ae 100644 --- a/discord-notifier-console-plugin/pom.xml +++ b/discord-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise discord-notifier-console-plugin - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise glassfish-jar Discord Notifier Console Plugin diff --git a/discord-notifier-core/pom.xml b/discord-notifier-core/pom.xml index 6778bf1..67dd33b 100644 --- a/discord-notifier-core/pom.xml +++ b/discord-notifier-core/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise discord-notifier-core - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise glassfish-jar Discord Notifier Implementation diff --git a/email-notifier-console-plugin-l10n/pom.xml b/email-notifier-console-plugin-l10n/pom.xml index bcbf8ac..8ae3f25 100644 --- a/email-notifier-console-plugin-l10n/pom.xml +++ b/email-notifier-console-plugin-l10n/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise email-notifier-console-plugin-l10n - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise glassfish-jar Email Notifier Console L10n Plugin diff --git a/email-notifier-console-plugin/pom.xml b/email-notifier-console-plugin/pom.xml index 416daf6..0327b5b 100644 --- a/email-notifier-console-plugin/pom.xml +++ b/email-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise email-notifier-console-plugin - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise glassfish-jar Email Notifier Console Plugin diff --git a/email-notifier-core/pom.xml b/email-notifier-core/pom.xml index 241127b..21702eb 100644 --- a/email-notifier-core/pom.xml +++ b/email-notifier-core/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise email-notifier-core - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise glassfish-jar Email Notifier Implementation diff --git a/enterprise-backwards-compatibility/admin-audit-notifiers-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/admin-audit-notifiers-backwards-compatibility/pom.xml index f6f22f4..94452be 100644 --- a/enterprise-backwards-compatibility/admin-audit-notifiers-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/admin-audit-notifiers-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ fish.payara.extensions.notifiers enterprise-backwards-compatibility - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise 4.0.0 @@ -62,7 +62,7 @@ fish.payara.extensions.notifiers email-notifier-backwards-compatibility - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise compile diff --git a/enterprise-backwards-compatibility/cdi-eventbus-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/cdi-eventbus-notifier-backwards-compatibility/pom.xml index 8e00d90..01f82e9 100644 --- a/enterprise-backwards-compatibility/cdi-eventbus-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/cdi-eventbus-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise 4.0.0 diff --git a/enterprise-backwards-compatibility/datadog-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/datadog-notifier-backwards-compatibility/pom.xml index a593003..9ceb1fa 100644 --- a/enterprise-backwards-compatibility/datadog-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/datadog-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ fish.payara.extensions.notifiers enterprise-backwards-compatibility - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise 4.0.0 diff --git a/enterprise-backwards-compatibility/email-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/email-notifier-backwards-compatibility/pom.xml index 04432b8..c0a9e06 100644 --- a/enterprise-backwards-compatibility/email-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/email-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ fish.payara.extensions.notifiers enterprise-backwards-compatibility - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise 4.0.0 diff --git a/enterprise-backwards-compatibility/eventbus-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/eventbus-notifier-backwards-compatibility/pom.xml index 55dbd1d..577fc5e 100644 --- a/enterprise-backwards-compatibility/eventbus-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/eventbus-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise 4.0.0 diff --git a/enterprise-backwards-compatibility/jms-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/jms-notifier-backwards-compatibility/pom.xml index e6f42b8..f04b8ec 100644 --- a/enterprise-backwards-compatibility/jms-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/jms-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise 4.0.0 diff --git a/enterprise-backwards-compatibility/log-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/log-notifier-backwards-compatibility/pom.xml index a78d14d..b5a69a0 100644 --- a/enterprise-backwards-compatibility/log-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/log-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise 4.0.0 diff --git a/enterprise-backwards-compatibility/newrelic-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/newrelic-notifier-backwards-compatibility/pom.xml index 18dee6c..b997361 100644 --- a/enterprise-backwards-compatibility/newrelic-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/newrelic-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ fish.payara.extensions.notifiers enterprise-backwards-compatibility - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise 4.0.0 diff --git a/enterprise-backwards-compatibility/notifier-backwards-compatibility-config/pom.xml b/enterprise-backwards-compatibility/notifier-backwards-compatibility-config/pom.xml index f9d4cf5..ba76c1a 100644 --- a/enterprise-backwards-compatibility/notifier-backwards-compatibility-config/pom.xml +++ b/enterprise-backwards-compatibility/notifier-backwards-compatibility-config/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise 4.0.0 diff --git a/enterprise-backwards-compatibility/notifier-backwards-compatibility-core/pom.xml b/enterprise-backwards-compatibility/notifier-backwards-compatibility-core/pom.xml index 24d106e..dc8fc66 100644 --- a/enterprise-backwards-compatibility/notifier-backwards-compatibility-core/pom.xml +++ b/enterprise-backwards-compatibility/notifier-backwards-compatibility-core/pom.xml @@ -5,7 +5,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise 4.0.0 diff --git a/enterprise-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/pom.xml index f4e9105..e0f6626 100644 --- a/enterprise-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ notifiers-parent fish.payara.extensions.notifiers - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise 4.0.0 diff --git a/enterprise-backwards-compatibility/slack-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/slack-notifier-backwards-compatibility/pom.xml index 540a081..75702cb 100644 --- a/enterprise-backwards-compatibility/slack-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/slack-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise 4.0.0 diff --git a/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/pom.xml index c9fc632..d1d2363 100644 --- a/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise 4.0.0 diff --git a/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/pom.xml index 38b2d35..0a618ff 100644 --- a/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise 4.0.0 diff --git a/example-notifier-console-plugin/pom.xml b/example-notifier-console-plugin/pom.xml index a1c1df6..1006f2d 100644 --- a/example-notifier-console-plugin/pom.xml +++ b/example-notifier-console-plugin/pom.xml @@ -44,7 +44,7 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise example-notifier-console-plugin diff --git a/example-notifier-core/pom.xml b/example-notifier-core/pom.xml index 47017b2..6d500cc 100644 --- a/example-notifier-core/pom.xml +++ b/example-notifier-core/pom.xml @@ -44,7 +44,7 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise example-notifier-core diff --git a/newrelic-notifier-console-plugin-l10n/pom.xml b/newrelic-notifier-console-plugin-l10n/pom.xml index 2552cc7..0151ea0 100644 --- a/newrelic-notifier-console-plugin-l10n/pom.xml +++ b/newrelic-notifier-console-plugin-l10n/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise newrelic-notifier-console-plugin-l10n - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise glassfish-jar New Relic Notifier Console L10n Plugin diff --git a/newrelic-notifier-console-plugin/pom.xml b/newrelic-notifier-console-plugin/pom.xml index cff4fcc..9a88754 100644 --- a/newrelic-notifier-console-plugin/pom.xml +++ b/newrelic-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise newrelic-notifier-console-plugin - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise glassfish-jar New Relic Notifier Console Plugin diff --git a/newrelic-notifier-core/pom.xml b/newrelic-notifier-core/pom.xml index 88529fb..8417d19 100644 --- a/newrelic-notifier-core/pom.xml +++ b/newrelic-notifier-core/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise newrelic-notifier-core - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise glassfish-jar New Relic Notifier Implementation diff --git a/pom.xml b/pom.xml index 7978893..9911482 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise pom Payara Notifiers Parent diff --git a/slack-notifier-console-plugin-l10n/pom.xml b/slack-notifier-console-plugin-l10n/pom.xml index 89a8c09..c51aeaa 100644 --- a/slack-notifier-console-plugin-l10n/pom.xml +++ b/slack-notifier-console-plugin-l10n/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise slack-notifier-console-plugin-l10n - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise glassfish-jar Slack Notifier Console L10n Plugin diff --git a/slack-notifier-console-plugin/pom.xml b/slack-notifier-console-plugin/pom.xml index 35abe90..45379f5 100644 --- a/slack-notifier-console-plugin/pom.xml +++ b/slack-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise slack-notifier-console-plugin - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise glassfish-jar Slack Notifier Console Plugin diff --git a/slack-notifier-core/pom.xml b/slack-notifier-core/pom.xml index 6c18001..4aa0653 100644 --- a/slack-notifier-core/pom.xml +++ b/slack-notifier-core/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise slack-notifier-core - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise glassfish-jar Slack Notifier Implementation diff --git a/snmp-notifier-console-plugin-l10n/pom.xml b/snmp-notifier-console-plugin-l10n/pom.xml index b8c5f45..e3c7db7 100644 --- a/snmp-notifier-console-plugin-l10n/pom.xml +++ b/snmp-notifier-console-plugin-l10n/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise snmp-notifier-console-plugin-l10n - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise glassfish-jar SNMP Notifier Console L10n Plugin diff --git a/snmp-notifier-console-plugin/pom.xml b/snmp-notifier-console-plugin/pom.xml index 2bf677e..4874a9d 100644 --- a/snmp-notifier-console-plugin/pom.xml +++ b/snmp-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise snmp-notifier-console-plugin - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise glassfish-jar SNMP Notifier Console Plugin diff --git a/snmp-notifier-core/pom.xml b/snmp-notifier-core/pom.xml index 0c956e1..4de70a7 100644 --- a/snmp-notifier-core/pom.xml +++ b/snmp-notifier-core/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise snmp-notifier-core - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise glassfish-jar SNMP Notifier Implementation diff --git a/teams-notifier-console-plugin/pom.xml b/teams-notifier-console-plugin/pom.xml index 006b8eb..86847fc 100644 --- a/teams-notifier-console-plugin/pom.xml +++ b/teams-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise teams-notifier-console-plugin - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise glassfish-jar Microsoft Teams Notifier Console Plugin diff --git a/teams-notifier-core/pom.xml b/teams-notifier-core/pom.xml index 1754d72..198602d 100644 --- a/teams-notifier-core/pom.xml +++ b/teams-notifier-core/pom.xml @@ -44,12 +44,12 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise teams-notifier-core glassfish-jar - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise Microsoft Teams Notifier Implementation diff --git a/xmpp-notifier-console-plugin-l10n/pom.xml b/xmpp-notifier-console-plugin-l10n/pom.xml index aeb7936..7d8861f 100644 --- a/xmpp-notifier-console-plugin-l10n/pom.xml +++ b/xmpp-notifier-console-plugin-l10n/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise xmpp-notifier-console-plugin-l10n - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise glassfish-jar XMPP Notifier Console L10n Plugin diff --git a/xmpp-notifier-console-plugin/pom.xml b/xmpp-notifier-console-plugin/pom.xml index cb8c8fb..b41de6f 100644 --- a/xmpp-notifier-console-plugin/pom.xml +++ b/xmpp-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise xmpp-notifier-console-plugin - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise glassfish-jar XMPP Notifier Console Plugin diff --git a/xmpp-notifier-core/pom.xml b/xmpp-notifier-core/pom.xml index 552a722..1bc732b 100644 --- a/xmpp-notifier-core/pom.xml +++ b/xmpp-notifier-core/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise xmpp-notifier-core - 1.0.1-enterprise-SNAPSHOT + 1.0.1-enterprise glassfish-jar XMPP Notifier Implementation From 51aaedc8ed2530c97d9fb7d9c1a3cf8a0b8972de Mon Sep 17 00:00:00 2001 From: Andrew Pielage Date: Mon, 8 Mar 2021 10:16:12 +0000 Subject: [PATCH 8/8] Next dev version Signed-off-by: Andrew Pielage --- datadog-notifier-console-plugin-l10n/pom.xml | 4 ++-- datadog-notifier-console-plugin/pom.xml | 4 ++-- datadog-notifier-core/pom.xml | 4 ++-- discord-notifier-console-plugin/pom.xml | 4 ++-- discord-notifier-core/pom.xml | 4 ++-- email-notifier-console-plugin-l10n/pom.xml | 4 ++-- email-notifier-console-plugin/pom.xml | 4 ++-- email-notifier-core/pom.xml | 4 ++-- .../admin-audit-notifiers-backwards-compatibility/pom.xml | 4 ++-- .../cdi-eventbus-notifier-backwards-compatibility/pom.xml | 2 +- .../datadog-notifier-backwards-compatibility/pom.xml | 2 +- .../email-notifier-backwards-compatibility/pom.xml | 2 +- .../eventbus-notifier-backwards-compatibility/pom.xml | 2 +- .../jms-notifier-backwards-compatibility/pom.xml | 2 +- .../log-notifier-backwards-compatibility/pom.xml | 2 +- .../newrelic-notifier-backwards-compatibility/pom.xml | 2 +- .../notifier-backwards-compatibility-config/pom.xml | 2 +- .../notifier-backwards-compatibility-core/pom.xml | 2 +- enterprise-backwards-compatibility/pom.xml | 2 +- .../slack-notifier-backwards-compatibility/pom.xml | 2 +- .../snmp-notifier-backwards-compatibility/pom.xml | 2 +- .../xmpp-notifier-backwards-compatibility/pom.xml | 2 +- example-notifier-console-plugin/pom.xml | 2 +- example-notifier-core/pom.xml | 2 +- newrelic-notifier-console-plugin-l10n/pom.xml | 4 ++-- newrelic-notifier-console-plugin/pom.xml | 4 ++-- newrelic-notifier-core/pom.xml | 4 ++-- pom.xml | 2 +- slack-notifier-console-plugin-l10n/pom.xml | 4 ++-- slack-notifier-console-plugin/pom.xml | 4 ++-- slack-notifier-core/pom.xml | 4 ++-- snmp-notifier-console-plugin-l10n/pom.xml | 4 ++-- snmp-notifier-console-plugin/pom.xml | 4 ++-- snmp-notifier-core/pom.xml | 4 ++-- teams-notifier-console-plugin/pom.xml | 4 ++-- teams-notifier-core/pom.xml | 4 ++-- xmpp-notifier-console-plugin-l10n/pom.xml | 4 ++-- xmpp-notifier-console-plugin/pom.xml | 4 ++-- xmpp-notifier-core/pom.xml | 4 ++-- 39 files changed, 62 insertions(+), 62 deletions(-) diff --git a/datadog-notifier-console-plugin-l10n/pom.xml b/datadog-notifier-console-plugin-l10n/pom.xml index 0adc4c1..e7c0939 100644 --- a/datadog-notifier-console-plugin-l10n/pom.xml +++ b/datadog-notifier-console-plugin-l10n/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT datadog-notifier-console-plugin-l10n - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT glassfish-jar Datadog Notifier Console L10n Plugin diff --git a/datadog-notifier-console-plugin/pom.xml b/datadog-notifier-console-plugin/pom.xml index 381e70d..03da9f1 100644 --- a/datadog-notifier-console-plugin/pom.xml +++ b/datadog-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT datadog-notifier-console-plugin - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT glassfish-jar Datadog Notifier Console Plugin diff --git a/datadog-notifier-core/pom.xml b/datadog-notifier-core/pom.xml index 6e6de2a..c0dbf04 100644 --- a/datadog-notifier-core/pom.xml +++ b/datadog-notifier-core/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT datadog-notifier-core - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT glassfish-jar Datadog Notifier Implementation diff --git a/discord-notifier-console-plugin/pom.xml b/discord-notifier-console-plugin/pom.xml index d11c6ae..af39598 100644 --- a/discord-notifier-console-plugin/pom.xml +++ b/discord-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT discord-notifier-console-plugin - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT glassfish-jar Discord Notifier Console Plugin diff --git a/discord-notifier-core/pom.xml b/discord-notifier-core/pom.xml index 67dd33b..ed96b4c 100644 --- a/discord-notifier-core/pom.xml +++ b/discord-notifier-core/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT discord-notifier-core - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT glassfish-jar Discord Notifier Implementation diff --git a/email-notifier-console-plugin-l10n/pom.xml b/email-notifier-console-plugin-l10n/pom.xml index 8ae3f25..22cf43f 100644 --- a/email-notifier-console-plugin-l10n/pom.xml +++ b/email-notifier-console-plugin-l10n/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT email-notifier-console-plugin-l10n - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT glassfish-jar Email Notifier Console L10n Plugin diff --git a/email-notifier-console-plugin/pom.xml b/email-notifier-console-plugin/pom.xml index 0327b5b..563366f 100644 --- a/email-notifier-console-plugin/pom.xml +++ b/email-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT email-notifier-console-plugin - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT glassfish-jar Email Notifier Console Plugin diff --git a/email-notifier-core/pom.xml b/email-notifier-core/pom.xml index 21702eb..f107e46 100644 --- a/email-notifier-core/pom.xml +++ b/email-notifier-core/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT email-notifier-core - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT glassfish-jar Email Notifier Implementation diff --git a/enterprise-backwards-compatibility/admin-audit-notifiers-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/admin-audit-notifiers-backwards-compatibility/pom.xml index 94452be..497e639 100644 --- a/enterprise-backwards-compatibility/admin-audit-notifiers-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/admin-audit-notifiers-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ fish.payara.extensions.notifiers enterprise-backwards-compatibility - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT 4.0.0 @@ -62,7 +62,7 @@ fish.payara.extensions.notifiers email-notifier-backwards-compatibility - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT compile diff --git a/enterprise-backwards-compatibility/cdi-eventbus-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/cdi-eventbus-notifier-backwards-compatibility/pom.xml index 01f82e9..1d1db78 100644 --- a/enterprise-backwards-compatibility/cdi-eventbus-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/cdi-eventbus-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/datadog-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/datadog-notifier-backwards-compatibility/pom.xml index 9ceb1fa..21a851b 100644 --- a/enterprise-backwards-compatibility/datadog-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/datadog-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ fish.payara.extensions.notifiers enterprise-backwards-compatibility - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/email-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/email-notifier-backwards-compatibility/pom.xml index c0a9e06..7987e14 100644 --- a/enterprise-backwards-compatibility/email-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/email-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ fish.payara.extensions.notifiers enterprise-backwards-compatibility - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/eventbus-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/eventbus-notifier-backwards-compatibility/pom.xml index 577fc5e..b1dbb3b 100644 --- a/enterprise-backwards-compatibility/eventbus-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/eventbus-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/jms-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/jms-notifier-backwards-compatibility/pom.xml index f04b8ec..79de9c5 100644 --- a/enterprise-backwards-compatibility/jms-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/jms-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/log-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/log-notifier-backwards-compatibility/pom.xml index b5a69a0..1fd7a1e 100644 --- a/enterprise-backwards-compatibility/log-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/log-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/newrelic-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/newrelic-notifier-backwards-compatibility/pom.xml index b997361..c3032ba 100644 --- a/enterprise-backwards-compatibility/newrelic-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/newrelic-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ fish.payara.extensions.notifiers enterprise-backwards-compatibility - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/notifier-backwards-compatibility-config/pom.xml b/enterprise-backwards-compatibility/notifier-backwards-compatibility-config/pom.xml index ba76c1a..9c3d249 100644 --- a/enterprise-backwards-compatibility/notifier-backwards-compatibility-config/pom.xml +++ b/enterprise-backwards-compatibility/notifier-backwards-compatibility-config/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/notifier-backwards-compatibility-core/pom.xml b/enterprise-backwards-compatibility/notifier-backwards-compatibility-core/pom.xml index dc8fc66..1db6c4e 100644 --- a/enterprise-backwards-compatibility/notifier-backwards-compatibility-core/pom.xml +++ b/enterprise-backwards-compatibility/notifier-backwards-compatibility-core/pom.xml @@ -5,7 +5,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/pom.xml index e0f6626..4d4e4a8 100644 --- a/enterprise-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ notifiers-parent fish.payara.extensions.notifiers - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/slack-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/slack-notifier-backwards-compatibility/pom.xml index 75702cb..9cd52c3 100644 --- a/enterprise-backwards-compatibility/slack-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/slack-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/pom.xml index d1d2363..35e1beb 100644 --- a/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/snmp-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT 4.0.0 diff --git a/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/pom.xml b/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/pom.xml index 0a618ff..da03ffd 100644 --- a/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/pom.xml +++ b/enterprise-backwards-compatibility/xmpp-notifier-backwards-compatibility/pom.xml @@ -44,7 +44,7 @@ enterprise-backwards-compatibility fish.payara.extensions.notifiers - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT 4.0.0 diff --git a/example-notifier-console-plugin/pom.xml b/example-notifier-console-plugin/pom.xml index 1006f2d..c7a0ce5 100644 --- a/example-notifier-console-plugin/pom.xml +++ b/example-notifier-console-plugin/pom.xml @@ -44,7 +44,7 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT example-notifier-console-plugin diff --git a/example-notifier-core/pom.xml b/example-notifier-core/pom.xml index 6d500cc..90ccad3 100644 --- a/example-notifier-core/pom.xml +++ b/example-notifier-core/pom.xml @@ -44,7 +44,7 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT example-notifier-core diff --git a/newrelic-notifier-console-plugin-l10n/pom.xml b/newrelic-notifier-console-plugin-l10n/pom.xml index 0151ea0..0e1c68c 100644 --- a/newrelic-notifier-console-plugin-l10n/pom.xml +++ b/newrelic-notifier-console-plugin-l10n/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT newrelic-notifier-console-plugin-l10n - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT glassfish-jar New Relic Notifier Console L10n Plugin diff --git a/newrelic-notifier-console-plugin/pom.xml b/newrelic-notifier-console-plugin/pom.xml index 9a88754..9451e6f 100644 --- a/newrelic-notifier-console-plugin/pom.xml +++ b/newrelic-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT newrelic-notifier-console-plugin - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT glassfish-jar New Relic Notifier Console Plugin diff --git a/newrelic-notifier-core/pom.xml b/newrelic-notifier-core/pom.xml index 8417d19..b94e618 100644 --- a/newrelic-notifier-core/pom.xml +++ b/newrelic-notifier-core/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT newrelic-notifier-core - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT glassfish-jar New Relic Notifier Implementation diff --git a/pom.xml b/pom.xml index 9911482..a2adf63 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT pom Payara Notifiers Parent diff --git a/slack-notifier-console-plugin-l10n/pom.xml b/slack-notifier-console-plugin-l10n/pom.xml index c51aeaa..5758659 100644 --- a/slack-notifier-console-plugin-l10n/pom.xml +++ b/slack-notifier-console-plugin-l10n/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT slack-notifier-console-plugin-l10n - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT glassfish-jar Slack Notifier Console L10n Plugin diff --git a/slack-notifier-console-plugin/pom.xml b/slack-notifier-console-plugin/pom.xml index 45379f5..168bccd 100644 --- a/slack-notifier-console-plugin/pom.xml +++ b/slack-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT slack-notifier-console-plugin - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT glassfish-jar Slack Notifier Console Plugin diff --git a/slack-notifier-core/pom.xml b/slack-notifier-core/pom.xml index 4aa0653..d7142b5 100644 --- a/slack-notifier-core/pom.xml +++ b/slack-notifier-core/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT slack-notifier-core - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT glassfish-jar Slack Notifier Implementation diff --git a/snmp-notifier-console-plugin-l10n/pom.xml b/snmp-notifier-console-plugin-l10n/pom.xml index e3c7db7..0bd58ac 100644 --- a/snmp-notifier-console-plugin-l10n/pom.xml +++ b/snmp-notifier-console-plugin-l10n/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT snmp-notifier-console-plugin-l10n - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT glassfish-jar SNMP Notifier Console L10n Plugin diff --git a/snmp-notifier-console-plugin/pom.xml b/snmp-notifier-console-plugin/pom.xml index 4874a9d..e64f527 100644 --- a/snmp-notifier-console-plugin/pom.xml +++ b/snmp-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT snmp-notifier-console-plugin - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT glassfish-jar SNMP Notifier Console Plugin diff --git a/snmp-notifier-core/pom.xml b/snmp-notifier-core/pom.xml index 4de70a7..8f4f386 100644 --- a/snmp-notifier-core/pom.xml +++ b/snmp-notifier-core/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT snmp-notifier-core - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT glassfish-jar SNMP Notifier Implementation diff --git a/teams-notifier-console-plugin/pom.xml b/teams-notifier-console-plugin/pom.xml index 86847fc..2c0cabd 100644 --- a/teams-notifier-console-plugin/pom.xml +++ b/teams-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT teams-notifier-console-plugin - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT glassfish-jar Microsoft Teams Notifier Console Plugin diff --git a/teams-notifier-core/pom.xml b/teams-notifier-core/pom.xml index 198602d..18ebb57 100644 --- a/teams-notifier-core/pom.xml +++ b/teams-notifier-core/pom.xml @@ -44,12 +44,12 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT teams-notifier-core glassfish-jar - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT Microsoft Teams Notifier Implementation diff --git a/xmpp-notifier-console-plugin-l10n/pom.xml b/xmpp-notifier-console-plugin-l10n/pom.xml index 7d8861f..e076994 100644 --- a/xmpp-notifier-console-plugin-l10n/pom.xml +++ b/xmpp-notifier-console-plugin-l10n/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT xmpp-notifier-console-plugin-l10n - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT glassfish-jar XMPP Notifier Console L10n Plugin diff --git a/xmpp-notifier-console-plugin/pom.xml b/xmpp-notifier-console-plugin/pom.xml index b41de6f..022bb3f 100644 --- a/xmpp-notifier-console-plugin/pom.xml +++ b/xmpp-notifier-console-plugin/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT xmpp-notifier-console-plugin - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT glassfish-jar XMPP Notifier Console Plugin diff --git a/xmpp-notifier-core/pom.xml b/xmpp-notifier-core/pom.xml index 1bc732b..2c4727f 100644 --- a/xmpp-notifier-core/pom.xml +++ b/xmpp-notifier-core/pom.xml @@ -44,11 +44,11 @@ fish.payara.extensions.notifiers notifiers-parent - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT xmpp-notifier-core - 1.0.1-enterprise + 1.1-enterprise-SNAPSHOT glassfish-jar XMPP Notifier Implementation