modules/jdk.packager/src/main/java/com/oracle/tools/packager/mac/MacAppStoreBundler.java

*** 47,56 ****
--- 47,72 ----
  import java.util.Optional;
  import java.util.ResourceBundle;
  
  import static com.oracle.tools.packager.StandardBundlerParam.*;
  import static com.oracle.tools.packager.mac.MacAppBundler.*;
+ import java.io.BufferedOutputStream;
+ import java.io.BufferedReader;
+ import java.io.ByteArrayInputStream;
+ import java.io.ByteArrayOutputStream;
+ import java.io.FileOutputStream;
+ import java.io.InputStreamReader;
+ import java.io.PrintStream;
+ import java.text.DateFormat;
+ import java.text.ParseException;
+ import java.text.SimpleDateFormat;
+ import java.util.Calendar;
+ import java.util.Date;
+ import java.util.Locale;
+ import java.util.logging.Level;
+ import java.util.logging.Logger;
+ import jdk.packager.internal.mac.MacCertificate;
  
  public class MacAppStoreBundler extends MacBaseInstallerBundler {
  
      private static final ResourceBundle I18N =
              ResourceBundle.getBundle(MacAppStoreBundler.class.getName());
*** 62,72 ****
      public static final BundlerParamInfo<String> MAC_APP_STORE_APP_SIGNING_KEY = new StandardBundlerParam<>(
              I18N.getString("param.signing-key-app.name"),
              I18N.getString("param.signing-key-app.description"),
              "mac.signing-key-app",
              String.class,
!             params -> MacBaseInstallerBundler.findKey("3rd Party Mac Developer Application: " + SIGNING_KEY_USER.fetchFrom(params), SIGNING_KEYCHAIN.fetchFrom(params), VERBOSE.fetchFrom(params)),
              (s, p) -> s);
  
      public static final BundlerParamInfo<String> MAC_APP_STORE_PKG_SIGNING_KEY = new StandardBundlerParam<>(
              I18N.getString("param.signing-key-pkg.name"),
              I18N.getString("param.signing-key-pkg.description"),
--- 78,101 ----
      public static final BundlerParamInfo<String> MAC_APP_STORE_APP_SIGNING_KEY = new StandardBundlerParam<>(
              I18N.getString("param.signing-key-app.name"),
              I18N.getString("param.signing-key-app.description"),
              "mac.signing-key-app",
              String.class,
!             params -> {
!                     String result = MacBaseInstallerBundler.findKey("3rd Party Mac Developer Application: " + SIGNING_KEY_USER.fetchFrom(params),
!                                                                     SIGNING_KEYCHAIN.fetchFrom(params),
!                                                                     VERBOSE.fetchFrom(params));
!                     if (result != null) {
!                         MacCertificate certificate = new MacCertificate(result, VERBOSE.fetchFrom(params));
! 
!                         if (!certificate.isValid()) {
!                             Log.info(MessageFormat.format(I18N.getString("error.certificate.expired"), result));
!                         }
!                     }
! 
!                     return result;
!                 },
              (s, p) -> s);
  
      public static final BundlerParamInfo<String> MAC_APP_STORE_PKG_SIGNING_KEY = new StandardBundlerParam<>(
              I18N.getString("param.signing-key-pkg.name"),
              I18N.getString("param.signing-key-pkg.description"),