diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
new file mode 100644
index 000000000..43d628161
--- /dev/null
+++ b/.mvn/extensions.xml
@@ -0,0 +1,7 @@
+<extensions xmlns="http://maven.apache.org/EXTENSIONS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/EXTENSIONS/1.0.0 http://maven.apache.org/xsd/core-extensions-1.0.0.xsd">
+  <extension>
+    <groupId>io.jenkins.tools.incrementals</groupId>
+    <artifactId>git-changelist-maven-extension</artifactId>
+    <version>1.2</version>
+  </extension>
+</extensions>
diff --git a/.mvn/maven.config b/.mvn/maven.config
new file mode 100644
index 000000000..2a0299c48
--- /dev/null
+++ b/.mvn/maven.config
@@ -0,0 +1,2 @@
+-Pconsume-incrementals
+-Pmight-produce-incrementals
diff --git a/pom.xml b/pom.xml
index 43e85a16e..e16952cb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,8 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.3</version>
+        <version>4.8</version>
+        <relativePath />
     </parent>
 
     <licenses>
@@ -17,7 +18,7 @@
 
     <artifactId>email-ext</artifactId>
     <packaging>hpi</packaging>
-    <version>2.77-SNAPSHOT</version>
+    <version>${revision}${changelist}</version>
     <name>Email Extension Plugin</name>
     <description>Allows to configure every aspect of email notifications: when an email is sent, who should receive it and what the email says</description>
     <url>https://github.com/jenkinsci/email-ext-plugin</url>
@@ -27,6 +28,9 @@
     </issueManagement>
 
     <properties>
+        <revision>2.77</revision>
+        <changelist>-SNAPSHOT</changelist>
+        <gitHubRepo>jenkinsci/email-ext-plugin</gitHubRepo>
         <java.level>8</java.level>
         <jenkins.version>2.164.3</jenkins.version>
         <hpi.compatibleSinceVersion>2.57.2</hpi.compatibleSinceVersion>
@@ -315,9 +319,10 @@
     </dependencies>
 
     <scm>
-        <connection>scm:git:https://github.com/jenkinsci/email-ext-plugin.git</connection>
-        <developerConnection>scm:git:git@github.com:jenkinsci/email-ext-plugin.git</developerConnection>
-        <tag>HEAD</tag>
+        <connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
+        <developerConnection>scm:git:git@github.com:${gitHubRepo}.git</developerConnection>
+        <url>https://github.com/${gitHubRepo}</url>
+        <tag>${scmTag}</tag>
     </scm>
 
     <repositories>
@@ -375,4 +380,4 @@
         </pluginRepository>
     </pluginRepositories>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/src/main/java/hudson/plugins/emailext/plugins/trigger/AbstractScriptTrigger.java b/src/main/java/hudson/plugins/emailext/plugins/trigger/AbstractScriptTrigger.java
index 452eb3a3f..e01d5da1d 100644
--- a/src/main/java/hudson/plugins/emailext/plugins/trigger/AbstractScriptTrigger.java
+++ b/src/main/java/hudson/plugins/emailext/plugins/trigger/AbstractScriptTrigger.java
@@ -173,7 +173,7 @@ private Object evaluate(AbstractBuild<?, ?> build, TaskListener listener) throws
      * @throws ObjectStreamException if the object cannot be restored.
      * @see <a href="http://download.oracle.com/javase/1.3/docs/guide/serialization/spec/input.doc6.html">The Java Object Serialization Specification</a>
      */
-    private Object readResolve() throws ObjectStreamException {
+    protected Object readResolve() throws ObjectStreamException {
         if (triggerScript != null && secureTriggerScript == null) {
             this.secureTriggerScript = new SecureGroovyScript(triggerScript, false, null);
             this.secureTriggerScript.configuring(ApprovalContext.create());
diff --git a/src/test/java/hudson/plugins/emailext/ExtendedEmailPublisherTest.java b/src/test/java/hudson/plugins/emailext/ExtendedEmailPublisherTest.java
index 7685bcc28..4946d1141 100644
--- a/src/test/java/hudson/plugins/emailext/ExtendedEmailPublisherTest.java
+++ b/src/test/java/hudson/plugins/emailext/ExtendedEmailPublisherTest.java
@@ -36,6 +36,7 @@
 import org.apache.commons.io.IOUtils;
 import org.jenkinsci.plugins.scriptsecurity.scripts.ScriptApproval;
 import org.junit.*;
+import org.junit.rules.TestName;
 import org.jvnet.hudson.test.BuildWatcher;
 import org.jvnet.hudson.test.FailureBuilder;
 import org.jvnet.hudson.test.Issue;
@@ -84,6 +85,8 @@ public class ExtendedEmailPublisherTest {
     public static JenkinsRule j = new JenkinsRule();
     private AuthorizationStrategy oldAuthorizationStrategy;
     private SecurityRealm oldSecurityRealm;
+    @Rule
+    public TestName testName = new TestName();
 
     @Before
     public void before() throws Throwable {
@@ -102,7 +105,7 @@ public void before() throws Throwable {
         publisher.setPresendScript("");
         publisher.setPostsendScript("");
 
-        project = j.createFreeStyleProject();
+        project = j.createFreeStyleProject(testName.getMethodName());
         project.getPublishersList().add(publisher);
 
         recProviders = Collections.emptyList();