On 3/7/13 6:20 PM, Tom Mueller wrote:
> Please review the following changes to fix the class-path of
> admin-cli.jar so that glassfish.jar, gms-adapter.jar and
> j-interop-repackaged.jar are not included (because they are not
> needed). This is for GLASSFISH-19780
> <http://java.net/jira/browse/GLASSFISH-19780>.
Looks good.
Can I ask you to change ${project.parent.version} to ${project.version} ?
Thanks,
Romain
>
> Thanks.
> Tom
>
> Index: nucleus/common/common-util/pom.xml
> ===================================================================
> --- nucleus/common/common-util/pom.xml (revision 60149)
> +++ nucleus/common/common-util/pom.xml (working copy)
> @@ -107,11 +107,6 @@
> <version>${project.version}</version>
> </dependency>
> <dependency>
> - <groupId>org.glassfish.main.external</groupId>
> - <artifactId>j-interop-repackaged</artifactId>
> - <version>${project.version}</version>
> - </dependency>
> - <dependency>
> <groupId>org.glassfish.annotations</groupId>
> <artifactId>logging-annotation-processor</artifactId>
> <optional>true</optional>
> Index: nucleus/admin/launcher/pom.xml
> ===================================================================
> --- nucleus/admin/launcher/pom.xml (revision 60149)
> +++ nucleus/admin/launcher/pom.xml (working copy)
> @@ -74,14 +74,9 @@
> <groupId>org.glassfish.main.common</groupId>
> <artifactId>common-util</artifactId>
> <version>${project.version}</version>
> - </dependency>
> + </dependency>
> <dependency>
> <groupId>org.glassfish.main.core</groupId>
> - <artifactId>glassfish</artifactId>
> - <version>${project.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>org.glassfish.main.core</groupId>
> <artifactId>logging</artifactId>
> <version>${project.version}</version>
> </dependency>
> Index: nucleus/admin/cli/pom.xml
> ===================================================================
> --- nucleus/admin/cli/pom.xml (revision 60149)
> +++ nucleus/admin/cli/pom.xml (working copy)
> @@ -121,9 +121,6 @@
> <manifest>
> <mainClass>com.sun.enterprise.admin.cli.AdminMain</mainClass>
> </manifest>
> - <manifestEntries>
> - <Class-Path>endorsed/javax.annotation-api.jar config-api.jar
> cluster-cli.jar glassfish.jar server-mgmt.jar common-util.jar
> admin-util.jar launcher.jar admin-cli-l10n.jar glassfish-api.jar
> hk2.jar hk2-config.jar hk2-deprecated.jar hk2-api.jar core.jar
> gms-adapter.jar logging.jar jettison.jar jackson-core-asl.jar
> mimepull.jar</Class-Path>
> - </manifestEntries>
> </archive>
> </configuration>
> </plugin>
> @@ -144,7 +141,7 @@
> <artifactId>admin-cli-manpage</artifactId>
> <version>${v3-docs.version}</version>
> <type>zip</type>
> - <overWrite>true</overWrite>
> + <overWrite>false</overWrite>
> <outputDirectory>${project.build.outputDirectory}</outputDirectory>
> </artifactItem>
> </artifactItems>
> @@ -184,40 +181,22 @@
> <artifactId>hk2</artifactId>
> </dependency>
> <dependency>
> - <groupId>org.glassfish.hk2.external</groupId>
> - <artifactId>asm-all-repackaged</artifactId>
> - <version>${hk2.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>org.glassfish.main.core</groupId>
> - <artifactId>glassfish</artifactId>
> - <version>${project.parent.version}</version>
> - </dependency>
> - <dependency>
> <groupId>org.glassfish.main.common</groupId>
> <artifactId>common-util</artifactId>
> <version>${project.parent.version}</version>
> - </dependency>
> + </dependency>
> <dependency>
> - <groupId>org.glassfish.main.admin</groupId>
> - <artifactId>admin-util</artifactId>
> - <version>${project.parent.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>org.jvnet.mimepull</groupId>
> - <artifactId>mimepull</artifactId>
> - </dependency>
> - <dependency>
> <groupId>org.codehaus.jettison</groupId>
> <artifactId>jettison</artifactId>
> - </dependency>
> + </dependency>
> <dependency>
> - <groupId>org.codehaus.jackson</groupId>
> - <artifactId>jackson-core-asl</artifactId>
> + <groupId>org.glassfish.main.admin</groupId>
> + <artifactId>launcher</artifactId>
> + <version>${project.parent.version}</version>
> </dependency>
> <dependency>
> <groupId>org.glassfish.main.admin</groupId>
> - <artifactId>launcher</artifactId>
> + <artifactId>admin-util</artifactId>
> <version>${project.parent.version}</version>
> </dependency>
> <dependency>
> @@ -225,5 +204,10 @@
> <artifactId>glassfish-api</artifactId>
> <version>${project.parent.version}</version>
> </dependency>
> + <dependency>
> + <groupId>org.glassfish.main.common</groupId>
> + <artifactId>simple-glassfish-api</artifactId>
> + <version>${project.parent.version}</version>
> + </dependency>
> </dependencies>
> </project>