Revision: 691 Author: allain.lalonde Date: Fri Oct 9 07:18:24 2009 Log: Removing FindBugs Excludes, since all they did was remove tests from the examples modules. Instead I removed the unnecessary reporting from examples.
Also, I've removed the umlgraph from the javadoc. It's useful, but it causes the build to complain loudly on windows machines. Am not against putting something similar back in once we figure out how to make it play nicer. http://code.google.com/p/piccolo2d/source/detail?r=691 Deleted: /piccolo2d.java/trunk/core/src/build/conf/findbugs-exclude.xml /piccolo2d.java/trunk/examples/src/build/conf/findbugs-exclude.xml /piccolo2d.java/trunk/extras/src/build/conf/findbugs-exclude.xml /piccolo2d.java/trunk/swt/src/build/conf/findbugs-exclude.xml Modified: /piccolo2d.java/trunk/core/pom.xml /piccolo2d.java/trunk/examples/pom.xml /piccolo2d.java/trunk/extras/pom.xml /piccolo2d.java/trunk/parent/pom.xml /piccolo2d.java/trunk/swt/pom.xml ======================================= --- /piccolo2d.java/trunk/core/src/build/conf/findbugs-exclude.xml Thu Oct 8 16:15:53 2009 +++ /dev/null @@ -1,11 +0,0 @@ -<FindBugsFilter> - <Match> - <Class name="~.*Test" /> - </Match> - <Match> - <Or> - <Package name="~.*\.examples" /> - <Package name="~.*\.tutorial" /> - </Or> - </Match> -</FindBugsFilter> ======================================= --- /piccolo2d.java/trunk/examples/src/build/conf/findbugs-exclude.xml Thu Oct 8 16:15:53 2009 +++ /dev/null @@ -1,11 +0,0 @@ -<FindBugsFilter> - <Match> - <Class name="~.*Test" /> - </Match> - <Match> - <Or> - <Package name="~.*\.examples" /> - <Package name="~.*\.tutorial" /> - </Or> - </Match> -</FindBugsFilter> ======================================= --- /piccolo2d.java/trunk/extras/src/build/conf/findbugs-exclude.xml Thu Oct 8 16:15:53 2009 +++ /dev/null @@ -1,11 +0,0 @@ -<FindBugsFilter> - <Match> - <Class name="~.*Test" /> - </Match> - <Match> - <Or> - <Package name="~.*\.examples" /> - <Package name="~.*\.tutorial" /> - </Or> - </Match> -</FindBugsFilter> ======================================= --- /piccolo2d.java/trunk/swt/src/build/conf/findbugs-exclude.xml Thu Oct 8 16:15:53 2009 +++ /dev/null @@ -1,11 +0,0 @@ -<FindBugsFilter> - <Match> - <Class name="~.*Test" /> - </Match> - <Match> - <Or> - <Package name="~.*\.examples" /> - <Package name="~.*\.tutorial" /> - </Or> - </Match> -</FindBugsFilter> ======================================= --- /piccolo2d.java/trunk/core/pom.xml Thu Oct 8 20:00:09 2009 +++ /piccolo2d.java/trunk/core/pom.xml Fri Oct 9 07:18:24 2009 @@ -31,7 +31,95 @@ <artifactId>maven-checkstyle-plugin</artifactId> <configuration> <configLocation>${basedir}/src/build/conf/checkstyle.xml</configLocation> - <enableRulesSummary>false</enableRulesSummary> + <enableRulesSummary>false</enableRulesSummary> + </configuration> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <source>1.4</source> + <verbose>false</verbose> + <show>package</show> + <links> + <link> + http://java.sun.com/j2se/1.4.2/docs/api/ + </link> + </links> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-report-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-changelog-plugin</artifactId> + <!-- + configuration> <connectionType>connection</connectionType> + </configuration + --> + </plugin> + <plugin> + <artifactId>maven-jxr-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>taglist-maven-plugin</artifactId> + <configuration> + <tags> + <tag>TODO</tag> + <tag>FIXME</tag> + <tag>@todo</tag> + <tag>@deprecated</tag> + </tags> + </configuration> + </plugin> + <plugin> + <artifactId> + maven-project-info-reports-plugin + </artifactId> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + <configuration> + <sourceEncoding>ascii</sourceEncoding> + <targetJdk>1.4</targetJdk> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jdepend-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>2.1</version> + <configuration> + <!-- http://wiki.hudson-ci.org/display/HUDSON/FindBugs+Plugin --> + <findbugsXmlOutput>true</findbugsXmlOutput> + <findbugsXmlWithMessages>true</findbugsXmlWithMessages> + <xmlOutput>true</xmlOutput> + <xmlOutputDirectory>target/site</xmlOutputDirectory> + <includeTests>false</includeTests> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <configuration> + <formats> + <format>xml</format> + <format>html</format> + </formats> + <instrumentation> + <ignores> + <ignore>edu.umd.cs.piccolo.examples.*</ignore> + <ignore>edu.umd.cs.piccolo.examples.pswing.*</ignore> + <ignore>edu.umd.cs.piccolo.examples.swt.*</ignore> + <ignore>edu.umd.cs.piccolo.tutorial.*</ignore> + </ignores> + <excludes> + <exclude>edu/umd/cs/piccolo/examples/**</exclude> + </excludes> + </instrumentation> </configuration> </plugin> </plugins> ======================================= --- /piccolo2d.java/trunk/examples/pom.xml Thu Oct 8 20:00:09 2009 +++ /piccolo2d.java/trunk/examples/pom.xml Fri Oct 9 07:18:24 2009 @@ -35,30 +35,5 @@ scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk/examples </developerConnection> <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/trunk/examples</url> - </scm> - <reporting> - <plugins> - <!-- don't use UmlGraph as the current settings (see ../parent/pom.xml) cause pain with swt --> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <source>1.4</source> - <verbose>false</verbose> - <show>package</show> - <links> - <link> - http://java.sun.com/j2se/1.4.2/docs/api/ - </link> - </links> - </configuration> - </plugin> - <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> - <configuration> - <configLocation>${basedir}/src/build/conf/checkstyle.xml</configLocation> - <enableRulesSummary>false</enableRulesSummary> - </configuration> - </plugin> - </plugins> - </reporting> + </scm> </project> ======================================= --- /piccolo2d.java/trunk/extras/pom.xml Thu Oct 8 20:00:09 2009 +++ /piccolo2d.java/trunk/extras/pom.xml Fri Oct 9 07:18:24 2009 @@ -41,6 +41,94 @@ <enableRulesSummary>false</enableRulesSummary> </configuration> </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <source>1.4</source> + <verbose>false</verbose> + <show>package</show> + <links> + <link> + http://java.sun.com/j2se/1.4.2/docs/api/ + </link> + </links> + </configuration> + </plugin> + <plugin> + <artifactId>maven-surefire-report-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-changelog-plugin</artifactId> + <!-- + configuration> <connectionType>connection</connectionType> + </configuration + --> + </plugin> + <plugin> + <artifactId>maven-jxr-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>taglist-maven-plugin</artifactId> + <configuration> + <tags> + <tag>TODO</tag> + <tag>FIXME</tag> + <tag>@todo</tag> + <tag>@deprecated</tag> + </tags> + </configuration> + </plugin> + <plugin> + <artifactId> + maven-project-info-reports-plugin + </artifactId> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + <configuration> + <sourceEncoding>ascii</sourceEncoding> + <targetJdk>1.4</targetJdk> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jdepend-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>2.1</version> + <configuration> + <!-- http://wiki.hudson-ci.org/display/HUDSON/FindBugs+Plugin --> + <findbugsXmlOutput>true</findbugsXmlOutput> + <findbugsXmlWithMessages>true</findbugsXmlWithMessages> + <xmlOutput>true</xmlOutput> + <xmlOutputDirectory>target/site</xmlOutputDirectory> + <includeTests>false</includeTests> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <configuration> + <formats> + <format>xml</format> + <format>html</format> + </formats> + <instrumentation> + <ignores> + <ignore>edu.umd.cs.piccolo.examples.*</ignore> + <ignore>edu.umd.cs.piccolo.examples.pswing.*</ignore> + <ignore>edu.umd.cs.piccolo.examples.swt.*</ignore> + <ignore>edu.umd.cs.piccolo.tutorial.*</ignore> + </ignores> + <excludes> + <exclude>edu/umd/cs/piccolo/examples/**</exclude> + </excludes> + </instrumentation> + </configuration> + </plugin> </plugins> </reporting> </project> ======================================= --- /piccolo2d.java/trunk/parent/pom.xml Thu Oct 8 20:00:09 2009 +++ /piccolo2d.java/trunk/parent/pom.xml Fri Oct 9 07:18:24 2009 @@ -85,8 +85,12 @@ </license> </licenses> <scm> - <connection>scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk</connection> - <developerConnection>scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk</developerConnection> + <connection> + scm:svn:http://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk + </connection> + <developerConnection> + scm:svn:https://piccolo2d.googlecode.com/svn/piccolo2d.java/trunk + </developerConnection> <url>http://code.google.com/p/piccolo2d/source/browse/piccolo2d.java/trunk</url> </scm> <organization> @@ -207,132 +211,7 @@ <version>3.8.2</version> <scope>test</scope> </dependency> - </dependencies> - <reporting> - <plugins> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <source>1.4</source> - <verbose>false</verbose> - <show>package</show> - <links> - <link> - http://java.sun.com/j2se/1.4.2/docs/api/ - </link> - </links> - <doclet> - gr.spinellis.umlgraph.doclet.UmlGraphDoc - </doclet> - <docletArtifact> - <groupId>gr.spinellis</groupId> - <artifactId>UmlGraph</artifactId> - <version>4.6</version> - </docletArtifact> - <!-- http://www.spinellis.gr/sw/umlgraph/doc/cd-opt.html --> - <additionalparam> - -overview ${basedir}/src/main/java/overview.html - -inferrel -inferdep -quiet -hide java.* - -collpackages java.util.* - -qualify - -postfixpackage -nodefontsize 9 - -nodefontpackagesize 7 - -visibility - -link http://java.sun.com/j2se/1.4.2/docs/api/ - </additionalparam> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-report-plugin</artifactId> - </plugin> - <plugin> - <artifactId>maven-changelog-plugin</artifactId> - <!-- - configuration> <connectionType>connection</connectionType> - </configuration - --> - </plugin> - <plugin> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>taglist-maven-plugin</artifactId> - <configuration> - <tags> - <tag>TODO</tag> - <tag>FIXME</tag> - <tag>@todo</tag> - <tag>@deprecated</tag> - </tags> - </configuration> - </plugin> - <plugin> - <artifactId> - maven-project-info-reports-plugin - </artifactId> - </plugin> - <plugin> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <sourceEncoding>ascii</sourceEncoding> - <targetJdk>1.4</targetJdk> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>jdepend-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>2.1</version> - <configuration> - <!-- http://wiki.hudson-ci.org/display/HUDSON/FindBugs+Plugin --> - <findbugsXmlOutput>true</findbugsXmlOutput> - <findbugsXmlWithMessages>true</findbugsXmlWithMessages> - <xmlOutput>true</xmlOutput> - <xmlOutputDirectory>target/site</xmlOutputDirectory> - <includeTests>false</includeTests> - <excludeFilterFile>${basedir}/src/build/conf/findbugs-exclude.xml</excludeFilterFile> - <!-- - <xmlOutput>true|false</xmlOutput> <xmlOutputDirectory>directory - location of xml findbugs report</xmlOutputDirectory> - <threshold>High|Normal|Low|Exp|Ignore</threshold> - <effort>Min|Default|Max</effort> - <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile> - <includeFilterFile>findbugs-include.xml</includeFilterFile> - <visitors>FindDeadLocalStores,UnreadFields</visitors> - <omitVisitors>FindDeadLocalStores,UnreadFields</omitVisitors> - <onlyAnalyze>org.codehaus.mojo.findbugs.*</onlyAnalyze> - <pluginList>/libs/fb-contrib/fb-contrib-2.8.0.jar</pluginList> - <debug>true|false</debug> <relaxed>true|false</relaxed> - --> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <configuration> - <formats> - <format>xml</format> - <format>html</format> - </formats> - <instrumentation> - <ignores> - <ignore>edu.umd.cs.piccolo.examples.*</ignore> - <ignore>edu.umd.cs.piccolo.examples.pswing.*</ignore> - <ignore>edu.umd.cs.piccolo.examples.swt.*</ignore> - <ignore>edu.umd.cs.piccolo.tutorial.*</ignore> - </ignores> - <excludes> - <exclude>edu/umd/cs/piccolo/examples/**</exclude> - </excludes> - </instrumentation> - </configuration> - </plugin> - </plugins> - </reporting> + </dependencies> <distributionManagement> <!-- use a ~/.m2/settings.xml like this: <settings> <profiles> <profile> ======================================= --- /piccolo2d.java/trunk/swt/pom.xml Thu Oct 8 20:00:09 2009 +++ /piccolo2d.java/trunk/swt/pom.xml Fri Oct 9 07:18:24 2009 @@ -42,9 +42,16 @@ </scm> <reporting> <plugins> - <!-- don't use UmlGraph as the current settings (see ../parent/pom.xml) cause pain with swt --> + <!-- don't use UmlGraph as the current settings (see ../parent/pom.xml) cause pain with swt --> <plugin> - <artifactId>maven-javadoc-plugin</artifactId> + <artifactId>maven-checkstyle-plugin</artifactId> + <configuration> + <configLocation>${basedir}/src/build/conf/checkstyle.xml</configLocation> + <enableRulesSummary>false</enableRulesSummary> + </configuration> + </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> <configuration> <source>1.4</source> <verbose>false</verbose> @@ -53,16 +60,84 @@ <link> http://java.sun.com/j2se/1.4.2/docs/api/ </link> - </links> + </links> </configuration> </plugin> <plugin> - <artifactId>maven-checkstyle-plugin</artifactId> + <artifactId>maven-surefire-report-plugin</artifactId> + </plugin> + <plugin> + <artifactId>maven-changelog-plugin</artifactId> + <!-- + configuration> <connectionType>connection</connectionType> + </configuration + --> + </plugin> + <plugin> + <artifactId>maven-jxr-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>taglist-maven-plugin</artifactId> <configuration> - <configLocation>${basedir}/src/build/conf/checkstyle.xml</configLocation> - <enableRulesSummary>false</enableRulesSummary> + <tags> + <tag>TODO</tag> + <tag>FIXME</tag> + <tag>@todo</tag> + <tag>@deprecated</tag> + </tags> </configuration> </plugin> - </plugins> + <plugin> + <artifactId> + maven-project-info-reports-plugin + </artifactId> + </plugin> + <plugin> + <artifactId>maven-pmd-plugin</artifactId> + <configuration> + <sourceEncoding>ascii</sourceEncoding> + <targetJdk>1.4</targetJdk> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>jdepend-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <version>2.1</version> + <configuration> + <!-- http://wiki.hudson-ci.org/display/HUDSON/FindBugs+Plugin --> + <findbugsXmlOutput>true</findbugsXmlOutput> + <findbugsXmlWithMessages>true</findbugsXmlWithMessages> + <xmlOutput>true</xmlOutput> + <xmlOutputDirectory>target/site</xmlOutputDirectory> + <includeTests>false</includeTests> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <configuration> + <formats> + <format>xml</format> + <format>html</format> + </formats> + <instrumentation> + <ignores> + <ignore>edu.umd.cs.piccolo.examples.*</ignore> + <ignore>edu.umd.cs.piccolo.examples.pswing.*</ignore> + <ignore>edu.umd.cs.piccolo.examples.swt.*</ignore> + <ignore>edu.umd.cs.piccolo.tutorial.*</ignore> + </ignores> + <excludes> + <exclude>edu/umd/cs/piccolo/examples/**</exclude> + </excludes> + </instrumentation> + </configuration> + </plugin> + </plugins> </reporting> </project> --~--~---------~--~----~------------~-------~--~----~ Piccolo2D Developers Group: http://groups.google.com/group/piccolo2d-dev?hl=en -~----------~----~----~----~------~----~------~--~---
