Merge pull request #4185 from pdudits/payara-3882

PAYARA-3882: Remove glassfish groupIds
payara · Sep 10, 2019 · b08be47 · b08be47
2 parents b8bcde5 + 36c2f27
commit b08be47
Show file tree

Hide file tree

Showing 785 changed files with 3,022 additions and 3,086 deletions.
diff --git a/api/pom.xml b/api/pom.xml
@@ -1,7 +1,7 @@
 <!--
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  
-  Copyright (c) [2016-2018] Payara Foundation and/or its affiliates. All rights reserved.
+  Copyright (c) [2016-2019] 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
@@ -41,7 +41,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>fish.payara</groupId>
+        <groupId>fish.payara.server</groupId>
         <artifactId>payara-nucleus-parent</artifactId>
         <version>5.194-SNAPSHOT</version>
         <relativePath>../nucleus/pom.xml</relativePath>

diff --git a/appserver/admin/admin-core/pom.xml b/appserver/admin/admin-core/pom.xml
@@ -43,7 +43,7 @@
 
 <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">
     <parent>
-        <groupId>org.glassfish.main.admin</groupId>
+        <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
         <version>5.194-SNAPSHOT</version>
     </parent>
@@ -56,19 +56,19 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.glassfish.main.admin</groupId>
+            <groupId>fish.payara.server.internal.admin</groupId>
             <artifactId>admin-util</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.main.common</groupId>
+            <groupId>fish.payara.server.internal.common</groupId>
             <artifactId>common-util</artifactId>
             <version>${project.version}</version>
         </dependency>
 
         <!-- test dependencies -->
         <dependency>
-            <groupId>org.glassfish.main.tests</groupId>
+            <groupId>fish.payara.server.internal.test-utils</groupId>
             <artifactId>utils</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>

diff --git a/appserver/admin/backup-l10n/osgi.bundle b/appserver/admin/backup-l10n/osgi.bundle
@@ -38,4 +38,4 @@
 # holder.
 #
 
-Fragment-Host: org.glassfish.main.admin.backup; bundle-version=${project.osgi.version}
+Fragment-Host: fish.payara.server.internal.admin.backup; bundle-version=${project.osgi.version}
diff --git a/appserver/admin/backup-l10n/pom.xml b/appserver/admin/backup-l10n/pom.xml
@@ -42,7 +42,7 @@
 
 <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">
     <parent>
-        <groupId>org.glassfish.main.admin</groupId>
+        <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
         <version>5.194-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>

diff --git a/appserver/admin/backup/pom.xml b/appserver/admin/backup/pom.xml
@@ -42,7 +42,7 @@
 
 <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">
     <parent>
-        <groupId>org.glassfish.main.admin</groupId>
+        <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
         <version>5.194-SNAPSHOT</version>
     </parent>
@@ -86,12 +86,12 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.glassfish.main.admin</groupId>
+            <groupId>fish.payara.server.internal.admin</groupId>
             <artifactId>admin-util</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.main.common</groupId>
+            <groupId>fish.payara.server.internal.common</groupId>
             <artifactId>common-util</artifactId>
             <version>${project.parent.version}</version>
         </dependency>

diff --git a/appserver/admin/cli-optional-l10n/pom.xml b/appserver/admin/cli-optional-l10n/pom.xml
@@ -45,7 +45,7 @@
 <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>
-        <groupId>org.glassfish.main.admin</groupId>
+        <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
         <version>5.194-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>

diff --git a/appserver/admin/cli-optional/pom.xml b/appserver/admin/cli-optional/pom.xml
@@ -45,7 +45,7 @@
 <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>
-        <groupId>org.glassfish.main.admin</groupId>
+        <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
         <version>5.194-SNAPSHOT</version>
     </parent>
@@ -131,36 +131,36 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.glassfish.main.admin</groupId>
+            <groupId>fish.payara.server.internal.admin</groupId>
             <artifactId>admin-cli</artifactId>
             <version>${project.version}</version>
         </dependency>        <dependency>
-            <groupId>org.glassfish.main.core</groupId>
+            <groupId>fish.payara.server.internal.core</groupId>
             <artifactId>glassfish</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.main.admin</groupId>
+            <groupId>fish.payara.server.internal.admin</groupId>
             <artifactId>server-mgmt</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.main.common</groupId>
+            <groupId>fish.payara.server.internal.common</groupId>
             <artifactId>common-util</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.main.admin</groupId>
+            <groupId>fish.payara.server.internal.admin</groupId>
             <artifactId>admin-util</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.main.admin</groupId>
