1. Don't configure src/main/java as resources dir. Remove <reosurces>
element altogether.
2. Don't hard code ant version.
Sahoo
On Wednesday 14 December 2011 09:29 PM, Shalini wrote:
> Introduced a new module that acts as a base for different database
> plugins. Removing the ant dependency from javadb-plugin and
> mysqldb-plugin as they are added in the common pom.xml. Please review
> these pom.xml changes below.
>
> Tests run : PaaS tests on native mode, KVM.
>
> Thanks
> Shalini.
>
> Index: appserver/paas/plugins/db-spe-common/pom.xml
> ===================================================================
> --- appserver/paas/plugins/db-spe-common/pom.xml (revision 0)
> +++ appserver/paas/plugins/db-spe-common/pom.xml (revision 0)
> @@ -0,0 +1,106 @@
> +<?xml version="1.0" encoding="UTF-8"?>
> +<!--
> +
> + DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
> +
> + Copyright (c) 2011 Oracle and/or its affiliates. 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
> + and Distribution License("CDDL") (collectively, the "License"). You
> + may not use this file except in compliance with the License. You
> can
> + obtain a copy of the License at
> + https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
> + or packager/legal/LICENSE.txt. See the License for the specific
> + language governing permissions and limitations under the License.
> +
> + When distributing the software, include this License Header
> Notice in each
> + file and include the License file at packager/legal/LICENSE.txt.
> +
> + GPL Classpath Exception:
> + Oracle designates this particular file as subject to the "Classpath"
> + exception as provided by Oracle in the GPL Version 2 section of
> the License
> + file that accompanied this code.
> +
> + Modifications:
> + If applicable, add the following below the License Header, with
> the fields
> + enclosed by brackets [] replaced by your own identifying
> information:
> + "Portions Copyright [year] [name of copyright owner]"
> +
> + Contributor(s):
> + If you wish your version of this file to be governed by only the
> CDDL or
> + only the GPL Version 2, indicate your decision by adding
> "[Contributor]
> + elects to include this software in this distribution under the
> [CDDL or GPL
> + Version 2] license." If you don't indicate a single choice of
> license, a
> + recipient has the option to distribute your version of this file
> under
> + either the CDDL, the GPL Version 2 or to extend the choice of
> license to
> + its licensees as provided above. However, if you add GPL Version
> 2 code
> + and therefore, elected the GPL Version 2 license, then the option
> applies
> + only if the new code is made subject to such option by the copyright
> + holder.
> +
> +-->
> +
> +<project xmlns="http://maven.apache.org/POM/4.0.0"
> xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
> http://maven.apache.org/maven-v4_0_0.xsd">
> + <parent>
> + <groupId>org.glassfish</groupId>
> + <artifactId>paas.plugins</artifactId>
> + <version>4.0-SNAPSHOT</version>
> + <relativePath>../pom.xml</relativePath>
> + </parent>
> + <modelVersion>4.0.0</modelVersion>
> + <groupId>org.glassfish</groupId>
> + <artifactId>paas.db-spe-common</artifactId>
> + <packaging>hk2-jar</packaging>
> + <version>4.0-SNAPSHOT</version>
> + <name>DB Service Provisioning Common</name>
> +
> + <build>
> + <resources>
> + <resource>
> + <directory>src/main/java</directory>
> + <includes>
> + <include>**/*.properties</include>
> + <include>**/*.xml</include>
> + </includes>
> + </resource>
> + <resource>
> + <directory>src/main/resources</directory>
> + </resource>
> + </resources>
> + </build>
> + <dependencies>
> + <dependency>
> + <groupId>org.glassfish.hk2</groupId>
> + <artifactId>hk2</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>org.glassfish.common</groupId>
> + <artifactId>glassfish-api</artifactId>
> + <version>${project.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.glassfish</groupId>
> + <artifactId>paas.orchestrator</artifactId>
> + <version>${project.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.glassfish.virtualization</groupId>
> + <artifactId>virt-api</artifactId>
> + <version>${project.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.glassfish</groupId>
> + <artifactId>paas.spe-base</artifactId>
> + <version>${project.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.ant</groupId>
> + <artifactId>ant</artifactId>
> + <optional>true</optional>
> + <version>1.8.1</version>
> + </dependency>
> + </dependencies>
> +</project>
> +
> Index: appserver/paas/plugins/javadb-plugin/pom.xml
> ===================================================================
> --- appserver/paas/plugins/javadb-plugin/pom.xml (revision 51555)
> +++ appserver/paas/plugins/javadb-plugin/pom.xml (working copy)
> @@ -90,11 +90,10 @@
> <artifactId>virt-api</artifactId>
> <version>${project.version}</version>
> </dependency>
> - <dependency>
> - <groupId>org.apache.ant</groupId>
> - <artifactId>ant</artifactId>
> - <optional>true</optional>
> - <version>1.8.1</version>
> + <dependency>
> + <groupId>org.glassfish</groupId>
> + <artifactId>paas.db-spe-common</artifactId>
> + <version>${project.version}</version>
> </dependency>
> </dependencies>
> </project>
> Index: appserver/paas/plugins/mysql-db-plugin/pom.xml
> ===================================================================
> --- appserver/paas/plugins/mysql-db-plugin/pom.xml (revision 51555)
> +++ appserver/paas/plugins/mysql-db-plugin/pom.xml (working copy)
> @@ -90,11 +90,10 @@
> <artifactId>virt-api</artifactId>
> <version>${project.version}</version>
> </dependency>
> - <dependency>
> - <groupId>org.apache.ant</groupId>
> - <artifactId>ant</artifactId>
> - <optional>true</optional>
> - <version>1.8.1</version>
> + <dependency>
> + <groupId>org.glassfish</groupId>
> + <artifactId>paas.db-spe-common</artifactId>
> + <version>${project.version}</version>
> </dependency>
> </dependencies>
> </project>
> Index: appserver/paas/plugins/pom.xml
> ===================================================================
> --- appserver/paas/plugins/pom.xml (revision 51555)
> +++ appserver/paas/plugins/pom.xml (working copy)
> @@ -55,6 +55,7 @@
> <name>GlassFish Service Plugins Modules</name>
> <modules>
> <module>spe-base</module>
> + <module>db-spe-common</module>
> <module>glassfish-plugin</module>
> <module>javadb-plugin</module>
> <module>load-balancer-plugin</module>
>