Bump up to collections4 (#235)

damianszczepanik · Jan 5, 2024 · 159abc0 · 159abc0
1 parent 8e20576
commit 159abc0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 [![Github build](https://github.com/damianszczepanik/maven-cucumber-reporting/actions/workflows/build.yml/badge.svg?branch=master)](https://github.com/damianszczepanik/maven-cucumber-reporting/actions/workflows/build.yml)
 
-[![Maven Central](https://img.shields.io/maven-central/v/net.masterthought/maven-cucumber-reporting.svg)](http://search.maven.org/#search|gav|1|g%3A%22net.masterthought%22%20AND%20a%3A%22maven-cucumber-reporting%22)
+![GitHub tag](https://img.shields.io/github/v/tag/damianszczepanik/maven-cucumber-reporting?label=maven%20central)
 [![License](https://img.shields.io/badge/license-GNU%20LGPL%20v2.1-blue.svg)](https://raw.githubusercontent.com/damianszczepanik/maven-cucumber-reporting/master/LICENCE)
 
 [![Live Demo](https://img.shields.io/badge/Live%20Demo-Online-blue.svg)](https://damianszczepanik.github.io/cucumber-html-reports/overview-features.html)

diff --git a/pom.xml b/pom.xml
@@ -5,11 +5,9 @@
     <packaging>maven-plugin</packaging>
     <version>5.7.8-SNAPSHOT</version>
     <name>maven-cucumber-reporting</name>
-    <url>http://maven.apache.org</url>
+    <url>https://github.com/damianszczepanik/maven-cucumber-reporting</url>
 
     <properties>
-        <commons-collections.version>3.2.2</commons-collections.version>
-
         <gitHubRepo>damianszczepanik/maven-cucumber-reporting</gitHubRepo>
     </properties>
 
@@ -161,9 +159,9 @@
 			<scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>${commons-collections.version}</version>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>4.4</version>
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>

diff --git a/src/main/java/net/masterthought/cucumber/CucumberReportGeneratorMojo.java b/src/main/java/net/masterthought/cucumber/CucumberReportGeneratorMojo.java
@@ -6,16 +6,16 @@
 import java.util.Map;
 import java.util.Collections;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
-import org.codehaus.plexus.util.DirectoryScanner;
-import org.codehaus.plexus.util.StringUtils;
 
 import net.masterthought.cucumber.json.support.Status;
 import net.masterthought.cucumber.reducers.ReducingMethod;
+import org.codehaus.plexus.util.DirectoryScanner;
 
 /**
  * Goal which generates a Cucumber Report.
@@ -205,9 +205,9 @@ public void execute() throws MojoExecutionException {
             if (mergeFeaturesById) {
                 configuration.addReducingMethod(ReducingMethod.MERGE_FEATURES_BY_ID);
             }
-            if (!MapUtils.isEmpty(classifications)) {
+            if (MapUtils.isNotEmpty(classifications)) {
                 for (Map.Entry<String, String> entry : classifications.entrySet()) {
-                    configuration.addClassifications(StringUtils.capitalise(entry.getKey()), entry.getValue());
+                    configuration.addClassifications(StringUtils.capitalize(entry.getKey()), entry.getValue());
                 }
             }
             if (CollectionUtils.isNotEmpty(classificationFilesToProcess)) {