dev@glassfish.java.net

pom review: top level, admin/cli, gms, packager/shoal

From: Bobby Bissett <bobby.bissett_at_oracle.com>
Date: Thu, 12 Aug 2010 16:37:25 -0400

This is needed for integrating the "asadmin validate-multicast" command into GF. I need to use a later version of shoal that contains the right code. Part of the diff is that there is no longer a shoal-backing-store package.

Thanks,
Bobby

Index: cluster/gms-adapter/pom.xml
===================================================================
--- cluster/gms-adapter/pom.xml (revision 39644)
+++ cluster/gms-adapter/pom.xml (working copy)
@@ -73,6 +73,11 @@
             <artifactId>config-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+ <dependency>
+ <groupId>org.glassfish.admin</groupId>
+ <artifactId>admin-cli</artifactId>
+ <version>${project.parent.version}</version>
+ </dependency>
 
         <dependency>
             <groupId>org.shoal</groupId>
Index: pom.xml
===================================================================
--- pom.xml (revision 39644)
+++ pom.xml (working copy)
@@ -168,7 +168,7 @@
         <v3-docs.version>3.0-b08</v3-docs.version>
         <l10n.version>3.0-b73</l10n.version>
         <asm.version>3.1</asm.version>
- <shoal.version>1.5.6</shoal.version>
+ <shoal.version>1.5.9</shoal.version>
         <ha-api.version>3.1.1</ha-api.version>
     </properties>
 
@@ -1378,11 +1378,6 @@
             </dependency>
             <dependency>
                 <groupId>org.shoal</groupId>
- <artifactId>shoal-backing-store</artifactId>
- <version>${shoal.version}</version>
- </dependency>
- <dependency>
- <groupId>org.shoal</groupId>
                 <artifactId>shoal-cache</artifactId>
                 <version>${shoal.version}</version>
             </dependency>
Index: packager/shoal/pom.xml
===================================================================
--- packager/shoal/pom.xml (revision 39644)
+++ packager/shoal/pom.xml (working copy)
@@ -82,10 +82,6 @@
           </dependency>
           <dependency>
               <groupId>org.shoal</groupId>
- <artifactId>shoal-backing-store</artifactId>
- </dependency>
- <dependency>
- <groupId>org.shoal</groupId>
               <artifactId>shoal-cache</artifactId>
           </dependency>
 
Index: packager/resources/pkg_conf.py
===================================================================
--- packager/resources/pkg_conf.py (revision 39644)
+++ packager/resources/pkg_conf.py (working copy)
@@ -28,7 +28,7 @@
 grizzly_version="1.9.19,0-1"
 metro_version="2.1,0-9"
 javahelp_version="2.0.2,0-0"
-shoal_version="1.5.6,0-0"
+shoal_version="1.5.9,0-0"
 
 #description
 glassfish_description="GlassFish Application Server"
Index: admin/cli/pom.xml
===================================================================
--- admin/cli/pom.xml (revision 39644)
+++ admin/cli/pom.xml (working copy)
@@ -134,7 +134,7 @@
                             <mainClass>com.sun.enterprise.admin.cli.AsadminMain</mainClass>
                         </manifest>
                         <manifestEntries>
- <Class-Path>cli-optional.jar cluster-cli.jar glassfish.jar server-mgmt.jar common-util.jar admin-util.jar launcher.jar backup.jar admin-cli-l10n.jar security.jar glassfish-api.jar hk2.jar branding-fragment.jar branding.jar</Class-Path>
+ <Class-Path>cli-optional.jar cluster-cli.jar glassfish.jar server-mgmt.jar common-util.jar admin-util.jar launcher.jar backup.jar admin-cli-l10n.jar security.jar glassfish-api.jar hk2.jar branding-fragment.jar branding.jar gms-adapter.jar</Class-Path>
                         <!-- 5776: we do not need backup jar entry, but I retain it, Kedar -->
                         </manifestEntries>
                     </archive>