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/04 22:24:09 UTC
svn commit: r1197788 - in /james/mpt/trunk: pom.xml
src/reporting-site/site.xml src/site/site.xml
Author: felixk
Date: Fri Nov 4 21:24:09 2011
New Revision: 1197788
URL: http://svn.apache.org/viewvc?rev=1197788&view=rev
Log:
Move to james-project-1.7
Modified:
james/mpt/trunk/pom.xml
james/mpt/trunk/src/reporting-site/site.xml
james/mpt/trunk/src/site/site.xml
Modified: james/mpt/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/mpt/trunk/pom.xml?rev=1197788&r1=1197787&r2=1197788&view=diff
==============================================================================
--- james/mpt/trunk/pom.xml (original)
+++ james/mpt/trunk/pom.xml Fri Nov 4 21:24:09 2011
@@ -26,7 +26,7 @@
<parent>
<artifactId>james-project</artifactId>
<groupId>org.apache.james</groupId>
- <version>1.6</version>
+ <version>1.7</version>
<relativePath></relativePath>
</parent>
@@ -57,10 +57,6 @@
</mailingList>
</mailingLists>
- <prerequisites>
- <maven>3.0.2</maven>
- </prerequisites>
-
<modules>
<module>main</module>
<module>antlib</module>
@@ -105,12 +101,11 @@
...
-->
<!-- General location for site stage -->
- <james.www>scp://people.apache.org/www/james.apache.org/</james.www>
+ <james.www>scpexe://people.apache.org/www/james.apache.org/</james.www>
<!-- Project specific location, allowing specific override -->
<james.mpt.www>${james.www}/mpt/</james.mpt.www>
<!-- Overridding this value allows single set of loopback settings to be maintained -->
<james.www.id>mpt-website</james.www.id>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<target.jdk>1.5</target.jdk>
</properties>
@@ -213,101 +208,20 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <version>3.0-beta-3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>1.4</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-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.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-plugin-plugin</artifactId>
<version>2.7</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.4.3</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <version>2.3.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-changes-plugin</artifactId>
- <version>2.4</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-jxr-plugin</artifactId>
- <version>2.2</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.4</version>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.7</version>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>2.2.0</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- <version>2.2</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>emma-maven-plugin</artifactId>
- <version>1.0-alpha-3</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>
- <encoding>iso8859-1</encoding>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -370,168 +284,6 @@
</execution>
</executions>
</plugin>
-
- <!-- Site generation -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <executions>
- <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>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>
- </excludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <configuration>
- <aggregate>true</aggregate>
- <targetJdk>${target.jdk}</targetJdk>
- <rulesets>
- <ruleset>/rulesets/basic.xml</ruleset>
- <ruleset>/rulesets/unusedcode.xml</ruleset>
- <ruleset>/rulesets/imports.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>emma-maven-plugin</artifactId>
- </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>
</plugins>
</build>
</project>
Modified: james/mpt/trunk/src/reporting-site/site.xml
URL: http://svn.apache.org/viewvc/james/mpt/trunk/src/reporting-site/site.xml?rev=1197788&r1=1197787&r2=1197788&view=diff
==============================================================================
--- james/mpt/trunk/src/reporting-site/site.xml (original)
+++ james/mpt/trunk/src/reporting-site/site.xml Fri Nov 4 21:24:09 2011
@@ -19,24 +19,12 @@
-->
<project name="${project.name}">
- <skin>
- <groupId>org.apache.james</groupId>
- <artifactId>james-skin</artifactId>
- <version>1.7-SNAPSHOT</version>
- </skin>
-
<bannerLeft>
<name>JAMES MPT</name>
<src>images/logo/james-mpt-logo.gif</src>
<href>http://james.apache.org/mpt/index.html</href>
<alt>james-mpt-logo.gif</alt>
</bannerLeft>
-
- <bannerRight>
- <name>The Apache Software Foundation</name>
- <src>images/logo/asf-logo-reduced.gif</src>
- <href>http://www.apache.org/index.html</href>
- </bannerRight>
<body>
Modified: james/mpt/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/james/mpt/trunk/src/site/site.xml?rev=1197788&r1=1197787&r2=1197788&view=diff
==============================================================================
--- james/mpt/trunk/src/site/site.xml (original)
+++ james/mpt/trunk/src/site/site.xml Fri Nov 4 21:24:09 2011
@@ -18,11 +18,6 @@
under the License.
-->
<project name="JAMES Mail Protocol Tester (MPT)">
- <skin>
- <groupId>org.apache.james</groupId>
- <artifactId>james-skin</artifactId>
- <version>1.7-SNAPSHOT</version>
- </skin>
<bannerLeft>
<name>JAMES MPT</name>
@@ -31,12 +26,6 @@
<alt>james-mpt-logo.gif</alt>
</bannerLeft>
- <bannerRight>
- <name>The Apache Software Foundation</name>
- <src>images/logo/asf-logo-reduced.gif</src>
- <href>http://www.apache.org/index.html</href>
- </bannerRight>
-
<body>
<menu name="Mail Protocol Tester" inherit='bottom'>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org