Author: felixk
Date: Tue Nov 22 06:13:02 2011
New Revision: 1204822
URL: http://svn.apache.org/viewvc?rev=1204822&view=rev
Log:
Update to james-project 1.8
Modified:
james/jdkim/trunk/assemble/pom.xml
james/jdkim/trunk/mailets/pom.xml
james/jdkim/trunk/main/pom.xml
james/jdkim/trunk/pom.xml
james/jdkim/trunk/src/reporting-site/site.xml
james/jdkim/trunk/src/site/site.xml
Modified: james/jdkim/trunk/assemble/pom.xml
URL:
http://svn.apache.org/viewvc/james/jdkim/trunk/assemble/pom.xml?rev=1204822&r1=1204821&r2=1204822&view=diff
==============================================================================
--- james/jdkim/trunk/assemble/pom.xml (original)
+++ james/jdkim/trunk/assemble/pom.xml Tue Nov 22 06:13:02 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james.jdkim</groupId>
<artifactId>apache-jdkim</artifactId>
<packaging>pom</packaging>
@@ -63,8 +62,8 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
<configuration>
<descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory>
<tarLongFileMode>gnu</tarLongFileMode>
Modified: james/jdkim/trunk/mailets/pom.xml
URL:
http://svn.apache.org/viewvc/james/jdkim/trunk/mailets/pom.xml?rev=1204822&r1=1204821&r2=1204822&view=diff
==============================================================================
--- james/jdkim/trunk/mailets/pom.xml (original)
+++ james/jdkim/trunk/mailets/pom.xml Tue Nov 22 06:13:02 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james.jdkim</groupId>
<artifactId>apache-jdkim-mailets</artifactId>
<name>jDKIM Mailets for Apache James</name>
@@ -40,7 +39,7 @@
<distributionManagement>
<site>
<id>jdkim-website-mailets</id>
-
<url>scp://people.apache.org/www/james.apache.org/jdkim/mailets/</url>
+
<url>scpexe://people.apache.org/www/james.apache.org/jdkim/mailets/</url>
</site>
</distributionManagement>
Modified: james/jdkim/trunk/main/pom.xml
URL:
http://svn.apache.org/viewvc/james/jdkim/trunk/main/pom.xml?rev=1204822&r1=1204821&r2=1204822&view=diff
==============================================================================
--- james/jdkim/trunk/main/pom.xml (original)
+++ james/jdkim/trunk/main/pom.xml Tue Nov 22 06:13:02 2011
@@ -30,7 +30,6 @@
<relativePath>../pom.xml</relativePath>
</parent>
- <groupId>org.apache.james.jdkim</groupId>
<artifactId>apache-jdkim-library</artifactId>
<packaging>jar</packaging>
@@ -39,37 +38,10 @@
<url>http://james.apache.org/jdkim/main/</url>
<inceptionYear>2008</inceptionYear>
- <mailingLists>
- <mailingList>
- <name>Apache James User</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
-
<archive>http://mail-archives.apache.org/mod_mbox/james-server-user/</archive>
- </mailingList>
- <mailingList>
- <name>Apache James Developer</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
-
<archive>http://mail-archives.apache.org/mod_mbox/james-server-dev/</archive>
- </mailingList>
- </mailingLists>
-
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/james/jdkim/trunk</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/james/jdkim/trunk</developerConnection>
- <url>http://svn.apache.org/viewvc/james/jdkim/trunk/</url>
- </scm>
- <issueManagement>
- <system>JIRA</system>
- <url>http://issues.apache.org/jira/browse/JDKIM</url>
- </issueManagement>
-
<distributionManagement>
<site>
<id>jdkim-website-main</id>
- <url>scp://people.apache.org/www/james.apache.org/jdkim/main/</url>
+
<url>scpexe://people.apache.org/www/james.apache.org/jdkim/main/</url>
</site>
</distributionManagement>
@@ -153,6 +125,7 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
+ <inherited>true</inherited>
<configuration>
<excludes>
<!-- test resources created by JAMES committers / we
can't include ALv2 headers there -->
@@ -200,7 +173,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.1</version>
<executions>
<execution>
<id>bundle-manifest</id>
@@ -275,7 +247,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.3.1</version>
<executions>
<execution>
<phase>package</phase>
Modified: james/jdkim/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/jdkim/trunk/pom.xml?rev=1204822&r1=1204821&r2=1204822&view=diff
==============================================================================
--- james/jdkim/trunk/pom.xml (original)
+++ james/jdkim/trunk/pom.xml Tue Nov 22 06:13:02 2011
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.james</groupId>
<artifactId>james-project</artifactId>
- <version>1.6</version>
+ <version>1.8</version>
<relativePath></relativePath>
</parent>
@@ -35,21 +35,11 @@
<version>0.3-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache JAMES DomainKey Project</name>
- <description>Apache JAMES jDKIM Project</description>
+ <name>Apache James DomainKey Project (jDKIM)</name>
+ <description>DomainKeys Identified Mail (DKIM) Signatures</description>
<url>http://james.apache.org/jdkim/</url>
<inceptionYear>2009</inceptionYear>
- <mailingLists>
- <mailingList>
- <name>Apache JAMES Server List</name>
- <subscribe>[email protected]</subscribe>
- <unsubscribe>[email protected]</unsubscribe>
- <post>[email protected]</post>
-
<archive>http://mail-archives.apache.org/mod_mbox/james-server-dev/</archive>
- </mailingList>
- </mailingLists>
-
<modules>
<module>main</module>
<module>mailets</module>
@@ -69,20 +59,16 @@
<distributionManagement>
<site>
<id>jdkim-current-website</id>
- <url>scp://people.apache.org/www/james.apache.org/jdkim/</url>
+ <url>scpexe://people.apache.org/www/james.apache.org/jdkim/</url>
</site>
</distributionManagement>
- <properties>
- <target.jdk>1.5</target.jdk>
- </properties>
-
<dependencyManagement>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.2</version>
+ <version>4.10</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -93,12 +79,12 @@
<dependency>
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.4_mail</artifactId>
- <version>1.6</version>
+ <version>1.8.3</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.4</version>
+ <version>1.5</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -223,141 +209,18 @@
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-core</artifactId>
- <version>0.7</version>
+ <version>0.7.1</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j-dom</artifactId>
- <version>0.7</version>
+ <version>0.7.1</version>
</dependency>
</dependencies>
</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-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-surefire-plugin</artifactId>
- <version>2.8</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-remote-resources-plugin</artifactId>
- <version>1.2</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-surefire-report-plugin</artifactId>
- <version>2.8</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-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.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
- </plugin>
- <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-doap-plugin</artifactId>
- <version>1.1</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.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <inherited>false</inherited>
- <executions>
- <execution>
- <phase>verify</phase>
- <goals>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <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>
- <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>
- </plugin>
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -394,168 +257,6 @@
</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>true</generateReports>
- </configuration>
- </execution>
- </executions>
- <configuration>
-
<siteDirectory>${maven-site-plugin.siteDirectory}</siteDirectory>
- <generateReports>true</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>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.codehaus.mojo</groupId>
- <artifactId>emma-maven-plugin</artifactId>
- </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/jdkim/trunk/src/reporting-site/site.xml
URL:
http://svn.apache.org/viewvc/james/jdkim/trunk/src/reporting-site/site.xml?rev=1204822&r1=1204821&r2=1204822&view=diff
==============================================================================
--- james/jdkim/trunk/src/reporting-site/site.xml (original)
+++ james/jdkim/trunk/src/reporting-site/site.xml Tue Nov 22 06:13:02 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 jDKIM</name>
<src>/images/logos/james-jdkim-logo.gif</src>
@@ -32,12 +26,6 @@
<alt>james-jdkim-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/jdkim/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/james/jdkim/trunk/src/site/site.xml?rev=1204822&r1=1204821&r2=1204822&view=diff
==============================================================================
--- james/jdkim/trunk/src/site/site.xml (original)
+++ james/jdkim/trunk/src/site/site.xml Tue Nov 22 06:13:02 2011
@@ -19,12 +19,6 @@
-->
<project name="James jDKIM">
- <skin>
- <groupId>org.apache.james</groupId>
- <artifactId>james-skin</artifactId>
- <version>1.7-SNAPSHOT</version>
- </skin>
-
<bannerLeft>
<name>JAMES jDKIM</name>
<src>images/logos/james-jdkim-logo.gif</src>
@@ -32,12 +26,6 @@
<alt>james-jdkim-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>
<head>
<link rel="meta" title="DOAP"
href="${project.url}/doap_maven-doap-plugin.rdf" type="application/rdf+xml"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
