Issue #23507 nucleus-tests moved to appserver admin tests

nucleus/tests/admin-adon/pom.xml → appserver/tests/admin/admin-extension/pom.xml

@@ -21,36 +21,12 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.glassfish.main.tests</groupId>
-        <artifactId>nucleus-tests</artifactId>
+        <artifactId>admin-tests-parent</artifactId>
         <version>6.2.6-SNAPSHOT</version>
     </parent>
-    <artifactId>test-progress-status-commands</artifactId>
-    <name>Progress status - Test Commands</name>
+    <artifactId>test-progress-admin-extension</artifactId>
+    <name>GlassFish Admin Tests - Progress Admin Extension</name>
     <packaging>glassfish-jar</packaging>
-
-    <properties>
-    </properties>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*.properties</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*.1</include>
-                    <include>**/*.xml</include>
-                    <include>**/*.properties</include>
-                </includes>
-            </resource>
-        </resources>
-
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>org.glassfish.main.common</groupId>

appserver/tests/admin/pom.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Copyright (c) 1997, 2021 Oracle and/or its affiliates. All rights reserved.
+
+    This program and the accompanying materials are made available under the
+    terms of the Eclipse Public License v. 2.0, which is available at
+    http://www.eclipse.org/legal/epl-2.0.
+
+    This Source Code may also be made available under the following Secondary
+    Licenses when the conditions for such availability set forth in the
+    Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+    version 2 with the GNU Classpath Exception, which is available at
+    https://www.gnu.org/software/classpath/license.html.
+
+    SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<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>org.glassfish.main.tests</groupId>
+        <artifactId>tests</artifactId>
+        <version>6.2.6-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>admin-tests-parent</artifactId>
+    <packaging>pom</packaging>
+
+    <name>GlassFish Admin Tests - Parent</name>
+
+    <modules>
+        <module>admin-extension</module>
+        <module>tests</module>
+    </modules>
+</project>

nucleus/tests/admin/pom.xml → appserver/tests/admin/tests/pom.xml

@@ -22,15 +22,13 @@
 
     <parent>
         <groupId>org.glassfish.main.tests</groupId>
-        <artifactId>nucleus-tests</artifactId>
+        <artifactId>admin-tests-parent</artifactId>
         <version>6.2.6-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.glassfish.tests</groupId>
-    <artifactId>nucleus-admin</artifactId>
+    <artifactId>admin-tests</artifactId>
 
-    <name>Nucleus Tests - Admin</name>
-    <description>This pom describes how to run admin developer tests on the Nucleus Bundle</description>
+    <name>GlassFish Admin Tests</name>
 
     <dependencies>
         <dependency>
@@ -77,7 +75,7 @@
         </dependency>
         <dependency>
             <groupId>org.glassfish.main.tests</groupId>
-            <artifactId>test-progress-status-commands</artifactId>
+            <artifactId>test-progress-admin-extension</artifactId>
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
@@ -122,7 +120,7 @@
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
-                            <includeArtifactIds>test-progress-status-commands</includeArtifactIds>
+                            <includeArtifactIds>test-progress-admin-extension</includeArtifactIds>
                             <excludeTransitive>true</excludeTransitive>
                             <outputDirectory>${project.build.directory}/glassfish6/glassfish/modules</outputDirectory>
                         </configuration>

appserver/tests/pom.xml

@@ -119,6 +119,7 @@
             </activation>
             <modules>
                 <module>tck</module>
+                <module>admin</module>
                 <module>appserv-tests</module>
             </modules>
         </profile>
@@ -129,7 +130,7 @@
         <profile>
             <id>fastest</id>
             <modules>
-                <!-- Compile dependencies -->
+                <!-- Builds compile dependencies for Ant tests executed by runtest.sh/gftest.sh -->
                 <module>appserv-tests</module>
             </modules>
         </profile>

nucleus/pom.xml

@@ -74,7 +74,6 @@
         <module>diagnostics</module>
         <module>resources</module>
         <module>featuresets</module>
-        <module>tests</module>
     </modules>
 
     <scm>