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/10/19 19:16:46 UTC
svn commit: r1186351 - in /james/trunk/sandbox/felixk/imap: api/pom.xml
message/pom.xml pom.xml processor/pom.xml src/reporting-site/site.xml
src/site/site.xml
Author: felixk
Date: Wed Oct 19 17:16:46 2011
New Revision: 1186351
URL: http://svn.apache.org/viewvc?rev=1186351&view=rev
Log:
Use new parent pom
Modified:
james/trunk/sandbox/felixk/imap/api/pom.xml
james/trunk/sandbox/felixk/imap/message/pom.xml
james/trunk/sandbox/felixk/imap/pom.xml
james/trunk/sandbox/felixk/imap/processor/pom.xml
james/trunk/sandbox/felixk/imap/src/reporting-site/site.xml
james/trunk/sandbox/felixk/imap/src/site/site.xml
Modified: james/trunk/sandbox/felixk/imap/api/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/imap/api/pom.xml?rev=1186351&r1=1186350&r2=1186351&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/imap/api/pom.xml (original)
+++ james/trunk/sandbox/felixk/imap/api/pom.xml Wed Oct 19 17:16:46 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-api</artifactId>
<name>Apache James IMAP API</name>
Modified: james/trunk/sandbox/felixk/imap/message/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/imap/message/pom.xml?rev=1186351&r1=1186350&r2=1186351&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/imap/message/pom.xml (original)
+++ james/trunk/sandbox/felixk/imap/message/pom.xml Wed Oct 19 17:16:46 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-message</artifactId>
<name>Apache James IMAP Message Library</name>
Modified: james/trunk/sandbox/felixk/imap/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/imap/pom.xml?rev=1186351&r1=1186350&r2=1186351&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/imap/pom.xml (original)
+++ james/trunk/sandbox/felixk/imap/pom.xml Wed Oct 19 17:16:46 2011
@@ -26,12 +26,11 @@
<parent>
<artifactId>james-project</artifactId>
<groupId>org.apache.james</groupId>
- <version>1.6</version>
+ <version>1.7-SNAPSHOT</version>
<relativePath></relativePath>
</parent>
<artifactId>apache-james-imap</artifactId>
- <groupId>org.apache.james</groupId>
<version>0.3-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -55,7 +54,7 @@
<distributionManagement>
<site>
<id>imap-website</id>
- <url>scp://people.apache.org/www/james.apache.org/imap</url>
+ <url>scp://people.apache.org/www/james.apache.org/imap/${deployTechnicalSiteDirectory}</url>
</site>
</distributionManagement>
@@ -266,90 +265,10 @@
</dependencyManagement>
<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.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2.1</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-project-info-reports-plugin</artifactId>
- <version>2.3.1</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.3.4</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</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-changes-plugin</artifactId>
- <version>2.4</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-surefire-plugin</artifactId>
- <version>2.7.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.7.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.7</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>
@@ -385,16 +304,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.7.2</version>
- <configuration>
- <forkMode>pertest</forkMode>
- <argLine>-Xms256m -Xmx512m</argLine>
- <testFailureIgnore>false</testFailureIgnore>
- <skip>false</skip>
- <includes>
- <include>**/*Test.java</include>
- </includes>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -416,198 +325,9 @@
</instructions>
</configuration>
</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>${target.jdk}</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>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <phase>site</phase>
- <goals>
- <goal>aggregate</goal>
- </goals>
- </execution>
- </executions>
- <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>
</plugin>
</plugins>
</build>
Modified: james/trunk/sandbox/felixk/imap/processor/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/imap/processor/pom.xml?rev=1186351&r1=1186350&r2=1186351&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/imap/processor/pom.xml (original)
+++ james/trunk/sandbox/felixk/imap/processor/pom.xml Wed Oct 19 17:16:46 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-processor</artifactId>
<name>Apache James IMAP Processor</name>
Modified: james/trunk/sandbox/felixk/imap/src/reporting-site/site.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/imap/src/reporting-site/site.xml?rev=1186351&r1=1186350&r2=1186351&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/imap/src/reporting-site/site.xml (original)
+++ james/trunk/sandbox/felixk/imap/src/reporting-site/site.xml Wed Oct 19 17:16:46 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 IMAP</name>
<src>/images/logos/james-imap-logo.gif</src>
@@ -32,12 +26,6 @@
<alt>james-imap-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/trunk/sandbox/felixk/imap/src/site/site.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/imap/src/site/site.xml?rev=1186351&r1=1186350&r2=1186351&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/imap/src/site/site.xml (original)
+++ james/trunk/sandbox/felixk/imap/src/site/site.xml Wed Oct 19 17:16:46 2011
@@ -19,12 +19,6 @@
-->
<project name='Apache James IMAP'>
- <skin>
- <groupId>org.apache.james</groupId>
- <artifactId>james-skin</artifactId>
- <version>1.7-SNAPSHOT</version>
- </skin>
-
<bannerLeft>
<name>James IMAP</name>
<src>/images/logos/james-imap-logo.gif</src>
@@ -32,12 +26,6 @@
<alt>james-imap-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="Documentation">
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org