Please review this pom.xml changes for moving the
common/glassfish-naming module from main/appserver to main/nucleus.
The two dependencies were removed from the glassfish-naming pom.xml file
because these are not needed to build glassfish-naming.jar.
Thanks.
Tom
Index: appserver/common/pom.xml
===================================================================
--- appserver/common/pom.xml (revision 48728)
+++ appserver/common/pom.xml (working copy)
@@ -68,6 +68,5 @@
<module>glassfish-ee-api</module>
<module>annotation-framework</module>
<module>container-common</module>
- <module>glassfish-naming</module>
</modules>
</project>
Index: nucleus/common/pom.xml
===================================================================
--- nucleus/common/pom.xml (revision 48728)
+++ nucleus/common/pom.xml (working copy)
@@ -59,6 +59,7 @@
<module>internal-api</module>
<module>common-util</module>
<module>glassfish-api</module>
+ <module>glassfish-naming</module>
<module>mbeanserver</module>
<module>scattered-archive-api</module>
</modules>
Index: nucleus/common/glassfish-naming/pom.xml
===================================================================
--- nucleus/common/glassfish-naming/pom.xml (revision 48728)
+++ nucleus/common/glassfish-naming/pom.xml (working copy)
@@ -46,7 +46,7 @@
xsi:schemaLocation="
http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.glassfish.common</groupId>
- <artifactId>common</artifactId>
+ <artifactId>nucleus-common</artifactId>
<version>3.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -88,18 +88,9 @@
<dependencies>
<dependency>
<groupId>com.sun.corba</groupId>
- <artifactId>glassfish-corba-omgapi</artifactId>
- </dependency>
- <dependency>
- <groupId>com.sun.corba</groupId>
<artifactId>glassfish-corba-internal-api</artifactId>
</dependency>
<dependency>
- <groupId>org.glassfish.orb</groupId>
- <artifactId>orb-connector</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.glassfish.hk2</groupId>
<artifactId>hk2</artifactId>
</dependency>