Author: tn
Date: Tue Jul 1 08:21:16 2014
New Revision: 1607013
URL: http://svn.apache.org/r1607013
Log:
[EMAIL-140] Fix test execution errors with Java 8.
Modified:
commons/proper/email/trunk/pom.xml
commons/proper/email/trunk/src/changes/changes.xml
Modified: commons/proper/email/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1607013&r1=1607012&r2=1607013&view=diff
==============================================================================
--- commons/proper/email/trunk/pom.xml (original)
+++ commons/proper/email/trunk/pom.xml Tue Jul 1 08:21:16 2014
@@ -256,19 +256,19 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
- <version>1.4.12</version>
+ <version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-easymock</artifactId>
- <version>1.4.12</version>
+ <version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>3.1</version>
+ <version>${easymock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -293,6 +293,9 @@
<!-- override the default commons encoding property -->
<commons.encoding>UTF-8</commons.encoding>
+
+ <powermock.version>1.4.12</powermock.version>
+ <easymock.version>3.1</easymock.version>
</properties>
<build>
@@ -431,5 +434,18 @@
</site>
</distributionManagement>
</profile>
+
+ <profile>
+ <!-- Use a profile to detect if we are running in a
Java 1.8 environment.
+ Use different versions of easymock/powermock,
otherwise the test execution will fail -->
+ <id>test_java_5_to_7</id>
+ <activation>
+ <jdk>1.8</jdk>
+ </activation>
+ <properties>
+ <powermock.version>1.5.5</powermock.version>
+ <easymock.version>3.2</easymock.version>
+ </properties>
+ </profile>
</profiles>
</project>
Modified: commons/proper/email/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/changes/changes.xml?rev=1607013&r1=1607012&r2=1607013&view=diff
==============================================================================
--- commons/proper/email/trunk/src/changes/changes.xml (original)
+++ commons/proper/email/trunk/src/changes/changes.xml Tue Jul 1 08:21:16 2014
@@ -23,6 +23,9 @@
<body>
<release version="1.3.3" date="xxx">
+ <action dev="tn" type="fix" issue="EMAIL-140" date="2014-07-01"
due-to="Gary Gregory">
+ Fix test execution errors with Java 8.
+ </action>
<action dev="tn" type="fix" issue="EMAIL-138" date="2014-05-06"
due-to="qed">
The filename of an attachment was not properly encoded in case it
contained
non-ascii characters.