+            <groupId>fish.payara.server.internal.admin</groupId>
             <artifactId>launcher</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.glassfish.main.common</groupId>
+            <groupId>fish.payara.server.internal.common</groupId>
             <artifactId>glassfish-api</artifactId>
             <version>${project.version}</version>
         </dependency>
@@ -169,7 +169,7 @@
             <artifactId>hk2-core</artifactId>
         </dependency>
         <dependency>    
-            <groupId>org.glassfish.main.admin</groupId>
+            <groupId>fish.payara.server.internal.admin</groupId>
             <artifactId>backup</artifactId>
             <version>${project.version}</version>
         </dependency>

diff --git a/appserver/admin/cli/pom.xml b/appserver/admin/cli/pom.xml
@@ -45,7 +45,7 @@
 <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>
-        <groupId>org.glassfish.main.admin</groupId>
+        <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
         <version>5.194-SNAPSHOT</version>
     </parent>
@@ -86,7 +86,7 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.glassfish.main.admin</groupId>
+            <groupId>fish.payara.server.internal.admin</groupId>
             <artifactId>admin-cli</artifactId>
             <version>${project.parent.version}</version>
         </dependency>

diff --git a/appserver/admin/gf_template/pom.xml b/appserver/admin/gf_template/pom.xml
@@ -45,7 +45,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.glassfish.main.admin</groupId>
+        <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
         <version>5.194-SNAPSHOT</version>
     </parent>
@@ -56,7 +56,7 @@
 
     <dependencies>
         <dependency>
-             <groupId>org.glassfish.main.admin</groupId>
+             <groupId>fish.payara.server.internal.admin</groupId>
              <artifactId>nucleus-domain</artifactId>
              <version>${project.version}</version>
              <scope>provided</scope>
@@ -77,7 +77,7 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.glassfish.main.admin</groupId>
+                                    <groupId>fish.payara.server.internal.admin</groupId>
                                     <artifactId>nucleus-domain</artifactId>
                                     <version>${project.version}</version>
                                     <overWrite>false</overWrite>

diff --git a/appserver/admin/gf_template_web/pom.xml b/appserver/admin/gf_template_web/pom.xml
@@ -43,7 +43,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.glassfish.main.admin</groupId>
+        <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
         <version>5.194-SNAPSHOT</version>
     </parent>
@@ -54,7 +54,7 @@
 
     <dependencies>
         <dependency>
-             <groupId>org.glassfish.main.admin</groupId>
+             <groupId>fish.payara.server.internal.admin</groupId>
              <artifactId>nucleus-domain</artifactId>
              <version>${project.version}</version>
              <scope>provided</scope>
@@ -75,7 +75,7 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.glassfish.main.admin</groupId>
+                                    <groupId>fish.payara.server.internal.admin</groupId>
                                     <artifactId>nucleus-domain</artifactId>
                                     <version>${project.version}</version>
                                     <overWrite>false</overWrite>

diff --git a/appserver/admin/pom.xml b/appserver/admin/pom.xml
@@ -41,17 +41,17 @@
 
 -->
 
-<!-- Portions Copyright [2016-2017] [Payara Foundation] -->
+<!-- Portions Copyright [2016-2019] [Payara Foundation] -->
 
 <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>
-        <groupId>fish.payara</groupId>
+        <groupId>fish.payara.server</groupId>
         <artifactId>payara-parent</artifactId>
         <version>5.194-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <groupId>org.glassfish.main.admin</groupId>
+    <groupId>fish.payara.server.internal.admin</groupId>
     <artifactId>admin</artifactId>
     <packaging>pom</packaging>
     <name>Admin Modules</name>

diff --git a/appserver/admin/production_domain_template/pom.xml b/appserver/admin/production_domain_template/pom.xml
@@ -44,7 +44,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.glassfish.main.admin</groupId>
+        <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
         <version>5.194-SNAPSHOT</version>
     </parent>
@@ -55,7 +55,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.glassfish.main.admin</groupId>
+            <groupId>fish.payara.server.internal.admin</groupId>
             <artifactId>nucleus-domain</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
@@ -76,7 +76,7 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.glassfish.main.admin</groupId>
+                                    <groupId>fish.payara.server.internal.admin</groupId>
                                     <artifactId>nucleus-domain</artifactId>
                                     <version>${project.version}</version>
                                     <overWrite>false</overWrite>

diff --git a/appserver/admin/production_domain_template_web/pom.xml b/appserver/admin/production_domain_template_web/pom.xml
@@ -44,7 +44,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.glassfish.main.admin</groupId>
+        <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
         <version>5.194-SNAPSHOT</version>
     </parent>
