Revision
6972 <http://fisheye.codehaus.org/changelog/mojo/?cs=6972>
Author
gleclaire
Date
2008-05-13 14:47:18 -0500 (Tue, 13 May 2008)
Log Message
re-base line
Modified Paths
* branches/findbugs-maven-plugin-2.0.x/pom.xml
<#branchesfindbugsmavenplugin20xpomxml>
*
branches/findbugs-maven-plugin-2.0.x/src/main/groovy/org/codehaus/mojo/findbugs/FindBugsMojo.groovy
<#branchesfindbugsmavenplugin20xsrcmaingroovyorgcodehausmojofindbugsFindBugsMojogroovy>
*
branches/findbugs-maven-plugin-2.0.x/src/main/groovy/org/codehaus/mojo/findbugs/FindbugsXdocSink.groovy
<#branchesfindbugsmavenplugin20xsrcmaingroovyorgcodehausmojofindbugsFindbugsXdocSinkgroovy>
Diff
Modified: branches/findbugs-maven-plugin-2.0.x/pom.xml (6971
=> 6972)
--- branches/findbugs-maven-plugin-2.0.x/pom.xml 2008-05-13
05:26:29 UTC (rev 6971)
+++ branches/findbugs-maven-plugin-2.0.x/pom.xml 2008-05-13
19:47:18 UTC (rev 6972)
@@ -1,274 +1,173 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed
with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License,
Version 2.0
- (the "License"); you may not use this file except in compliance
with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<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";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>mojo</artifactId>
- <groupId>org.codehaus.mojo</groupId>
- <version>16</version>
- </parent>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- <packaging>maven-plugin</packaging>
- <name>FindBugs GMaven Plugin</name>
- <issueManagement>
- <system>JIRA</system>
- <url>http://jira.codehaus.org/browse/MFINDBUGS</url>
- </issueManagement>
- <inceptionYear>2005</inceptionYear>
- <prerequisites>
- <maven>2.0.6</maven>
- </prerequisites>
- <description>This Plug-In generates reports based on the FindBugs
Library</description>
- <developers>
- <developer>
- <id>cr</id>
- <name>Cyrill Ruettimann</name>
- <email>[EMAIL PROTECTED]</email>
- <roles>
- <role>Documentation</role>
- <role>Java Developer</role>
- </roles>
- <timezone>+1</timezone>
- </developer>
- <developer>
- <id>gl</id>
- <name>Garvin LeClaire</name>
- <email>[EMAIL PROTECTED]</email>
- <url>http://gdleclaire.blogspot.com</url>
- <roles>
- <role>Documentation</role>
- <role>Java Developer</role>
- </roles>
- <timezone>-5</timezone>
- </developer>
- </developers>
- <contributors>
- <contributor>
- <name>Detlef Pleiss</name>
- <email>[EMAIL PROTECTED]</email>
- <organization>comundus GmbH</organization>
- <organizationUrl>http://www.comundus.com</organizationUrl>
- <roles>
- <role>Java Developer</role>
- </roles>
- <timezone>+1</timezone>
- </contributor>
- </contributors>
- <licenses>
- <license>
- <name>Apache 2.0</name>
- <url>LICENSE.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-core</artifactId>
- <version>1.0-alpha-10</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-site-renderer</artifactId>
- <version>1.0-alpha-10</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-decoration-model</artifactId>
- <version>1.0-alpha-8</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-xhtml</artifactId>
- <version>1.0-alpha-10</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-java</artifactId>
- <version>2.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-ant</artifactId>
- <version>2.4.1</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-resources</artifactId>
- <version>1.0-alpha-4</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.5.1</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <dependencies>
-<!-- --->
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-core</artifactId>
+<?xml version="1.0" encoding="UTF-8"?>
+<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 ">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>mojo</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <version>16</version>
+ </parent>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <packaging>maven-plugin</packaging>
+ <name>FindBugs GMaven Plugin</name>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://jira.codehaus.org/browse/MFINDBUGS</url>
+ </issueManagement>
+ <inceptionYear>2005</inceptionYear>
+ <prerequisites>
+ <maven>2.0.5</maven>
+ </prerequisites>
+ <description>
+ This Plug-In generates reports based on the FindBugs Library
+ </description>
+ <developers>
+ <developer>
+ <id>cr</id>
+ <name>Cyrill Ruettimann</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization />
+ <roles>
+ <role>Documentation</role>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </developer>
+ <developer>
+ <id>gl</id>
+ <name>Garvin LeClaire</name>
+ <email>[EMAIL PROTECTED]</email>
+ <url>http://gdleclaire.blogspot.com</url>
+ <organization />
+ <roles>
+ <role>Documentation</role>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>-5</timezone>
+ </developer>
+ </developers>
+ <contributors>
+ <contributor>
+ <name>Detlef Pleiss</name>
+ <email>[EMAIL PROTECTED]</email>
+ <organization>comundus GmbH</organization>
+ <organizationUrl>http://www.comundus.com</organizationUrl>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ <timezone>+1</timezone>
+ </contributor>
+ </contributors>
+ <licenses>
+ <license>
+ <name>Apache 2.0</name>
+ <url>LICENSE.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <properties>
+ <doxia.version>1.0-alpha-8</doxia.version>
+ <groovy.plugin.version>1.0-beta-2</groovy.plugin.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-impl</artifactId>
+ <version>2.0.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-core</artifactId>
+ <version>${doxia.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.findbugs</groupId>
+ <artifactId>findbugs</artifactId>
+ <version>1.3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.mojo.groovy</groupId>
+ <artifactId>groovy-mojo-support</artifactId>
+ <version>${groovy.plugin.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-site-renderer</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-decoration-model</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-xhtml</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-java</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.plugin-tools</groupId>
- <artifactId>maven-plugin-tools-ant</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-impl</artifactId>
- <version>2.0.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.reporting</groupId>
- <artifactId>maven-reporting-api</artifactId>
- <version>2.0.5</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.findbugs</groupId>
- <artifactId>findbugs</artifactId>
- <version>1.3.2</version>
- </dependency>
- <dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-resources</artifactId>
+ <version>1.0-alpha-4</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
+ <version>1.5.1</version>
</dependency>
-<!-- --->
- <dependency>
- <groupId>org.codehaus.groovy.maven</groupId>
- <artifactId>gmaven-mojo</artifactId>
- <version>1.0-beta-4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy.maven.runtime</groupId>
- <artifactId>gmaven-runtime-default</artifactId>
- <version>1.0-beta-4-SNAPSHOT</version>
- </dependency>
- </dependencies>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
- </plugin>
- </plugins>
- </pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.codehaus.groovy.maven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>1.0-beta-4-SNAPSHOT</version>
- <executions>
- <execution>
- <goals>
- <goal>generateStubs</goal>
- <goal>compile</goal>
- <goal>generateTestStubs</goal>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <configuration>
- <additionalProjectnatures>
-
<projectnature>org.codehaus.groovy.eclipse.groovyNature</projectnature>
- </additionalProjectnatures>
- <additionalBuildcommands>
-
<buildcommand>org.codehaus.groovy.eclipse.groovyBuilder</buildcommand>
- </additionalBuildcommands>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>changes-report</report>
- </reports>
- </reportSet>
- </reportSets>
- <configuration>
-
<issueLinkTemplate>http://jira.codehaus.org/browse/%ISSUE%</issueLinkTemplate>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
- <properties>
-
<netbeans.hint.useExternalMaven>true</netbeans.hint.useExternalMaven>
- </properties>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo.groovy</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <version>${groovy.plugin.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.3</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.mojo.groovy</groupId>
+ <artifactId>groovy-mojo-tools</artifactId>
+ <version>${groovy.plugin.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <additionalProjectnatures>
+
<projectnature>org.codehaus.groovy.eclipse.groovyNature</projectnature>
+ </additionalProjectnatures>
+ <additionalBuildcommands>
+
<buildcommand>org.codehaus.groovy.eclipse.groovyBuilder</buildcommand>
+ </additionalBuildcommands>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changes-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>changes-report</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ <configuration>
+
<issueLinkTemplate>http://jira.codehaus.org/browse/%ISSUE%</issueLinkTemplate>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <scm>
+
<connection>scm:svn:http://svn.codehaus.org/mojo/tags/findbugs-maven-plugin-1.2</connection>
+
<developerConnection>scm:svn:https://svn.codehaus.org/mojo/tags/findbugs-maven-plugin-1.2</developerConnection>
+
<url>http://svn.codehaus.org/mojo/tags/findbugs-maven-plugin-1.2</url>
+ </scm>
</project>
Modified:
branches/findbugs-maven-plugin-2.0.x/src/main/groovy/org/codehaus/mojo/findbugs/FindBugsMojo.groovy
(6971 => 6972)
---
branches/findbugs-maven-plugin-2.0.x/src/main/groovy/org/codehaus/mojo/findbugs/FindBugsMojo.groovy
2008-05-13 05:26:29 UTC (rev 6971)
+++
branches/findbugs-maven-plugin-2.0.x/src/main/groovy/org/codehaus/mojo/findbugs/FindBugsMojo.groovy
2008-05-13 19:47:18 UTC (rev 6972)
@@ -342,7 +342,7 @@
* @required
* @readonly
*/
- private ResourceManager resourceManager
+ ResourceManager resourceManager
/**
* Checks whether prerequisites for generating this report are
given.
Modified:
branches/findbugs-maven-plugin-2.0.x/src/main/groovy/org/codehaus/mojo/findbugs/FindbugsXdocSink.groovy
(6971 => 6972)
---
branches/findbugs-maven-plugin-2.0.x/src/main/groovy/org/codehaus/mojo/findbugs/FindbugsXdocSink.groovy
2008-05-13 05:26:29 UTC (rev 6971)
+++
branches/findbugs-maven-plugin-2.0.x/src/main/groovy/org/codehaus/mojo/findbugs/FindbugsXdocSink.groovy
2008-05-13 19:47:18 UTC (rev 6972)
@@ -21,9 +21,9 @@
import java.io.Writer
-//import org.apache.maven.doxia.module.HtmlTools
+import org.apache.maven.doxia.module.HtmlTools
import org.apache.maven.doxia.sink.SinkAdapter
-import org.apache.maven.doxia.util.HtmlTools
+//import org.apache.maven.doxia.util.HtmlTools
import org.apache.maven.doxia.util.LineBreaker
/**
--------------------------------------------------------------------------------
To unsubscribe from this list please visit:
http://xircles.codehaus.org/manage_email
