From ab2e4800e213c37d7347de8c3d424f4155a03025 Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Fri, 29 Jan 2021 09:51:46 +0000
Subject: [PATCH 1/2] FISH-753 Missed web distribution assemblies

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 .../payara-web-ml/src/main/assembly/payara-web-ml.xml        | 5 -----
 .../payara-web/src/main/assembly/payara-web.xml              | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/appserver/distributions/payara-web-ml/src/main/assembly/payara-web-ml.xml b/appserver/distributions/payara-web-ml/src/main/assembly/payara-web-ml.xml
index f73c48f8206..8e4be729697 100644
--- a/appserver/distributions/payara-web-ml/src/main/assembly/payara-web-ml.xml
+++ b/appserver/distributions/payara-web-ml/src/main/assembly/payara-web-ml.xml
@@ -89,10 +89,5 @@
             <destName>appserver-domain.jar</destName>
             <outputDirectory>${install.dir.name}/glassfish/common/templates/gf/</outputDirectory>
         </file>
-        <file>
-            <source>${temp.dir}/${install.dir.name}/glassfish/common/templates/gf/production-domain-web.jar</source>
-            <destName>production-domain.jar</destName>
-            <outputDirectory>${install.dir.name}/glassfish/common/templates/gf/</outputDirectory>
-        </file>
     </files>
 </assembly>
diff --git a/appserver/distributions/payara-web/src/main/assembly/payara-web.xml b/appserver/distributions/payara-web/src/main/assembly/payara-web.xml
index f73c48f8206..8e4be729697 100644
--- a/appserver/distributions/payara-web/src/main/assembly/payara-web.xml
+++ b/appserver/distributions/payara-web/src/main/assembly/payara-web.xml
@@ -89,10 +89,5 @@
             <destName>appserver-domain.jar</destName>
             <outputDirectory>${install.dir.name}/glassfish/common/templates/gf/</outputDirectory>
         </file>
-        <file>
-            <source>${temp.dir}/${install.dir.name}/glassfish/common/templates/gf/production-domain-web.jar</source>
-            <destName>production-domain.jar</destName>
-            <outputDirectory>${install.dir.name}/glassfish/common/templates/gf/</outputDirectory>
-        </file>
     </files>
 </assembly>

From 0c4c12addcd14423a9c895a8a8b5508db78c9bb1 Mon Sep 17 00:00:00 2001
From: Andrew Pielage <pandrex247@hotmail.com>
Date: Fri, 29 Jan 2021 09:54:29 +0000
Subject: [PATCH 2/2] Copyright

Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
---
 .../payara-web-ml/src/main/assembly/payara-web-ml.xml           | 2 +-
 .../distributions/payara-web/src/main/assembly/payara-web.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/appserver/distributions/payara-web-ml/src/main/assembly/payara-web-ml.xml b/appserver/distributions/payara-web-ml/src/main/assembly/payara-web-ml.xml
index 8e4be729697..b4e6b7ae2a6 100644
--- a/appserver/distributions/payara-web-ml/src/main/assembly/payara-web-ml.xml
+++ b/appserver/distributions/payara-web-ml/src/main/assembly/payara-web-ml.xml
@@ -40,7 +40,7 @@
     holder.
 
 -->
-<!-- Portions Copyright [2017-2020] [Payara Foundation and/or its affiliates] -->
+<!-- Portions Copyright 2017-2021 Payara Foundation and/or its affiliates -->
 
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
diff --git a/appserver/distributions/payara-web/src/main/assembly/payara-web.xml b/appserver/distributions/payara-web/src/main/assembly/payara-web.xml
index 8e4be729697..b4e6b7ae2a6 100644
--- a/appserver/distributions/payara-web/src/main/assembly/payara-web.xml
+++ b/appserver/distributions/payara-web/src/main/assembly/payara-web.xml
@@ -40,7 +40,7 @@
     holder.
 
 -->
-<!-- Portions Copyright [2017-2020] [Payara Foundation and/or its affiliates] -->
+<!-- Portions Copyright 2017-2021 Payara Foundation and/or its affiliates -->
 
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">