@@ -55,7 +55,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.glassfish.main.admin</groupId>
+            <groupId>fish.payara.server.internal.admin</groupId>
             <artifactId>nucleus-domain</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>
@@ -76,7 +76,7 @@
                         <configuration>
                             <artifactItems>
                                 <artifactItem>
-                                    <groupId>org.glassfish.main.admin</groupId>
+                                    <groupId>fish.payara.server.internal.admin</groupId>
                                     <artifactId>nucleus-domain</artifactId>
                                     <version>${project.version}</version>
                                     <overWrite>false</overWrite>

diff --git a/appserver/admin/runtime/mgmt-infra/pom.xml b/appserver/admin/runtime/mgmt-infra/pom.xml
@@ -43,7 +43,7 @@
 <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">
     <parent>
-        <groupId>org.glassfish.main.admin.runtime</groupId>
+        <groupId>fish.payara.server.internal.admin.runtime</groupId>
         <artifactId>runtime</artifactId>
         <version>4.1-SNAPSHOT</version>
     </parent>

diff --git a/appserver/admin/runtime/pom.xml b/appserver/admin/runtime/pom.xml
@@ -45,12 +45,12 @@
          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>
-        <groupId>org.glassfish.main.admin</groupId>
+        <groupId>fish.payara.server.internal.admin</groupId>
         <artifactId>admin</artifactId>
         <version>4.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <groupId>org.glassfish.main.admin.runtime</groupId>
+    <groupId>fish.payara.server.internal.admin.runtime</groupId>
     <artifactId>runtime</artifactId>
     <packaging>pom</packaging>
     <name>Admin Runtime</name>  

diff --git a/appserver/admingui/cdieventbus-notifier-console-plugin-l10n/osgi.bundle b/appserver/admingui/cdieventbus-notifier-console-plugin-l10n/osgi.bundle
@@ -1,7 +1,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 #
-#  Copyright (c) [2018] Payara Foundation and/or its affiliates. 
+#  Copyright (c) [2018-2019] Payara Foundation and/or its affiliates. 
 #  All rights reserved.
 #
 # The contents of this file are subject to the terms of either the GNU
@@ -38,4 +38,4 @@
 # only if the new code is made subject to such option by the copyright
 # holder.
 
-Fragment-Host: fish.payara.admingui.cdieventbus-notifier-console-plugin; bundle-version=${project.osgi.version}
+Fragment-Host: fish.payara.server.internal.admingui.cdieventbus-notifier-console-plugin; bundle-version=${project.osgi.version}
diff --git a/appserver/admingui/cdieventbus-notifier-console-plugin-l10n/pom.xml b/appserver/admingui/cdieventbus-notifier-console-plugin-l10n/pom.xml
@@ -2,7 +2,7 @@
 <!--
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-  Copyright (c) [2018] Payara Foundation and/or its affiliates. 
+  Copyright (c) [2018-2019] Payara Foundation and/or its affiliates. 
   All rights reserved.
 
   The contents of this file are subject to the terms of either the GNU
@@ -43,7 +43,7 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>fish.payara.admingui</groupId>
+        <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
         <version>5.194-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>

diff --git a/appserver/admingui/cdieventbus-notifier-console-plugin/pom.xml b/appserver/admingui/cdieventbus-notifier-console-plugin/pom.xml
@@ -2,7 +2,7 @@
 <!--
   DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-  Copyright (c) 2017 Payara Foundation and/or its affiliates. All rights reserved.
+  Copyright (c) 2017-2019 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
@@ -41,7 +41,7 @@
 <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/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>fish.payara.admingui</groupId>
+        <groupId>fish.payara.server.internal.admingui</groupId>
         <artifactId>admingui</artifactId>
         <version>5.194-SNAPSHOT</version>
     </parent>
@@ -76,7 +76,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>fish.payara.admingui</groupId>
+            <groupId>fish.payara.server.internal.admingui</groupId>
             <artifactId>console-plugin-service</artifactId>
             <version>${project.version}</version>
             <scope>provided</scope>

diff --git a/appserver/admingui/cluster-l10n/osgi.bundle b/appserver/admingui/cluster-l10n/osgi.bundle
@@ -38,6 +38,6 @@
 # holder.
 #
 
-# "Portions Copyright [2016] [Payara Foundation]"
+# "Portions Copyright [2016-2019] [Payara Foundation]"
 
-Fragment-Host: fish.payara.admingui.console-cluster-plugin; bundle-version=${project.osgi.version}
+Fragment-Host: fish.payara.server.internal.admingui.console-cluster-plugin; bundle-version=${project.osgi.version}