Author: felixk Date: Thu Nov 10 16:58:08 2011 New Revision: 1200426 URL: http://svn.apache.org/viewvc?rev=1200426&view=rev Log: Move to james-project-1.7
Modified: james/mailet/api/trunk/ (props changed) james/mailet/api/trunk/pom.xml james/mailet/api/trunk/src/reporting-site/site.xml james/mailet/api/trunk/src/site/site.xml Propchange: james/mailet/api/trunk/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Thu Nov 10 16:58:08 2011 @@ -1,19 +1,11 @@ target - bin - .settings - .classpath - .project - build - dist - release.properties - pom.xml.tag - pom.xml.releaseBackup +coverage.ec Modified: james/mailet/api/trunk/pom.xml URL: http://svn.apache.org/viewvc/james/mailet/api/trunk/pom.xml?rev=1200426&r1=1200425&r2=1200426&view=diff ============================================================================== --- james/mailet/api/trunk/pom.xml (original) +++ james/mailet/api/trunk/pom.xml Thu Nov 10 16:58:08 2011 @@ -26,7 +26,7 @@ <parent> <groupId>org.apache.james</groupId> <artifactId>james-project</artifactId> - <version>1.6</version> + <version>1.7</version> <relativePath></relativePath> </parent> @@ -58,22 +58,14 @@ <system>JIRA</system> <url>http://issues.apache.org/jira/browse/MAILET</url> </issueManagement> - <ciManagement> - <system>Jenkins</system> - <url>https://builds.apache.org/view/G-L/view/James/</url> - </ciManagement> <distributionManagement> <site> <id>mailet-website</id> - <url>scp://people.apache.org/www/james.apache.org/mailet/api/</url> + <url>scpexe://people.apache.org/www/james.apache.org/mailet/api/</url> </site> </distributionManagement> - <properties> - <target.jdk>1.6</target.jdk> - </properties> - <dependencies> <dependency> <groupId>javax.mail</groupId> @@ -90,107 +82,9 @@ </dependencies> <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.3.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-remote-resources-plugin</artifactId> - <version>1.2.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-doap-plugin</artifactId> - <version>1.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.9</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <version>2.9</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.8</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - <version>2.3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>3.0</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-changes-plugin</artifactId> - <version>2.6</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <version>2.5</version> - </plugin> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <version>0.7</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>taglist-maven-plugin</artifactId> - <version>2.4</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>2.3.2</version> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>versions-maven-plugin</artifactId> - <version>1.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.3</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <version>2.4</version> - </plugin> - </plugins> - </pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <optimize>true</optimize> - <source>${target.jdk}</source> - <target>${target.jdk}</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> <configuration> <archive> @@ -207,6 +101,19 @@ </archive> </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>emma-maven-plugin</artifactId> + <inherited>true</inherited> + <executions> + <execution> + <phase>process-classes</phase> + <goals> + <goal>instrument</goal> + </goals> + </execution> + </executions> + </plugin> <!-- Add NOTICE and LICENSE to generated JAR --> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -258,178 +165,6 @@ </configuration> </plugin> --> - - <!-- Site generation --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <executions> - <!-- Attach non-reporting site-descriptor when installing --> - <execution> - <id>attach-descriptor</id> - <goals> - <goal>attach-descriptor</goal> - </goals> - <configuration> - <siteDirectory>${basedir}/src/site</siteDirectory> - <generateReports>false</generateReports> - </configuration> - </execution> - </executions> - <configuration> - <siteDirectory>${maven-site-plugin.siteDirectory}</siteDirectory> - <generateReports>${maven-site-plugin.generateReports}</generateReports> - <reportPlugins> - <!-- Order matters. First project-info-reports, second jxr. --> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <reports> - <report>index</report> - <report>project-team</report> - <report>mailing-list</report> - <report>cim</report> - <report>issue-tracking</report> - <report>license</report> - <report>scm</report> - <report>dependencies</report> - </reports> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - <configuration> - <aggregate>true</aggregate> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <minmemory>256m</minmemory> - <maxmemory>1g</maxmemory> - <linksource>true</linksource> - <tags> - <tag> - <name>note</name> - <placement>a</placement> - <head>NOTE</head> - </tag> - <tag> - <name>todo</name> - <placement>a</placement> - <head>TODO</head> - </tag> - <tag> - <name>warning</name> - <placement>a</placement> - <head>WARNING</head> - </tag> - </tags> - <source>${target.jdk}</source> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>aggregate</report> - <report>test-aggregate</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <linkXref>true</linkXref> - <aggregate>true</aggregate> - <targetJdk>${target.jdk}</targetJdk> - <rulesets> - <ruleset>/rulesets/basic.xml</ruleset> - <ruleset>/rulesets/controversial.xml</ruleset> - </rulesets> - <format>xml</format> - <xrefLocation>${project.reporting.outputDirectory}/xref</xrefLocation> - <xrefTestLocation>${project.reporting.outputDirectory}/xref-test</xrefTestLocation> - <sourceEncoding>utf-8</sourceEncoding> - <minimumTokens>100</minimumTokens> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <configuration> - <!-- required by dashboard plugin and hudson --> - <xmlOutput>true</xmlOutput> - <effort>Max</effort> - <findbugsXmlOutput>true</findbugsXmlOutput> - <findbugsXmlWithMessages>true</findbugsXmlWithMessages> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-changes-plugin</artifactId> - <configuration> - <onlyCurrentVersion>true</onlyCurrentVersion> - <resolutionIds>Closed</resolutionIds> - <maxEntries>1000</maxEntries> - </configuration> - <reportSets> - <reportSet> - <reports> - <report>jira-report</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - <configuration> - <argLine>-Xmx1024m -XX:MaxPermSize=512m</argLine> - <aggregate>true</aggregate> - <linkXref>true</linkXref> - <xrefLocation>${project.reporting.outputDirectory}</xrefLocation> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>versions-maven-plugin</artifactId> - <reportSets> - <reportSet> - <reports> - <report>dependency-updates-report</report> - <report>plugin-updates-report</report> - <!-- report>property-updates-report</report --> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <excludes> - <exclude>NOTICE.txt</exclude> - <exclude>LICENSE.txt</exclude> - <exclude>LICENSE.apache</exclude> - <!-- Generated by Maven --> - <exclude>release.properties</exclude> - <exclude>dist/**/*</exclude> - </excludes> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>taglist-maven-plugin</artifactId> - </plugin> - </reportPlugins> - </configuration> - </plugin> </plugins> </build> </project> Modified: james/mailet/api/trunk/src/reporting-site/site.xml URL: http://svn.apache.org/viewvc/james/mailet/api/trunk/src/reporting-site/site.xml?rev=1200426&r1=1200425&r2=1200426&view=diff ============================================================================== --- james/mailet/api/trunk/src/reporting-site/site.xml (original) +++ james/mailet/api/trunk/src/reporting-site/site.xml Thu Nov 10 16:58:08 2011 @@ -19,12 +19,6 @@ --> <project name="${project.name}"> - <skin> - <groupId>org.apache.james</groupId> - <artifactId>james-skin</artifactId> - <version>1.7-SNAPSHOT</version> - </skin> - <bannerLeft> <name>JAMES Mailet API</name> <src>/images/logos/james-mailetapi-logo.gif</src> @@ -32,12 +26,6 @@ <alt>james-mailetapi-logo.gif</alt> </bannerLeft> - <bannerRight> - <name>The Apache Software Foundation</name> - <src>images/logos/asf-logo-reduced.gif</src> - <href>http://www.apache.org/index.html</href> - </bannerRight> - <body> <menu ref="reports" /> Modified: james/mailet/api/trunk/src/site/site.xml URL: http://svn.apache.org/viewvc/james/mailet/api/trunk/src/site/site.xml?rev=1200426&r1=1200425&r2=1200426&view=diff ============================================================================== --- james/mailet/api/trunk/src/site/site.xml (original) +++ james/mailet/api/trunk/src/site/site.xml Thu Nov 10 16:58:08 2011 @@ -18,11 +18,6 @@ under the License. --> <project name="Mailet API"> - <skin> - <groupId>org.apache.james</groupId> - <artifactId>james-skin</artifactId> - <version>1.7-SNAPSHOT</version> - </skin> <bannerLeft> <name>JAMES Mailet API</name> @@ -31,12 +26,6 @@ <alt>james-mailetapi-logo.gif</alt> </bannerLeft> - <bannerRight> - <name>The Apache Software Foundation</name> - <src>/images/logos/asf-logo-reduced.gif</src> - <href>http://www.apache.org/index.html</href> - </bannerRight> - <body> <menu name="Mailet API">