The changes below have three purposes:
1. Remove some formerly commented-out lines to clean up the file.
2. Move the extraction of the man page from its own maven-dependency-
plugin section, merging it with the previously-existing maven-
dependency-plugin section (maven was ignoring the second one so the
man page was never extracted and therefore never included in the JAR).
3. Remove some dependencies that are no longer needed.
The diffs are lengthy mostly because of the removals. I've also
attached the entire new version of the file. (Deployment devtests,
single-node and cluster, and QL have all passed.)
Thanks.
- Tim
Diffs:
Index: appclient/client/acc/pom.xml
===================================================================
--- appclient/client/acc/pom.xml (revision 40254)
+++ appclient/client/acc/pom.xml (working copy)
@@ -143,57 +143,37 @@
<includes>**/*.dtd,**/*.xsd</includes>
</configuration>
</execution>
- </executions>
+ <execution>
+ <id>unpack</id>
+ <phase>process-classes</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+
<groupId>org.glassfish.docs.man</groupId>
+ <artifactId>appclient-client-
acc-manpage</artifactId>
+ <version>${v3-docs.version}</
version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>$
{project.build.outputDirectory}</outputDirectory>
+ <excludes>META-INF/**</excludes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
<plugin>
-
-<!--
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
--->
-
<groupId>com.sun.enterprise</groupId>
<artifactId>hk2-maven-plugin</artifactId>
-<!--
-
- <version>2.2</version>
- -->
-<!--
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-archiver</artifactId>
-
- <version>2.4</version>
- </dependency>
- </dependencies>
--->
-<!-- <executions>
- <execution>
- <id>build-stand-alone-JAR</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
--->
<configuration>
<archive>
<manifest>
<mainClass>org.glassfish.appclient.client.acc.AppClientCommand</
mainClass>
-<!--
-
<packageName>org.glassfish.appclient.client.acc</packageName>
--->
-<!--
- <addClasspath>true</addClasspath>
--->
-
- <!-- This is avl in archiver plug-in 2.4 only; it doesn't seem to
work -->
- <!--
- <classpathLayoutType>custom</
classpathLayoutType>
- <customClasspathLayout>$
{artifact.artifactId}${dashClassifier?}.${artifact.extension}</
customClasspathLayout>
- -->
</manifest>
<!--
It's discouraging to have to
specify the class path
@@ -204,44 +184,9 @@
the distributions the version
strings are
stripped off.
-->
-<!--
- <manifestEntries>
- <Class-Path>hk2.jar common-
util.jar security.jar container-common.jar dol.jar glassfish-api.jar
webservices.security.jar web-naming.jar glassfish-corba-orb.jar</Class-
Path>
- </manifestEntries>
--->
</archive>
</configuration>
-<!--
- </execution>
- </executions>
--->
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>process-classes</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
-
<groupId>org.glassfish.docs.man</groupId>
- <artifactId>appclient-client-
acc-manpage</artifactId>
- <version>${v3-docs.version}</
version>
- <type>jar</type>
- <overWrite>true</overWrite>
- <outputDirectory>$
{project.build.outputDirectory}</outputDirectory>
- <excludes>META-INF/**</excludes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
@@ -250,21 +195,7 @@
<groupId>com.sun.enterprise</groupId>
<artifactId>hk2</artifactId>
</dependency>
-<!--
- <dependency>
- <groupId>org.glassfish.common</groupId>
- <artifactId>glassfish-api</artifactId>
- <version>${project.version}</version>
- </dependency>
--->
-<!--
- <dependency>
- <groupId>com.sun.enterprise</groupId>
- <artifactId>hk2-core</artifactId>
- </dependency>
--->
-
<!--
required for annotation processing support
-->
@@ -273,11 +204,6 @@
<artifactId>common-util</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.glassfish.security</groupId>
- <artifactId>security</artifactId>
- <version>${project.version}</version>
- </dependency>
<dependency>
<groupId>org.glassfish.ejb</groupId>
@@ -347,14 +273,7 @@
<version>${project.version}</version>
</dependency>
- <!-- required for DirContextURLStreamHandler and its factory
-->
<dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>web-naming</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.glassfish.common</groupId>
<artifactId>glassfish-naming</artifactId>
<version>${project.version}</version>
@@ -408,34 +327,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.glassfish.admin</groupId>
- <artifactId>config-api</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.glassfish.hk2.external</groupId>
- <artifactId>asm-all-repackaged</artifactId>
- <version>${hk2.version}</version>
- </dependency>
-<!--
-<dependency>
- <groupId>org.glassfish.deployment</groupId>
- <artifactId>deployment-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.core</groupId>
- <artifactId>kernel</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.deployment</groupId>
- <artifactId>deployment-admin</artifactId>
- <version>${project.version}</version>
- </dependency>
--->
<dependency>
<groupId>org.glassfish.transaction</groupId>
<artifactId>jts</artifactId>