Merge pull request #3026 from mulderbaba/PAYARA-2904-Remove-invalid-f…

…iles-from-bin-directory PAYARA-2904-Remove-invalid-files-from-bin-directory
payara · Aug 15, 2018 · b8cc747 · b8cc747
2 parents d7ff193 + 947bb4d
commit b8cc747
Show file tree

Hide file tree

Showing 9 changed files with 5 additions and 1,063 deletions.
diff --git a/appserver/distributions/distributions.xml b/appserver/distributions/distributions.xml
@@ -40,8 +40,7 @@
     holder.
 
 -->
-<!-- Portions Copyright [2016] [Payara Foundation] -->
-
+<!-- Portions Copyright [2016-2018] Payara Foundation and/or affiliates -->
 
 <project name="GlassFish Distributions (IPS) Creation" basedir=".">
     <property name="image.root" value="target/local_image"/>
@@ -243,11 +242,6 @@
         <attribute name="zipBaseDir" default="@{image.dir}"/>
         <sequential>
 
-            <copy file="@{image.dir}/${install.dir.name}/pkg/lib/pkg-bootstub.sh" tofile="@{image.dir}/${install.dir.name}/bin/updatetool"/>
-            <copy file="@{image.dir}/${install.dir.name}/pkg/lib/pkg-bootstub.bat" tofile="@{image.dir}/${install.dir.name}/bin/updatetool.bat"/>
-            <copy file="@{image.dir}/${install.dir.name}/pkg/lib/pkg-bootstub.sh" tofile="@{image.dir}/${install.dir.name}/bin/pkg"/>
-            <copy file="@{image.dir}/${install.dir.name}/pkg/lib/pkg-bootstub.bat" tofile="@{image.dir}/${install.dir.name}/bin/pkg.bat"/>    
-
             <chmod file="@{image.dir}/${install.dir.name}/bin/*" perm="ugo+rx"/>
             <chmod file="@{image.dir}/${install.dir.name}/glassfish/bin/*" perm="ugo+rx"/>
             <chmod file="@{image.dir}/${install.dir.name}/glassfish/lib/nadmin*" perm="ugo+rx"/>

diff --git a/appserver/distributions/minnow/pom.xml b/appserver/distributions/minnow/pom.xml
@@ -40,7 +40,8 @@
     holder.
 
 -->
-<!-- Portions Copyright [2016] [Payara Foundation] -->
+<!-- Portions Copyright [2016-2018] Payara Foundation and/or affiliates -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
@@ -118,13 +119,6 @@
             <type>pom</type>
             <optional>true</optional>
         </dependency>
-
-        <!-- temporary pkg-bootstrap content dependency -->
-        <dependency>
-            <groupId>org.glassfish.main.packager</groupId>
-            <artifactId>pkg-bootstrap-fragment</artifactId>
-            <version>${project.version}</version>
-            <type>zip</type>
-        </dependency>	
+
     </dependencies>
 </project>
diff --git a/appserver/featuresets/minnow/pom.xml b/appserver/featuresets/minnow/pom.xml
@@ -38,9 +38,9 @@
     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.
-    Portions Copyright [2017] [Payara Foundation and/or its affiliates]
 
 -->
+<!-- Portions Copyright [2017-2018] Payara Foundation and/or affiliates -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -174,12 +174,5 @@
             <version>${project.version}</version>
             <type>zip</type>
         </dependency>
-        <!-- temporary pkg-bootstrap content dependency -->
-        <dependency>
-            <groupId>org.glassfish.main.packager</groupId>
-            <artifactId>pkg-bootstrap-fragment</artifactId>
-            <version>${project.version}</version>
-            <type>zip</type>
-        </dependency>
     </dependencies>
 </project>
diff --git a/appserver/packager/pkg-bootstrap/pom.xml b/appserver/packager/pkg-bootstrap/pom.xml
diff --git a/appserver/packager/pkg-bootstrap/src/main/resources/bin/pkg b/appserver/packager/pkg-bootstrap/src/main/resources/bin/pkg