From 5778d90251f6352b54f1e2aa3de73d05594f2d34 Mon Sep 17 00:00:00 2001
From: Tim Jacomb <timjacomb1@gmail.com>
Date: Sat, 8 Aug 2026 22:47:59 +0100
Subject: [PATCH] Migrate the last Commons Lang 2 usage to native Java

#519 migrated PluginPatchsetCreatedEvent but missed the sibling
PluginChangeMergedEvent, which still imported Commons Lang 2.

Also enables ban-commons-lang-2 so the enforcer catches any future
regression -- had it been on, the missed file would have failed the
build at the time.
---
 pom.xml                                                        | 1 +
 .../trigger/hudsontrigger/events/PluginChangeMergedEvent.java  | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b09cca522..dedc8a611 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,6 +61,7 @@
         <changelist>999999-SNAPSHOT</changelist>
         <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
         <no-test-jar>false</no-test-jar>
+        <ban-commons-lang-2.skip>false</ban-commons-lang-2.skip>
         <findbugs.failOnError>false</findbugs.failOnError>
         <build-failure-analyzer-plugin.version>3.887.vc872cf1b_7dff</build-failure-analyzer-plugin.version>
         <checkstyle.version>3.6.0</checkstyle.version>
diff --git a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/events/PluginChangeMergedEvent.java b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/events/PluginChangeMergedEvent.java
index 0da9c4c01..2e7b40349 100644
--- a/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/events/PluginChangeMergedEvent.java
+++ b/src/main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/events/PluginChangeMergedEvent.java
@@ -29,7 +29,6 @@
 import hudson.Extension;
 import hudson.model.Descriptor;
 import jenkins.model.Jenkins;
-import org.apache.commons.lang.StringUtils;
 import org.jenkinsci.Symbol;
 import org.kohsuke.stapler.DataBoundConstructor;
 import org.kohsuke.stapler.DataBoundSetter;
@@ -96,7 +95,7 @@ public boolean shouldTriggerOn(GerritTriggeredEvent event) {
         if (!super.shouldTriggerOn(event)) {
             return false;
         }
-        if (StringUtils.isNotEmpty(commitMessageContainsRegEx)) {
+        if (commitMessageContainsRegEx != null && !commitMessageContainsRegEx.isEmpty()) {
             if (commitMessagePattern == null) {
                 commitMessagePattern = Pattern.compile(
                         this.commitMessageContainsRegEx, Pattern.DOTALL | Pattern.MULTILINE);