Merge pull request #39 from apache/dependabot/github_actions/actions/cache-v2.1.4
Bump actions/cache from v2 to v2.1.4
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index ccc03d4..921bc65 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -24,11 +24,9 @@
continue-on-error: ${{ matrix.experimental }}
strategy:
matrix:
- java: [ 8, 11, 15 ]
+ java: [ 8, 11, 16 ]
experimental: [false]
include:
- - java: 16-ea
- experimental: true
- java: 17-ea
experimental: true
@@ -45,4 +43,4 @@
with:
java-version: ${{ matrix.java }}
- name: Build with Maven
- run: mvn -V apache-rat:check spotbugs:check javadoc:javadoc -Ddoclint=all package --file pom.xml --no-transfer-progress
+ run: mvn -V -Ddoclint=all --file pom.xml --no-transfer-progress
diff --git a/pom.xml b/pom.xml
index 16ac56a..4b8864a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.commons</groupId>
<artifactId>commons-parent</artifactId>
- <version>51</version>
+ <version>52</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>commons-email</artifactId>
@@ -242,7 +242,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -254,7 +254,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.6</version>
+ <version>2.8.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -292,8 +292,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <maven.compiler.source>1.7</maven.compiler.source>
- <maven.compiler.target>1.7</maven.compiler.target>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
<commons.componentid>email</commons.componentid>
<commons.module.name>org.apache.commons.mail</commons.module.name>
<commons.jira.id>EMAIL</commons.jira.id>
@@ -305,14 +305,16 @@
<!-- override the default commons encoding property -->
<commons.encoding>UTF-8</commons.encoding>
- <powermock.version>2.0.5</powermock.version>
+ <powermock.version>2.0.9</powermock.version>
<easymock.version>4.2</easymock.version>
<findbugs.version>3.0.5</findbugs.version>
<spotbugs.plugin.version>4.0.4</spotbugs.plugin.version>
<spotbugs.impl.version>4.0.6</spotbugs.impl.version>
+ <commons.jacoco.version>0.8.6</commons.jacoco.version>
</properties>
<build>
+ <defaultGoal>clean verify apache-rat:check clirr:check spotbugs:check javadoc:javadoc</defaultGoal>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index eab7477..4348467 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -36,7 +36,7 @@
Update from Java 6 to 7.
</action>
<action type="update" due-to="Gary Gregory" dev="ggregory">
- Update commons-parent from 50 to 51.
+ Update commons-parent from 50 to 52.
</action>
<action type="update" due-to="Dependabot" dev="ggregory">
Update actions/checkout from v1 to v2.3.2 #17, #25.
@@ -47,8 +47,8 @@
<action type="update" due-to="Dependabot" dev="ggregory">
Update jakarta.mail from 1.6.4 to 1.6.5 #22.
</action>
- <action type="update" due-to="Dependabot" dev="ggregory">
- Bump junit from 4.13 to 4.13.1 #32.
+ <action type="update" due-to="Dependabot, Gary Gregory" dev="ggregory">
+ Bump junit from 4.13 to 4.13.2 #32.
</action>
<action type="update" due-to="Dependabot" dev="ggregory">
Bump actions/setup-java from v1.4.0 to v1.4.3 #30
@@ -62,6 +62,12 @@
<action type="update" due-to="Dependabot" dev="ggregory">
Bump maven-pmd-plugin from 3.13.0 to 3.14.0 #34.
</action>
+ <action type="update" due-to="Gary Gregory">
+ Update from Java 7 to 8.
+ </action>
+ <action type="update" due-to="Gary Gregory">
+ Update tests from Apache Commons IO 2.6 to 2.8.0.
+ </action>
</release>
<release version="1.5.1" date="2017-MM-DD">
<action issue="EMAIL-176" type="add" dev="pschumacher">Add Automatic-Module-Name MANIFEST entry for Java 9 compatibility</action>
diff --git a/src/main/java/org/apache/commons/mail/Email.java b/src/main/java/org/apache/commons/mail/Email.java
index cbc23a1..16a8ac2 100644
--- a/src/main/java/org/apache/commons/mail/Email.java
+++ b/src/main/java/org/apache/commons/mail/Email.java
@@ -1558,7 +1558,7 @@
{
return this.session.getProperty(EmailConstants.MAIL_HOST);
}
- else if (EmailUtils.isNotEmpty(this.hostName))
+ if (EmailUtils.isNotEmpty(this.hostName))
{
return this.hostName;
}
@@ -1576,7 +1576,7 @@
{
return this.session.getProperty(EmailConstants.MAIL_PORT);
}
- else if (EmailUtils.isNotEmpty(this.smtpPort))
+ if (EmailUtils.isNotEmpty(this.smtpPort))
{
return this.smtpPort;
}
@@ -1746,7 +1746,7 @@
{
return this.session.getProperty(EmailConstants.MAIL_SMTP_SOCKET_FACTORY_PORT);
}
- else if (EmailUtils.isNotEmpty(this.sslSmtpPort))
+ if (EmailUtils.isNotEmpty(this.sslSmtpPort))
{
return this.sslSmtpPort;
}
diff --git a/src/main/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java b/src/main/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
index 124dde7..4f1fcdb 100644
--- a/src/main/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
+++ b/src/main/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
@@ -139,6 +139,6 @@
*/
private String getResourceName(final String resourceLocation)
{
- return (getClassPathBase() + resourceLocation).replaceAll("//", "/");
+ return (getClassPathBase() + resourceLocation).replace("//", "/");
}
}
diff --git a/src/main/java/org/apache/commons/mail/resolver/DataSourceUrlResolver.java b/src/main/java/org/apache/commons/mail/resolver/DataSourceUrlResolver.java
index ca516f9..c832fc8 100644
--- a/src/main/java/org/apache/commons/mail/resolver/DataSourceUrlResolver.java
+++ b/src/main/java/org/apache/commons/mail/resolver/DataSourceUrlResolver.java
@@ -127,6 +127,6 @@
return new URL(resourceLocation);
}
- return new URL(getBaseUrl(), resourceLocation.replaceAll("&", "&"));
+ return new URL(getBaseUrl(), resourceLocation.replace("&", "&"));
}
}
diff --git a/src/test/java/org/apache/commons/mail/EmailTest.java b/src/test/java/org/apache/commons/mail/EmailTest.java
index ffb965a..323eedc 100644
--- a/src/test/java/org/apache/commons/mail/EmailTest.java
+++ b/src/test/java/org/apache/commons/mail/EmailTest.java
@@ -235,12 +235,12 @@
email.setSmtpPort(1);
assertEquals(
1,
- Integer.valueOf(email.getSmtpPort()).intValue());
+ Integer.parseInt(email.getSmtpPort()));
email.setSmtpPort(Integer.MAX_VALUE);
assertEquals(
Integer.MAX_VALUE,
- Integer.valueOf(email.getSmtpPort()).intValue());
+ Integer.parseInt(email.getSmtpPort()));
}
@Test(expected = IllegalArgumentException.class)
