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/20 07:13:40 UTC
svn commit: r1186619 - in /james/trunk/sandbox/felixk/mime4j:
assemble/pom.xml benchmark/pom.xml core/pom.xml dom/pom.xml
examples/pom.xml pom.xml src/reporting-site/site.xml src/site/site.xml
storage/pom.xml
Author: felixk
Date: Thu Oct 20 05:13:40 2011
New Revision: 1186619
URL: http://svn.apache.org/viewvc?rev=1186619&view=rev
Log:
Use new parent pom
Modified:
james/trunk/sandbox/felixk/mime4j/assemble/pom.xml
james/trunk/sandbox/felixk/mime4j/benchmark/pom.xml
james/trunk/sandbox/felixk/mime4j/core/pom.xml
james/trunk/sandbox/felixk/mime4j/dom/pom.xml
james/trunk/sandbox/felixk/mime4j/examples/pom.xml
james/trunk/sandbox/felixk/mime4j/pom.xml
james/trunk/sandbox/felixk/mime4j/src/reporting-site/site.xml
james/trunk/sandbox/felixk/mime4j/src/site/site.xml
james/trunk/sandbox/felixk/mime4j/storage/pom.xml
Modified: james/trunk/sandbox/felixk/mime4j/assemble/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/mime4j/assemble/pom.xml?rev=1186619&r1=1186618&r2=1186619&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/mime4j/assemble/pom.xml (original)
+++ james/trunk/sandbox/felixk/mime4j/assemble/pom.xml Thu Oct 20 05:13:40 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-mime4j</artifactId>
<version>0.8-SNAPSHOT</version>
<packaging>pom</packaging>
Modified: james/trunk/sandbox/felixk/mime4j/benchmark/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/mime4j/benchmark/pom.xml?rev=1186619&r1=1186618&r2=1186619&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/mime4j/benchmark/pom.xml (original)
+++ james/trunk/sandbox/felixk/mime4j/benchmark/pom.xml Thu Oct 20 05:13:40 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-benchmark</artifactId>
<version>0.8-SNAPSHOT</version>
Modified: james/trunk/sandbox/felixk/mime4j/core/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/mime4j/core/pom.xml?rev=1186619&r1=1186618&r2=1186619&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/mime4j/core/pom.xml (original)
+++ james/trunk/sandbox/felixk/mime4j/core/pom.xml Thu Oct 20 05:13:40 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-core</artifactId>
<version>0.8-SNAPSHOT</version>
Modified: james/trunk/sandbox/felixk/mime4j/dom/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/mime4j/dom/pom.xml?rev=1186619&r1=1186618&r2=1186619&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/mime4j/dom/pom.xml (original)
+++ james/trunk/sandbox/felixk/mime4j/dom/pom.xml Thu Oct 20 05:13:40 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-dom</artifactId>
<version>0.8-SNAPSHOT</version>
Modified: james/trunk/sandbox/felixk/mime4j/examples/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/mime4j/examples/pom.xml?rev=1186619&r1=1186618&r2=1186619&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/mime4j/examples/pom.xml (original)
+++ james/trunk/sandbox/felixk/mime4j/examples/pom.xml Thu Oct 20 05:13:40 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-examples</artifactId>
<version>0.8-SNAPSHOT</version>
Modified: james/trunk/sandbox/felixk/mime4j/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/mime4j/pom.xml?rev=1186619&r1=1186618&r2=1186619&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/mime4j/pom.xml (original)
+++ james/trunk/sandbox/felixk/mime4j/pom.xml Thu Oct 20 05:13:40 2011
@@ -26,11 +26,10 @@
<parent>
<artifactId>james-project</artifactId>
<groupId>org.apache.james</groupId>
- <version>1.6</version>
+ <version>1.7-SNAPSHOT</version>
<relativePath></relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-project</artifactId>
<version>0.8-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -50,10 +49,6 @@
</mailingList>
</mailingLists>
- <prerequisites>
- <maven>3.0.2</maven>
- </prerequisites>
-
<modules>
<module>core</module>
<module>dom</module>
@@ -75,15 +70,10 @@
<distributionManagement>
<site>
<id>mime4j-website</id>
- <url>scp://people.apache.org/www/james.apache.org/mime4j/</url>
+ <url>scp://people.apache.org/www/james.apache.org/mime4j/${deployTechnicalSiteDirectory}</url>
</site>
</distributionManagement>
- <properties>
- <target.jdk>1.5</target.jdk>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -117,101 +107,6 @@
</dependencyManagement>
<build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clean-plugin</artifactId>
- <version>2.4.1</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-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.maven.plugins</groupId>
- <artifactId>maven-surfire-plugin</artifactId>
- <version>2.7.2</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surfire-report-plugin</artifactId>
- <version>2.7.2</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.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <version>0.7</version>
- </plugin>
- <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-javadoc-plugin</artifactId>
- <version>2.7</version>
- </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-source-plugin</artifactId>
- <version>2.1.2</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-doap-plugin</artifactId>
- <version>1.1</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-surefire-report-plugin</artifactId>
- <version>2.8</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- <version>2.5</version>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>2.3.2</version>
- </plugin>
- </plugins>
- </pluginManagement>
-
<plugins>
<plugin>
<groupId>org.apache.rat</groupId>
@@ -245,11 +140,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>${target.jdk}</source>
- <target>${target.jdk}</target>
- <encoding>iso8859-1</encoding>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -270,61 +160,6 @@
</archive>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <executions>
- <execution>
- <id>aggregate</id>
- <goals>
- <goal>aggregate</goal>
- </goals>
- <phase>site</phase>
- </execution>
- <execution>
- <id>javadoc-jar</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <excludePackageNames>org.apache.james.mime4j.field.address.parser:org.apache.james.mime4j.field.contentdisposition.parser:org.apache.james.mime4j.field.contenttype.parser:org.apache.james.mime4j.field.datetime.parser:org.apache.james.mime4j.field.language.parser:org.apache.james.mime4j.field.mimeversion.parser:org.apache.james.mime4j.field.structured.parser</excludePackageNames>
- </configuration>
- </plugin>
- <!-- Add NOTICE and LICENSE to generated JAR -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-remote-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>process</goal>
- </goals>
- <configuration>
- <resourceBundles>
- <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
- </resourceBundles>
- <properties>
- <addLicense>true</addLicense>
- </properties>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
@@ -376,162 +211,6 @@
<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>
- <exclude>**/main/resources/long-multipart.msg</exclude>
- <exclude>**/main/resources/META-INF/services/org.apache.james.mime4j.dom.MessageServiceFactory</exclude>
- <exclude>**/test/resources/testmsgs/*</exclude>
- <exclude>**/test/resources/mimetools-testmsgs/*</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>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>
Modified: james/trunk/sandbox/felixk/mime4j/src/reporting-site/site.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/mime4j/src/reporting-site/site.xml?rev=1186619&r1=1186618&r2=1186619&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/mime4j/src/reporting-site/site.xml (original)
+++ james/trunk/sandbox/felixk/mime4j/src/reporting-site/site.xml Thu Oct 20 05:13:40 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 Mime4J</name>
<src>images/james-mime4j-logo.gif</src>
@@ -32,12 +26,6 @@
<alt>james-mime4j-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/mime4j/src/site/site.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/mime4j/src/site/site.xml?rev=1186619&r1=1186618&r2=1186619&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/mime4j/src/site/site.xml (original)
+++ james/trunk/sandbox/felixk/mime4j/src/site/site.xml Thu Oct 20 05:13:40 2011
@@ -18,11 +18,6 @@
under the License.
-->
<project name="Apache James Mime4J">
- <skin>
- <groupId>org.apache.james</groupId>
- <artifactId>james-skin</artifactId>
- <version>1.7-SNAPSHOT</version>
- </skin>
<bannerLeft>
<name>JAMES Mime4J</name>
@@ -31,12 +26,6 @@
<alt>james-mime4j-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="mime4j">
<item name="Overview" href="/index.html"/>
Modified: james/trunk/sandbox/felixk/mime4j/storage/pom.xml
URL: http://svn.apache.org/viewvc/james/trunk/sandbox/felixk/mime4j/storage/pom.xml?rev=1186619&r1=1186618&r2=1186619&view=diff
==============================================================================
--- james/trunk/sandbox/felixk/mime4j/storage/pom.xml (original)
+++ james/trunk/sandbox/felixk/mime4j/storage/pom.xml Thu Oct 20 05:13:40 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-storage</artifactId>
<version>0.8-SNAPSHOT</version>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org