diff -ur javamail-1.4.3.orig/mail/pom.xml javamail-1.4.3/mail/pom.xml --- javamail-1.4.3.orig/mail/pom.xml 2009-12-02 11:59:14.440289296 +0000 +++ javamail-1.4.3/mail/pom.xml 2009-12-02 11:59:25.329352444 +0000 @@ -81,24 +81,6 @@ <filtering>true</filtering> </resource> </resources> - <plugins> - <!-- - Configure FindBugs to run with "mvn findbugs:findbugs" - and generate XML output that can be used by the Hudson - FindBugs plugin. - --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <configuration> - <skip>false</skip> - <threshold>Normal</threshold> - <excludeFilterFile>exclude.xml</excludeFilterFile> - <findbugsXmlOutput>true</findbugsXmlOutput> - <findbugsXmlWithMessages>true</findbugsXmlWithMessages> - </configuration> - </plugin> - </plugins> </build> <dependencies> @@ -111,22 +93,4 @@ </dependency> </dependencies> - <reporting> - <plugins> - <!-- - Configure FindBugs to run with "mvn site" and - generate html output that can be viewed directly. - --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <configuration> - <skip>false</skip> - <threshold>Normal</threshold> - <excludeFilterFile>exclude.xml</excludeFilterFile> - </configuration> - </plugin> - </plugins> - </reporting> - </project> diff -ur javamail-1.4.3.orig/pom.xml javamail-1.4.3/pom.xml --- javamail-1.4.3.orig/pom.xml 2009-12-02 11:59:14.441289220 +0000 +++ javamail-1.4.3/pom.xml 2009-12-02 11:59:55.368290231 +0000 @@ -114,10 +114,6 @@ <modules> <module>mail</module> - <module>mailapi</module> - <module>smtp</module> - <module>imap</module> - <module>pop3</module> <module>dsn</module> </modules> @@ -188,45 +184,6 @@ </Private-Package> </instructions> </configuration> - <!-- - Since we don't change the packaging type to bundle, we - need to configure the plugin to execute the manifest goal - during the process-classes phase of the build life cycle. - --> - <executions> - <execution> - <id>osgi-manifest</id> - <phase>process-classes</phase> - <goals> - <goal>manifest</goal> - </goals> - </execution> - </executions> - </plugin> - - <!-- - Since we don't want a qualifier like b05 or SNAPSHOT to - appear in the OSGi package version attribute, we use - the following plugin to populate a project property - with an OSGi version that is equivalent to the maven - version without the qualifier. - --> - <plugin> - <groupId>com.sun.enterprise</groupId> - <artifactId>osgiversion-maven-plugin</artifactId> - <version>${hk2.plugin.version}</version> - <configuration> - <dropVersionComponent>qualifier</dropVersionComponent> - <versionPropertyName>mail.osgiversion</versionPropertyName> - </configuration> - <executions> - <execution> - <id>compute-osgi-version</id> - <goals> - <goal>compute-osgi-version</goal> - </goals> - </execution> - </executions> </plugin> <plugin> @@ -328,37 +285,6 @@ --> </plugins> - <pluginManagement> - <plugins> - <plugin> - <!-- - By default, disable the FindBugs plugin for all modules. - It's enabled in the "mail" module, which is the only - module where we actually want to run it. - --> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>RELEASE</version> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </pluginManagement> - - <extensions> - <extension> - <groupId>org.jvnet.wagon-svn</groupId> - <artifactId>wagon-svn</artifactId> - <!-- - Following should be: - <version>RELEASE</version> - but Kohsuke says it doesn't work and to replace - it with the actual version number. - --> - <version>1.8</version> - </extension> - </extensions> </build> <dependencyManagement> @@ -374,16 +300,6 @@ <version>${mail.version}</version> </dependency> <dependency> - <groupId>com.sun.mail</groupId> - <artifactId>mbox</artifactId> - <version>${mail.version}</version> - </dependency> - <dependency> - <groupId>com.sun.mail</groupId> - <artifactId>taglib</artifactId> - <version>${mail.version}</version> - </dependency> - <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.5</version> @@ -397,11 +313,6 @@ </dependencyManagement> <dependencies> - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> - <version>${activation-api.version}</version> - </dependency> <!-- following works around a bug that causes NullPointerException --> <dependency> <groupId>junit</groupId>