Author: felixk
Date: Thu Sep 8 22:46:09 2011
New Revision: 1166935
URL: http://svn.apache.org/viewvc?rev=1166935&view=rev
Log:
- Make Maven happy and add an empty <relativePath>
- No need to define groupId twice, it's inherited from the parent
- Use released maven-site-plugin
- Fix ciManagement
- Prerequisite Java 1.6
- Update dependencies
- Update plugins
Modified:
james/mailet/standard/trunk/pom.xml
james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java
Modified: james/mailet/standard/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailet/standard/trunk/pom.xml?rev=1166935&r1=1166934&r2=1166935&view=diff
==============================================================================
--- james/mailet/standard/trunk/pom.xml (original)
+++ james/mailet/standard/trunk/pom.xml Thu Sep 8 22:46:09 2011
@@ -23,8 +23,8 @@
<groupId>org.apache.james</groupId>
<artifactId>james-project</artifactId>
<version>1.6</version>
+ <relativePath></relativePath>
</parent>
- <groupId>org.apache.james</groupId>
<artifactId>apache-standard-mailets</artifactId>
<name>Apache JAMES Standard Mailets</name>
<url>http://james.apache.org/mailet/standard/</url>
@@ -41,7 +41,7 @@
<!-- Override the source descriptor -->
<sourceReleaseAssemblyDescriptor>src</sourceReleaseAssemblyDescriptor>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <target.jdk>1.5</target.jdk>
+ <target.jdk>1.6</target.jdk>
</properties>
<distributionManagement>
@@ -51,6 +51,11 @@
</site>
</distributionManagement>
+ <ciManagement>
+ <system>Jenkins</system>
+ <url>https://builds.apache.org/view/G-L/view/James/</url>
+ </ciManagement>
+
<issueManagement>
<system>JIRA</system>
<url>http://issues.apache.org/jira/browse/MAILETSTANDARD</url>
@@ -72,29 +77,29 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4.3</version>
+ <version>1.4.4</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.0.1</version>
+ <version>3.1</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet-base</artifactId>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mailet-base</artifactId>
<type>test-jar</type>
<scope>test</scope>
- <version>1.1</version>
+ <version>1.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.9</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -120,12 +125,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.3.2</version>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.2.0</version>
+ <version>2.3.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -140,22 +145,27 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
- <version>2.2</version>
+ <version>2.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.7</version>
+ <version>2.8</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.8</version>
+ <version>2.9</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-changes-plugin</artifactId>
- <version>2.4</version>
+ <version>2.6</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -163,6 +173,26 @@
<version>2.5</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>3.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <version>2.3</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.4</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>versions-maven-plugin</artifactId>
+ <version>1.2</version>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
<version>2.3.2</version>
@@ -180,7 +210,7 @@
<plugin>
<groupId>org.apache.james</groupId>
<artifactId>maven-mailetdocs-plugin</artifactId>
- <version>0.1</version>
+ <version>0.2-SNAPSHOT</version>
</plugin>
</plugins>
</pluginManagement>
@@ -243,13 +273,10 @@
</instructions>
</configuration>
</plugin>
- <!--
<plugin>
- <groupId>org.apache.james.mailet</groupId>
+ <groupId>org.apache.james</groupId>
<artifactId>maven-mailetdocs-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
</plugin>
- -->
<!--
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -461,6 +488,23 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>versions-maven-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>dependency-updates-report</report>
+ <report>plugin-updates-report</report>
+ <!-- report>property-updates-report</report -->
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
Modified:
james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java
URL:
http://svn.apache.org/viewvc/james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java?rev=1166935&r1=1166934&r2=1166935&view=diff
==============================================================================
---
james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java
(original)
+++
james/mailet/standard/trunk/src/test/java/org/apache/james/transport/matchers/HostIsLocalTest.java
Thu Sep 8 22:46:09 2011
@@ -25,6 +25,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
+import java.util.List;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
@@ -32,10 +33,12 @@ import javax.mail.internet.MimeMessage;
import junit.framework.TestCase;
import org.apache.mailet.HostAddress;
+import org.apache.mailet.LookupException;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetContext;
import org.apache.mailet.Matcher;
+import org.apache.mailet.TemporaryLookupException;
import org.apache.mailet.base.test.FakeMail;
import org.apache.mailet.base.test.FakeMatcherConfig;
@@ -185,6 +188,21 @@ public class HostIsLocalTest extends Tes
}
+ public void log(LogLevel level, String message) {
+ throw new UnsupportedOperationException(
+ "Unimplemented mock service");
+ }
+
+ public void log(LogLevel level, String message, Throwable t) {
+ throw new UnsupportedOperationException(
+ "Unimplemented mock service");
+ }
+
+ public List<String> dnsLookup(String name, RecordType type) throws
TemporaryLookupException, LookupException {
+ throw new UnsupportedOperationException(
+ "Unimplemented mock service");
+ }
+
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
