FISH-9777: Implement feedback.

payara · Nov 5, 2024 · 3b69917 · 3b69917
1 parent d046c87
commit 3b69917
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/...r/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_de.properties b/...r/admingui/full-l10n/src/main/resources/org/glassfish/full/admingui/Strings_de.properties
@@ -37,7 +37,7 @@
 # only if the new code is made subject to such option by the copyright
 # holder.
 #
-# Portions Copyright [2024] [Payara Foundation and/or affiliates]
+# Portions Copyright 2024 Payara Foundation and/or affiliates
 
 ## Java Mail Sessions
 javaMailSessions.pageTitle=JavaMail-Sessions

diff --git a/...r/admingui/reference-manual/src/main/help/en/help/reference/create-javamail-resource.html b/...r/admingui/reference-manual/src/main/help/en/help/reference/create-javamail-resource.html
@@ -17,7 +17,7 @@
     SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
 
 -->
-<!-- Portions Copyright [2019-2024] [Payara Foundation and/or its affiliates] -->
+<!-- Portions Copyright 2019-2024 [Payara Foundation and/or its affiliates] -->
 <html lang="en">
   <head>
     <meta charset="utf-8"/>

diff --git a/...nt/client/acc/src/main/java/org/glassfish/appclient/client/jws/boot/ClassPathManager.java b/...nt/client/acc/src/main/java/org/glassfish/appclient/client/jws/boot/ClassPathManager.java
@@ -209,7 +209,7 @@ public URL[] locateDownloadedJars() throws
                 "jakarta.ejb.EJB," /* jakarta ee */ +
                 "jakarta.security.auth.message.module.ServerAuthModule," /* jaspic-api */ +
                 "com.sun.appserv.management.ext.logging.LogAnalyzer," /* appserv-ext */ +
-                    "org.eclipse.angus.mail.iap.Argument," /* mail */ +
+                "org.eclipse.angus.mail.iap.Argument," /* mail */ +
                 "com.sun.activation.viewers.ImageViewer," /* activation */ +
                 "com.sun.xml.ws.api.server.WSEndpoint," /* webservices-rt */ +
                 "com.sun.tools.ws.wsdl.parser.W3CAddressingExtensionHandler," /* webservices-tools */ +

diff --git a/.../src/test/java/org/glassfish/resources/javamail/admin/cli/CreateJavaMailResourceTest.java b/.../src/test/java/org/glassfish/resources/javamail/admin/cli/CreateJavaMailResourceTest.java
@@ -232,9 +232,9 @@ public void testExecuteFailDuplicateResource() {
      * asadmin create-javamail-resource --mailuser=test --mailhost=localhost
      * --fromaddress=test@sun.com  --enabled=false --debug=true
      * --storeprotocol=pop
-     * --storeprotocolclass=org.eclipse.angus.mail.pop.POPStore
-     * --transprotocol=lmtp
-     * --transprotocolclass=org.eclipse.angus.mail.lmtop.LMTPTransport
+     * --storeprotocolclass=org.eclipse.angus.mail.pop.POP3Store
+     * --transprotocol=smtp
+     * --transprotocolclass=org.eclipse.angus.mail.smtp.SMTPTransport
      * mail/MyMailSession
      */
     @Test
@@ -245,9 +245,9 @@ public void testExecuteWithOptionalValuesSet() {
         parameters.set("enabled", "false");
         parameters.set("debug", "true");
         parameters.set("storeprotocol", "pop");
-        parameters.set("storeprotocolclass", "org.eclipse.angus.mail.pop.POPStore");
-        parameters.set("transprotocol", "lmtp");
-        parameters.set("transprotocolclass", "org.eclipse.angus.mail.lmtp.LMTPTransport");
+        parameters.set("storeprotocolclass", "org.eclipse.angus.mail.pop.POP3Store");
+        parameters.set("transprotocol", "smtp");
+        parameters.set("transprotocolclass", "org.eclipse.angus.mail.smtp.SMTPTransport");
         parameters.set("jndi_name", "mail/MyMailSession");
         org.glassfish.resources.javamail.admin.cli.CreateJavaMailResource command = habitat.getService(org.glassfish.resources.javamail.admin.cli.CreateJavaMailResource.class);
         assertTrue(command != null);
@@ -263,9 +263,9 @@ public void testExecuteWithOptionalValuesSet() {
                     assertEquals("true", r.getEnabled());
                     assertEquals("true", r.getDebug());
                     assertEquals("pop", r.getStoreProtocol());
-                    assertEquals("org.eclipse.angus.mail.pop.POPStore", r.getStoreProtocolClass());
-                    assertEquals("lmtp", r.getTransportProtocol());
-                    assertEquals("org.eclipse.angus.mail.lmtp.LMTPTransport", r.getTransportProtocolClass());
+                    assertEquals("org.eclipse.angus.mail.pop.POP3Store", r.getStoreProtocolClass());
+                    assertEquals("smtp", r.getTransportProtocol());
+                    assertEquals("org.eclipse.angus.mail.smtp.SMTPTransport", r.getTransportProtocolClass());
                     assertEquals("false", r.getAuth());
                     isCreated = true;
                     break;

diff --git a/...sources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourcesXMLParser.java b/...sources-connector/src/main/java/org/glassfish/resources/admin/cli/ResourcesXMLParser.java
@@ -37,7 +37,7 @@
  * only if the new code is made subject to such option by the copyright
  * holder.
  */
-// Portions Copyright [2017-2022] [Payara Foundation and/or its affiliates]
+// Portions Copyright 2017-2024 [Payara Foundation and/or its affiliates]
 
 package org.glassfish.resources.admin.cli;
 

diff --git a/...samples/asadmin/src/test/java/fish/payara/samples/asadmin/CreateJavaMailResourceTest.java b/...samples/asadmin/src/test/java/fish/payara/samples/asadmin/CreateJavaMailResourceTest.java
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) [2020-2024] Payara Foundation and/or its affiliates. All rights reserved.
+ * Copyright (c) 2020-2024 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
@@ -59,9 +59,9 @@ public void testJavaMailDeploymentGroupRef() {
                     "--auth=false",
                     "--transportProtocol=smtp",
                     "--host=localhost",
-                "--storeProtocolClass=org.eclipse.angus.mail.imap.IMAPStore",
+                    "--storeProtocolClass=org.eclipse.angus.mail.imap.IMAPStore",
                     "--from=ratatosk@payara.fish",
-                "--transportProtocolClass=org.eclipse.angus.mail.smtp.SMTPTransport",
+                    "--transportProtocolClass=org.eclipse.angus.mail.smtp.SMTPTransport",
                     "--enabled=true",
                     "--target=domain",
                     "--mailhost=localhost",

diff --git a/core/pom.xml b/core/pom.xml
@@ -140,8 +140,8 @@
         <ldapbp.version>1.0</ldapbp.version>
         <!-- Javassist (JAVA programming ASSISTant) makes Java bytecode manipulation simple. It is a class library for editing bytecodes in Java. -->
         <javassist.version>3.30.2-GA</javassist.version>
-        <mail.version>2.1.0</mail.version>
-        <angus.mail.version>2.0.0</angus.mail.version>
+        <mail.version>2.1.3</mail.version>
+        <angus.mail.version>2.0.3</angus.mail.version>
         <ha-api.version>3.1.13</ha-api.version>
         <apache.bcel.version>6.10.0</apache.bcel.version>
         <!-- Primitive Function Library (PFL); a library of simple utilities used by Glassfish -->