You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by vi...@apache.org on 2006/12/20 23:46:13 UTC
svn commit: r489215 - in /incubator/qpid/trunk/qpid/java: broker/pom.xml
client/pom.xml pom.xml systests/pom.xml
Author: vinoski
Date: Wed Dec 20 14:46:12 2006
New Revision: 489215
URL: http://svn.apache.org/viewvc?view=rev&rev=489215
Log:
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.
Modified:
incubator/qpid/trunk/qpid/java/broker/pom.xml
incubator/qpid/trunk/qpid/java/client/pom.xml
incubator/qpid/trunk/qpid/java/pom.xml
incubator/qpid/trunk/qpid/java/systests/pom.xml
Modified: incubator/qpid/trunk/qpid/java/broker/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/pom.xml?view=diff&rev=489215&r1=489214&r2=489215
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/broker/pom.xml Wed Dec 20 14:46:12 2006
@@ -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>
Modified: incubator/qpid/trunk/qpid/java/client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/client/pom.xml?view=diff&rev=489215&r1=489214&r2=489215
==============================================================================
--- incubator/qpid/trunk/qpid/java/client/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/client/pom.xml Wed Dec 20 14:46:12 2006
@@ -35,7 +35,6 @@
<properties>
<topDirectoryLocation>..</topDirectoryLocation>
- <amqj.logging.level>warn</amqj.logging.level>
</properties>
<dependencies>
Modified: incubator/qpid/trunk/qpid/java/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/pom.xml?view=diff&rev=489215&r1=489214&r2=489215
==============================================================================
--- incubator/qpid/trunk/qpid/java/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/pom.xml Wed Dec 20 14:46:12 2006
@@ -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>
@@ -398,6 +416,10 @@
<groupId>org.apache.maven.plugins</groupId>
<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>
Modified: incubator/qpid/trunk/qpid/java/systests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/systests/pom.xml?view=diff&rev=489215&r1=489214&r2=489215
==============================================================================
--- incubator/qpid/trunk/qpid/java/systests/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/systests/pom.xml Wed Dec 20 14:46:12 2006
@@ -34,7 +34,6 @@
<properties>
<topDirectoryLocation>..</topDirectoryLocation>
- <amqj.logging.level>warn</amqj.logging.level>
</properties>
<dependencies>