You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by fe...@apache.org on 2011/11/10 22:21:37 UTC
svn commit: r1200558 - in /james/jspf/trunk: pom.xml resolver/
src/reporting-site/site.xml src/site/site.xml
Author: felixk
Date: Thu Nov 10 21:21:37 2011
New Revision: 1200558
URL: http://svn.apache.org/viewvc?rev=1200558&view=rev
Log:
Move to james-project-1.7
Modified:
james/jspf/trunk/pom.xml
james/jspf/trunk/resolver/ (props changed)
james/jspf/trunk/src/reporting-site/site.xml
james/jspf/trunk/src/site/site.xml
Modified: james/jspf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/jspf/trunk/pom.xml?rev=1200558&r1=1200557&r2=1200558&view=diff
==============================================================================
--- james/jspf/trunk/pom.xml (original)
+++ james/jspf/trunk/pom.xml Thu Nov 10 21:21:37 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>
@@ -42,16 +42,6 @@
<url>http://james.apache.org/jspf/</url>
<inceptionYear>2006</inceptionYear>
- <mailingLists>
- <mailingList>
- <name>Apache jSPF Developement</name>
- <subscribe>server-dev-subscribe@james.apache.org</subscribe>
- <unsubscribe>server-dev-unsubscribe@james.apache.org</unsubscribe>
- <post>server-dev@james.apache.org</post>
- <archive>http://mail-archives.apache.org/mod_mbox/james-server-dev/</archive>
- </mailingList>
- </mailingLists>
-
<modules>
<module>tester</module>
<module>resolver</module>
@@ -71,7 +61,7 @@
<distributionManagement>
<site>
<id>jspf-website</id>
- <url>scp://people.apache.org/www/james.apache.org/jspf/</url>
+ <url>scpexe://people.apache.org/www/james.apache.org/jspf/</url>
</site>
</distributionManagement>
@@ -140,245 +130,20 @@
</dependencyManagement>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-deploy-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.0-beta-3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.2.0</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- <version>2.2</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.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.2</version>
- <configuration>
- <source>${target.jdk}</source>
- <target>${target.jdk}</target>
- <encoding>iso8859-1</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.8</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.8</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
- </plugin>
- </plugins>
- </pluginManagement>
<plugins>
- <!-- Site generation -->
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>emma-maven-plugin</artifactId>
+ <inherited>true</inherited>
<executions>
<execution>
- <id>attach-descriptor</id>
+ <phase>process-classes</phase>
<goals>
- <goal>attach-descriptor</goal>
+ <goal>instrument</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>dependencies</report>
- <report>dependency-management</report>
- <report>dependency-convergence</report>
- <report>distribution-management</report>
- <report>index</report>
- <report>license</report>
- <report>mailing-list</report>
- <report>modules</report>
- <report>plugin-management</report>
- <report>plugins</report>
- <report>project-team</report>
- <report>scm</report>
- <report>summary</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-surefire-report-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>NOTICE.*</exclude>
- <exclude>LICENSE.*</exclude>
- <!-- Generated by Maven -->
- <exclude>release.properties</exclude>
- <exclude>dist/**/*</exclude>
- <!-- Eclipse -->
- <exclude>**/.*</exclude>
- <exclude>.*/**/*</exclude>
- <!-- 3rd party resources described in NOTICE:
- see the maven-remote-resources-plugin configuration, in this file -->
- <exclude>src/test/resources/org/apache/james/jspf/test_live.txt</exclude>
- <exclude>src/test/resources/org/apache/james/jspf/test_parser.txt</exclude>
- <exclude>src/test/resources/org/apache/james/jspf/test_rfc_examples.txt</exclude>
- <exclude>src/main/resources/org/apache/james/jspf/tester/pyspf-tests.yml</exclude>
- <exclude>src/main/resources/org/apache/james/jspf/tester/rfc4408-tests.yml</exclude>
- <exclude>src/main/resources/org/apache/james/jspf/tester/rfc4408-tests-2009.10.yml</exclude>
- <exclude>src/main/resources/org/apache/james/jspf/tester/tests.yml</exclude>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <targetJdk>${target.jdk}</targetJdk>
- <rulesets>
- <ruleset>/rulesets/basic.xml</ruleset>
- <ruleset>/rulesets/controversial.xml</ruleset>
- </rulesets>
- <format>xml</format>
- <linkXref>true</linkXref>
- <sourceEncoding>utf-8</sourceEncoding>
- <minimumTokens>100</minimumTokens>
- </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>1.5</source>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>aggregate</report>
- <report>test-aggregate</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <configuration>
- <xrefLocation>${project.reporting.outputDirectory}/../xref</xrefLocation>
- <xrefTestLocation>${project.reporting.outputDirectory}/../xref-test</xrefTestLocation>
- <!-- 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>Fixed</resolutionIds>
- <statusIds>Resolved,Closed</statusIds>
- <columnNames>Type,Key,Summary,Status,Resolution,Fix Version</columnNames>
- </configuration>
- <reportSets>
- <reportSet>
- <reports>
- <report>jira-report</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- -->
- </reportPlugins>
- </configuration>
- </plugin>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</project>
Propchange: james/jspf/trunk/resolver/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Nov 10 21:21:37 2011
@@ -1,2 +1,3 @@
target
.*
+coverage.ec
Modified: james/jspf/trunk/src/reporting-site/site.xml
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/reporting-site/site.xml?rev=1200558&r1=1200557&r2=1200558&view=diff
==============================================================================
--- james/jspf/trunk/src/reporting-site/site.xml (original)
+++ james/jspf/trunk/src/reporting-site/site.xml Thu Nov 10 21:21:37 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 jSPF</name>
<src>images/logos/james-jspf-logo.gif</src>
@@ -32,12 +26,6 @@
<alt>james-jspf-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="modules" />
Modified: james/jspf/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/james/jspf/trunk/src/site/site.xml?rev=1200558&r1=1200557&r2=1200558&view=diff
==============================================================================
--- james/jspf/trunk/src/site/site.xml (original)
+++ james/jspf/trunk/src/site/site.xml Thu Nov 10 21:21:37 2011
@@ -18,11 +18,6 @@
under the License.
-->
<project name="jSPF">
- <skin>
- <groupId>org.apache.james</groupId>
- <artifactId>james-skin</artifactId>
- <version>1.7-SNAPSHOT</version>
- </skin>
<bannerLeft>
<name>James jSPF</name>
@@ -31,12 +26,6 @@
<alt>james-jspf-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="jSPF" inherit="top">
@@ -54,15 +43,5 @@
</menu>
-->
- <menu name="Project">
- <item name="Bug Database" href="https://builds.apache.org/hudson/view/G-L/view/James/job/jspf-trunk-site/site/issue-tracking.html"/>
- <item name="Source Code" href="https://builds.apache.org/hudson/view/G-L/view/James/job/jspf-trunk-site/site/source-repository.html"/>
- <item name="Who We Are" href="https://builds.apache.org/hudson/view/G-L/view/James/job/jspf-trunk-site/site/team-list.html" />
- <!-- Not yet there
- <item name="Contributing" href="contribute.html"/>
- -->
- <item name="License" href="https://builds.apache.org/hudson/view/G-L/view/James/job/jspf-trunk-site/site/license.html"/>
- </menu>
-
</body>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org