On Sep 24, 2009, at 2:28 PM, Sahoo wrote:
> Please remove <version> element for javahelp from this pom.xml. Add
> the following entry in v3/pom.xml under
> <dependencyManagement><dependencies>:
>
> <dependency>
> <groupId>javax.help</groupId>
> <artifactId>javahelp</artifactId>
> <version>2.0.02</version>
> </dependency>
>
> Send the files for review again.
Here are the diffs. I still can't build the workspace, but frankly am
sick of trying. Do you see any problems with these? Will commit if I
can build, but an initial test shows that I can build a fresh
workspace and not this one, which may be (for all I know) that you
can't build two workspaces at the same time using maven due to local
repository conflicts. I'd love to know if that's the case.
Anyway:
hostname% svn diff
Index: pom.xml
===================================================================
--- pom.xml (revision 31865)
+++ pom.xml (working copy)
@@ -3,7 +3,7 @@
/*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
*
-* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+* Copyright 1997-2009 Sun Microsystems, Inc. All rights reserved.
*
* The contents of this file are subject to the terms of either the GNU
* General Public License Version 2 only ("GPL") or the Common
Development
@@ -998,6 +998,12 @@
<artifactId>jersey-multipart</artifactId>
<version>${jersey.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>javax.help</groupId>
+ <artifactId>javahelp</artifactId>
+ <version>2.0.02</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<!-- End: Dependency management -->
Index: extras/upgrade/upgrade-jar/lib/javahelp-2.0.02.jar
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: extras/upgrade/upgrade-jar/pom.xml
===================================================================
--- extras/upgrade/upgrade-jar/pom.xml (revision 31865)
+++ extras/upgrade/upgrade-jar/pom.xml (working copy)
@@ -63,7 +63,7 @@
<mainClass>com.sun.enterprise.tools.upgrade.UpgradeToolMain</mainClass>
</manifest>
<manifestEntries>
- <Class-Path>kernel.jar admin-cli.jar stax-
osgi.jar admin-cli-l10n.jar javahelp-2.0.02.jar</Class-Path>
+ <Class-Path>common-util.jar javahelp.jar</
Class-Path>
</manifestEntries>
</archive>
</configuration>
@@ -77,40 +77,5 @@
<artifactId>common-util</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.glassfish.admin</groupId>
- <artifactId>admin-cli</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.admin</groupId>
- <artifactId>cli-framework</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.admin</groupId>
- <artifactId>server-mgmt</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.deployment</groupId>
- <artifactId>deployment-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.deployment</groupId>
- <artifactId>dol</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.core</groupId>
- <artifactId>kernel</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.help</groupId>
- <artifactId>javahelp</artifactId>
- <version>2.0.02</version>
- </dependency>
</dependencies>
</project>