From c190f7dcc2c0d6cc84956fc8443f60a12d8645e1 Mon Sep 17 00:00:00 2001
From: Stephen Vinoski <vinoski@apache.org>
Date: Wed, 20 Dec 2006 22:46:12 +0000
Subject: add clover support, fix logging level variables

Added support for the clover plugin to the top-level pom, and eliminated
redundant amqj.logging.level variables from module poms.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@489215 13f79535-47bb-0310-9956-ffa450edef68
---
 java/broker/pom.xml   |  4 +---
 java/client/pom.xml   |  1 -
 java/pom.xml          | 30 ++++++++++++++++++++++++++----
 java/systests/pom.xml |  1 -
 4 files changed, 27 insertions(+), 9 deletions(-)

(limited to 'java')

diff --git a/java/broker/pom.xml b/java/broker/pom.xml
index 5f4c490fd4..485fcf896b 100644
--- a/java/broker/pom.xml
+++ b/java/broker/pom.xml
@@ -34,7 +34,6 @@
 
     <properties>
         <topDirectoryLocation>..</topDirectoryLocation>
-        <amqj.logging.level>warn</amqj.logging.level>
     </properties>
 
     <dependencies>
@@ -95,7 +94,7 @@
                         <phase>generate-sources</phase>
                         <configuration>
                             <sourceDirectory>${basedir}/src/main/grammar</sourceDirectory>
-                            <outputDirectory>${basedir}/target/generated</outputDirectory>
+                            <outputDirectory>${basedir}/target/generated-sources</outputDirectory>
                             <packageName>org.apache.qpid.server.filter.jms.selector</packageName>
                         </configuration>
                         <goals>
@@ -104,7 +103,6 @@
                     </execution>
                 </executions>
             </plugin>
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
diff --git a/java/client/pom.xml b/java/client/pom.xml
index a280430ece..68e6f30e01 100644
--- a/java/client/pom.xml
+++ b/java/client/pom.xml
@@ -35,7 +35,6 @@
 
     <properties>
         <topDirectoryLocation>..</topDirectoryLocation>
-        <amqj.logging.level>warn</amqj.logging.level>
     </properties>
 
     <dependencies>
diff --git a/java/pom.xml b/java/pom.xml
index dd5280cfde..6cd745726f 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -87,6 +87,7 @@
         <eclipse.plugin.version>2.2</eclipse.plugin.version>
         <jar.version>2.0</jar.version>
         <javadoc.version>2.0</javadoc.version>
+        <junit.version>3.8.1</junit.version>
         <jxr.version>2.0</jxr.version>
         <mprojectinfo.version>2.0</mprojectinfo.version>
         <resources.version>2.2</resources.version>
@@ -94,9 +95,10 @@
         <surefire-report.version>2.1-SNAPSHOT</surefire-report.version>
         <surefire.version>2.2</surefire.version>
 
-        <amqj.logging.level>debug</amqj.logging.level>
+        <amqj.logging.level>warn</amqj.logging.level>
 
         <eclipse.workspace.dir>${basedir}/${topDirectoryLocation}/../workspace</eclipse.workspace.dir>
+        <clover.license.pathname>/set/clover/license/path/here</clover.license.pathname>
     </properties>
 
     <modules>
@@ -241,9 +243,25 @@
                         <downloadJavadocs>true</downloadJavadocs>
                     </configuration>
                 </plugin>
-
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clover-plugin</artifactId>
+                    <version>2.3</version>
+                    <configuration>
+                        <licenseLocation>${clover.license.pathname}</licenseLocation>
+                        <jdk>${java.source.version}</jdk>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <phase>verify</phase>
+                            <goals>
+                                <goal>instrument</goal>
+                                <goal>aggregate</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
             </plugins>
-
         </pluginManagement>
         <defaultGoal>install</defaultGoal>
     </build>
@@ -335,7 +353,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>3.8.1</version>
+                <version>${junit.version}</version>
                 <scope>test</scope>
             </dependency>
             <dependency>
@@ -399,6 +417,10 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>${javadoc.version}</version>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-clover-plugin</artifactId>
+            </plugin>
         </plugins>
     </reporting>
 
diff --git a/java/systests/pom.xml b/java/systests/pom.xml
index 93c8a2333b..c73e5f2c44 100644
--- a/java/systests/pom.xml
+++ b/java/systests/pom.xml
@@ -34,7 +34,6 @@
 
     <properties>
         <topDirectoryLocation>..</topDirectoryLocation>
-        <amqj.logging.level>warn</amqj.logging.level>
     </properties>
 
     <dependencies>
-- 
cgit v1.2.1