Issue #23507 test-utils and utils merged to a single project
diff --git a/appserver/admin/admin-core/pom.xml b/appserver/admin/admin-core/pom.xml
index d976e9b..e893915 100755
--- a/appserver/admin/admin-core/pom.xml
+++ b/appserver/admin/admin-core/pom.xml
@@ -45,8 +45,8 @@
</dependency>
<dependency>
- <groupId>org.glassfish.main.tests</groupId>
- <artifactId>utils</artifactId>
+ <groupId>org.glassfish.main</groupId>
+ <artifactId>test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/appserver/common/annotation-framework/pom.xml b/appserver/common/annotation-framework/pom.xml
index d4482dd..928ff6d 100755
--- a/appserver/common/annotation-framework/pom.xml
+++ b/appserver/common/annotation-framework/pom.xml
@@ -70,8 +70,8 @@
</dependency>
<dependency>
- <groupId>org.glassfish.main.tests</groupId>
- <artifactId>utils</artifactId>
+ <groupId>org.glassfish.main</groupId>
+ <artifactId>test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/appserver/concurrent/concurrent-impl/pom.xml b/appserver/concurrent/concurrent-impl/pom.xml
index ecab733..83f02f6 100644
--- a/appserver/concurrent/concurrent-impl/pom.xml
+++ b/appserver/concurrent/concurrent-impl/pom.xml
@@ -91,8 +91,8 @@
</dependency>
<dependency>
- <groupId>org.glassfish.main.tests</groupId>
- <artifactId>utils</artifactId>
+ <groupId>org.glassfish.main</groupId>
+ <artifactId>test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/appserver/connectors/admin/pom.xml b/appserver/connectors/admin/pom.xml
index 81d7914..9197dc1 100644
--- a/appserver/connectors/admin/pom.xml
+++ b/appserver/connectors/admin/pom.xml
@@ -80,8 +80,8 @@
</dependency>
<dependency>
- <groupId>org.glassfish.main.tests</groupId>
- <artifactId>utils</artifactId>
+ <groupId>org.glassfish.main</groupId>
+ <artifactId>test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/appserver/connectors/connectors-internal-api/pom.xml b/appserver/connectors/connectors-internal-api/pom.xml
index 2fb90ae..f0cba07 100755
--- a/appserver/connectors/connectors-internal-api/pom.xml
+++ b/appserver/connectors/connectors-internal-api/pom.xml
@@ -81,8 +81,8 @@
</dependency>
<dependency>
- <groupId>org.glassfish.main.tests</groupId>
- <artifactId>utils</artifactId>
+ <groupId>org.glassfish.main</groupId>
+ <artifactId>test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/appserver/ejb/ejb-connector/pom.xml b/appserver/ejb/ejb-connector/pom.xml
index cff155d..b8cfd8e 100755
--- a/appserver/ejb/ejb-connector/pom.xml
+++ b/appserver/ejb/ejb-connector/pom.xml
@@ -73,10 +73,10 @@
<artifactId>hk2-core</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.main.tests</groupId>
- <artifactId>utils</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
+ <groupId>org.glassfish.main</groupId>
+ <artifactId>test-utils</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
diff --git a/appserver/jdbc/admin/pom.xml b/appserver/jdbc/admin/pom.xml
index 6fdc1bf..2939adc 100644
--- a/appserver/jdbc/admin/pom.xml
+++ b/appserver/jdbc/admin/pom.xml
@@ -81,8 +81,8 @@
</dependency>
<dependency>
- <groupId>org.glassfish.main.tests</groupId>
- <artifactId>utils</artifactId>
+ <groupId>org.glassfish.main</groupId>
+ <artifactId>test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/appserver/jdbc/jdbc-runtime/pom.xml b/appserver/jdbc/jdbc-runtime/pom.xml
index f04c773..81a4925 100644
--- a/appserver/jdbc/jdbc-runtime/pom.xml
+++ b/appserver/jdbc/jdbc-runtime/pom.xml
@@ -38,8 +38,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish.main.tests</groupId>
- <artifactId>utils</artifactId>
+ <groupId>org.glassfish.main</groupId>
+ <artifactId>test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/appserver/jms/admin/pom.xml b/appserver/jms/admin/pom.xml
index 201b803..18e3d3c 100644
--- a/appserver/jms/admin/pom.xml
+++ b/appserver/jms/admin/pom.xml
@@ -60,8 +60,8 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.glassfish.main.tests</groupId>
- <artifactId>utils</artifactId>
+ <groupId>org.glassfish.main</groupId>
+ <artifactId>test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/appserver/load-balancer/admin/pom.xml b/appserver/load-balancer/admin/pom.xml
index 7e145f7..7f7ec74 100644
--- a/appserver/load-balancer/admin/pom.xml
+++ b/appserver/load-balancer/admin/pom.xml
@@ -79,8 +79,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.glassfish.main.tests</groupId>
- <artifactId>utils</artifactId>
+ <groupId>org.glassfish.main</groupId>
+ <artifactId>test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/appserver/orb/orb-connector/pom.xml b/appserver/orb/orb-connector/pom.xml
index ea50f49..5749df9 100755
--- a/appserver/orb/orb-connector/pom.xml
+++ b/appserver/orb/orb-connector/pom.xml
@@ -120,8 +120,8 @@
<!-- TEST dependencies -->
<dependency>
- <groupId>org.glassfish.main.tests</groupId>
- <artifactId>utils</artifactId>
+ <groupId>org.glassfish.main</groupId>
+ <artifactId>test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/appserver/resources/mail/mail-connector/pom.xml b/appserver/resources/mail/mail-connector/pom.xml
index 8a1a0b1..60174eb 100644
--- a/appserver/resources/mail/mail-connector/pom.xml
+++ b/appserver/resources/mail/mail-connector/pom.xml
@@ -75,8 +75,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.glassfish.main.tests</groupId>
- <artifactId>utils</artifactId>
+ <groupId>org.glassfish.main</groupId>
+ <artifactId>test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/appserver/resources/resources-connector/pom.xml b/appserver/resources/resources-connector/pom.xml
index 7da9856..b49caec 100755
--- a/appserver/resources/resources-connector/pom.xml
+++ b/appserver/resources/resources-connector/pom.xml
@@ -83,8 +83,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.glassfish.main.tests</groupId>
- <artifactId>utils</artifactId>
+ <groupId>org.glassfish.main</groupId>
+ <artifactId>test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/nucleus/admin/config-api/pom.xml b/nucleus/admin/config-api/pom.xml
index 25383db..7b600d2 100644
--- a/nucleus/admin/config-api/pom.xml
+++ b/nucleus/admin/config-api/pom.xml
@@ -79,8 +79,8 @@
<!-- test dependencies -->
<dependency>
- <groupId>org.glassfish.main.tests</groupId>
- <artifactId>utils</artifactId>
+ <groupId>org.glassfish.main</groupId>
+ <artifactId>test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/nucleus/admin/util/pom.xml b/nucleus/admin/util/pom.xml
index fd96b1d..5845a60 100755
--- a/nucleus/admin/util/pom.xml
+++ b/nucleus/admin/util/pom.xml
@@ -131,8 +131,8 @@
<artifactId>hamcrest</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.main.tests</groupId>
- <artifactId>utils</artifactId>
+ <groupId>org.glassfish.main</groupId>
+ <artifactId>test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/nucleus/cluster/admin/pom.xml b/nucleus/cluster/admin/pom.xml
index f297fd3..3d036aa 100644
--- a/nucleus/cluster/admin/pom.xml
+++ b/nucleus/cluster/admin/pom.xml
@@ -88,8 +88,8 @@
</dependency>
<dependency>
- <groupId>org.glassfish.main.tests</groupId>
- <artifactId>utils</artifactId>
+ <groupId>org.glassfish.main</groupId>
+ <artifactId>test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/nucleus/core/context-propagation/pom.xml b/nucleus/core/context-propagation/pom.xml
index 858da25..08443a0 100644
--- a/nucleus/core/context-propagation/pom.xml
+++ b/nucleus/core/context-propagation/pom.xml
@@ -56,8 +56,8 @@
</dependency>
<dependency>
- <groupId>org.glassfish.main.tests</groupId>
- <artifactId>utils</artifactId>
+ <groupId>org.glassfish.main</groupId>
+ <artifactId>test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/nucleus/core/kernel/pom.xml b/nucleus/core/kernel/pom.xml
index bc00c72..56d29f3 100755
--- a/nucleus/core/kernel/pom.xml
+++ b/nucleus/core/kernel/pom.xml
@@ -161,8 +161,8 @@
</dependency>
<dependency>
- <groupId>org.glassfish.main.tests</groupId>
- <artifactId>utils</artifactId>
+ <groupId>org.glassfish.main</groupId>
+ <artifactId>test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/nucleus/deployment/common/pom.xml b/nucleus/deployment/common/pom.xml
index db03842..97d5922 100755
--- a/nucleus/deployment/common/pom.xml
+++ b/nucleus/deployment/common/pom.xml
@@ -95,8 +95,8 @@
<artifactId>asm</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.main.tests</groupId>
- <artifactId>utils</artifactId>
+ <groupId>org.glassfish.main</groupId>
+ <artifactId>test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/nucleus/diagnostics/context/pom.xml b/nucleus/diagnostics/context/pom.xml
index 58b3c6a..2bae7f5 100644
--- a/nucleus/diagnostics/context/pom.xml
+++ b/nucleus/diagnostics/context/pom.xml
@@ -64,8 +64,8 @@
</dependency>
<dependency>
- <groupId>org.glassfish.main.tests</groupId>
- <artifactId>utils</artifactId>
+ <groupId>org.glassfish.main</groupId>
+ <artifactId>test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/nucleus/security/services/pom.xml b/nucleus/security/services/pom.xml
index 470d735..019c30b 100644
--- a/nucleus/security/services/pom.xml
+++ b/nucleus/security/services/pom.xml
@@ -76,8 +76,8 @@
<artifactId>hamcrest</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.main.tests</groupId>
- <artifactId>utils</artifactId>
+ <groupId>org.glassfish.main</groupId>
+ <artifactId>test-utils</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
diff --git a/nucleus/test-utils/pom.xml b/nucleus/test-utils/pom.xml
index d339bb7..8e0fc16 100755
--- a/nucleus/test-utils/pom.xml
+++ b/nucleus/test-utils/pom.xml
@@ -27,25 +27,28 @@
</parent>
<artifactId>test-utils</artifactId>
- <packaging>pom</packaging>
- <name>Test Utilities Modules</name>
+ <name>Test Utilities</name>
- <modules>
- <module>utils</module>
- </modules>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.glassfish.hk2</groupId>
+ <artifactId>hk2-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.main.common</groupId>
+ <artifactId>glassfish-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.main.core</groupId>
+ <artifactId>glassfish</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
</project>
diff --git a/nucleus/test-utils/utils/src/main/java/org/glassfish/tests/utils/ReflectionUtils.java b/nucleus/test-utils/src/main/java/org/glassfish/tests/utils/ReflectionUtils.java
similarity index 100%
rename from nucleus/test-utils/utils/src/main/java/org/glassfish/tests/utils/ReflectionUtils.java
rename to nucleus/test-utils/src/main/java/org/glassfish/tests/utils/ReflectionUtils.java
diff --git a/nucleus/test-utils/utils/src/main/java/org/glassfish/tests/utils/junit/Classes.java b/nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/Classes.java
similarity index 100%
rename from nucleus/test-utils/utils/src/main/java/org/glassfish/tests/utils/junit/Classes.java
rename to nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/Classes.java
diff --git a/nucleus/test-utils/utils/src/main/java/org/glassfish/tests/utils/junit/DomainXml.java b/nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/DomainXml.java
similarity index 100%
rename from nucleus/test-utils/utils/src/main/java/org/glassfish/tests/utils/junit/DomainXml.java
rename to nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/DomainXml.java
diff --git a/nucleus/test-utils/utils/src/main/java/org/glassfish/tests/utils/junit/ExcludeClasses.java b/nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/ExcludeClasses.java
similarity index 100%
rename from nucleus/test-utils/utils/src/main/java/org/glassfish/tests/utils/junit/ExcludeClasses.java
rename to nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/ExcludeClasses.java
diff --git a/nucleus/test-utils/utils/src/main/java/org/glassfish/tests/utils/junit/HK2ClasssVisitor.java b/nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/HK2ClasssVisitor.java
similarity index 100%
rename from nucleus/test-utils/utils/src/main/java/org/glassfish/tests/utils/junit/HK2ClasssVisitor.java
rename to nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/HK2ClasssVisitor.java
diff --git a/nucleus/test-utils/utils/src/main/java/org/glassfish/tests/utils/junit/HK2JUnit5Extension.java b/nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/HK2JUnit5Extension.java
similarity index 100%
rename from nucleus/test-utils/utils/src/main/java/org/glassfish/tests/utils/junit/HK2JUnit5Extension.java
rename to nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/HK2JUnit5Extension.java
diff --git a/nucleus/test-utils/utils/src/main/java/org/glassfish/tests/utils/junit/LocatorFiles.java b/nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/LocatorFiles.java
similarity index 100%
rename from nucleus/test-utils/utils/src/main/java/org/glassfish/tests/utils/junit/LocatorFiles.java
rename to nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/LocatorFiles.java
diff --git a/nucleus/test-utils/utils/src/main/java/org/glassfish/tests/utils/junit/Packages.java b/nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/Packages.java
similarity index 100%
rename from nucleus/test-utils/utils/src/main/java/org/glassfish/tests/utils/junit/Packages.java
rename to nucleus/test-utils/src/main/java/org/glassfish/tests/utils/junit/Packages.java
diff --git a/nucleus/test-utils/utils/src/main/java/org/glassfish/tests/utils/mock/MockGenerator.java b/nucleus/test-utils/src/main/java/org/glassfish/tests/utils/mock/MockGenerator.java
similarity index 100%
rename from nucleus/test-utils/utils/src/main/java/org/glassfish/tests/utils/mock/MockGenerator.java
rename to nucleus/test-utils/src/main/java/org/glassfish/tests/utils/mock/MockGenerator.java
diff --git a/nucleus/test-utils/utils/src/main/java/org/glassfish/tests/utils/mock/TestDocument.java b/nucleus/test-utils/src/main/java/org/glassfish/tests/utils/mock/TestDocument.java
similarity index 100%
rename from nucleus/test-utils/utils/src/main/java/org/glassfish/tests/utils/mock/TestDocument.java
rename to nucleus/test-utils/src/main/java/org/glassfish/tests/utils/mock/TestDocument.java
diff --git a/nucleus/test-utils/utils/pom.xml b/nucleus/test-utils/utils/pom.xml
deleted file mode 100644
index 9c7e1bc..0000000
--- a/nucleus/test-utils/utils/pom.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?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</groupId>
- <artifactId>test-utils</artifactId>
- <version>6.2.2-SNAPSHOT</version>
- </parent>
-
- <groupId>org.glassfish.main.tests</groupId>
- <artifactId>utils</artifactId>
-
- <name>Test utilities</name>
-
- <developers>
- <developer>
- <id>dochez</id>
- <name>Jerome Dochez</name>
- <url>http://blogs.sun.com/dochez</url>
- <organization>Oracle, Inc.</organization>
- <roles>
- <role>lead</role>
- <role>developer</role>
- </roles>
- </developer>
- </developers>
-
- <dependencies>
- <dependency>
- <groupId>org.glassfish.hk2</groupId>
- <artifactId>hk2-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.glassfish.main.common</groupId>
- <artifactId>glassfish-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.main.core</groupId>
- <artifactId>glassfish</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-</project>
