Small change to 4.0.0 Release notes (#3235)

* Small change to 4.0.0 Release notes * Updated Guava and some Maven plugins * Updated commons-collections dependency * Spell checks --------- Co-authored-by: â�dkumarra <â�[email protected]> Co-authored-by: â <â>
serenity-bdd · Aug 21, 2023 · 1716770 · 1716770
1 parent ce4e642
commit 1716770
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 24 deletions.
diff --git a/build.gradle b/build.gradle
@@ -74,7 +74,7 @@ allprojects {
             // whe//n updating this list, update Serenity's declared deps if exists
             // TODO make work for generated Maven POM...
             // it's working for gradle build, but also had to exclude old transitives for generated POM
-            force "commons-collections:commons-collections:${commonsCollectionsVersion}",
+            force "org.apache.commons:commons-collections4:${commonsCollectionsVersion}",
                     "com.thoughtworks.xstream:xstream:${xstreamVersion}",
                     "xml-apis:xml-apis:${xmlApisVersion}",
                     "org.apache.httpcomponents:httpmime:${httpclientVersion}",

diff --git a/docs/release-notes/4.0.0.md b/docs/release-notes/4.0.0.md
@@ -1,6 +1,6 @@
 # Serenity 4 Release Notes
 
-Serenity 4.0.0 is a major upgrade. The most significant change is updating the library to support Java 11, in line with other popular testing libraries such as Selenium and Mockito. However the migration to Java 11 requires changes in the module structure, which requires some breaking changes to the package structure.
+Serenity 4.0.0 is a major upgrade. The most significant change is updating the library to support Java 11, in line with other popular testing libraries such as Selenium and Mockito. However, the migration to Java 11 requires changes in the module structure, which requires some breaking changes to the package structure.
 
 These release notes will explain how to update your project to work with Serenity BDD 4.x.
 
@@ -12,17 +12,17 @@ The following table indicates the main changes:
 
 ## Package changes
 
-| Module                        | Old packages                                 | New Packages |
-| --------                      | ------------                                 | ------------ |
-| serenity-screenplay-webdriver | net.serenity.screenplay.*                    | net.serenity.screenplay.webdriver.* |
+| Module                        | Old packages                                 | New Packages                                   |
+|-------------------------------|----------------------------------------------|------------------------------------------------|
+| serenity-screenplay-webdriver | net.serenity.screenplay.*                    | net.serenity.screenplay.webdriver.*            |
 |                               | net.serenitybdd.screenplay.webtest.actions.* | net.serenitybdd.screenplay.webdriver.actions.* |
-| serenity-model                | net.serenitybdd.core.*                       | net.serenitybdd.model.* |
-|                               | net.thucydides.core.annotations.*            | net.serenitybdd.annotations.* |
-|                               | Other net.thucydides.core.*                  | net.thucydides.model.*  |
+| serenity-model                | net.serenitybdd.core.*                       | net.serenitybdd.model.*                        |
+|                               | net.thucydides.core.annotations.*            | net.serenitybdd.annotations.*                  |
+|                               | Other net.thucydides.core.*                  | net.thucydides.model.*                         |
 
 For example:
-- Replace any annotations previously in `net.thucydides.core.annotations` (e.g @Step) in `net.serenitybdd.annotations`
-- Replace `net.thucydides.core.util.EnvironmentVariables` with `net.thucydides.core.util.EnvironmentVariables`
+- Replace any annotations previously in `net.thucydides.core.annotations` (e.g. @Step) in `net.serenitybdd.annotations`
+- Replace `net.thucydides.core.util.EnvironmentVariables` with `net.thucydides.model.util.EnvironmentVariables`
 
 This release also includes support for Selenium 4.11.0, a number of bug fixes, and improved support of reporting step durations for parallel tests.
 

diff --git a/gradle.properties b/gradle.properties
@@ -13,7 +13,7 @@ restAssuredVersion=5.3.0
 mockitoCoreVersion=3.1.0
 jbehaveVersion=4.8.3
 commonsIoVersion=2.11.0
-commonsCollectionsVersion=3.2.2
+commonsCollectionsVersion=4.4
 commonsNetVersion=3.8.0
 commonsLang3Version=3.12.0
 commonsLang2Version=2.6

diff --git a/pom.xml b/pom.xml
@@ -44,7 +44,7 @@
         <groovy.version>4.0.13</groovy.version>
         <spock.version>2.2-M1-groovy-4.0</spock.version>
         <byte-buddy.version>1.14.5</byte-buddy.version>
-        <guava.version>31.1-jre</guava.version>
+        <guava.version>32.1.2-jre</guava.version>
         <hamcrest.version>2.2</hamcrest.version>
 <!--        <slf4j.version>1.7.30</slf4j.version>-->
         <slf4j.version>2.0.7</slf4j.version>
@@ -59,7 +59,7 @@
         <commons.io.version>2.11.0</commons.io.version>
         <commons.text.version>1.10.0</commons.text.version>
         <commons.beanutils.version>1.9.4</commons.beanutils.version>
-        <commons.collections.version>3.2.2</commons.collections.version>
+        <commons.collections.version>4.4</commons.collections.version>
         <commons.net.version>3.9.0</commons.net.version>
         <commons.codec.version>1.16.0</commons.codec.version>
         <freemarker.version>2.3.32</freemarker.version>
@@ -266,8 +266,8 @@
                 <version>${commons.net.version}</version>
             </dependency>
             <dependency>
-                <groupId>commons-collections</groupId>
-                <artifactId>commons-collections</artifactId>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-collections4</artifactId>
                 <version>${commons.collections.version}</version>
             </dependency>
             <dependency>
@@ -496,7 +496,7 @@
                 <!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
                 <plugin>
                     <artifactId>maven-clean-plugin</artifactId>
-                    <version>3.2.0</version>
+                    <version>3.3.1</version>
                 </plugin>
                 <!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
                 <plugin>

diff --git a/serenity-core/build.gradle b/serenity-core/build.gradle
@@ -96,7 +96,7 @@ dependencies {
         exclude group: 'commons-logging', module: 'commons-logging'
     }
     implementation "org.apache.commons:commons-lang3:${commonsLang3Version}"
-    implementation "commons-collections:commons-collections:${commonsCollectionsVersion}"
+    implementation "org.apache.commons:commons-collections4:${commonsCollectionsVersion}"
     implementation("org.fluentlenium:fluentlenium-core:${fluentleniumVersion}") {
         exclude group: 'org.seleniumhq.selenium', module: 'selenium-java'
         exclude group: 'junit', module: 'junit-dep'

diff --git a/serenity-core/pom.xml b/serenity-core/pom.xml
@@ -284,8 +284,8 @@
             <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
         </dependency>
         <dependency>
             <groupId>org.fluentlenium</groupId>

diff --git a/serenity-maven-plugin/deprecated.build.gradle b/serenity-maven-plugin/deprecated.build.gradle
@@ -71,7 +71,7 @@ configurations.all {
         force "org.codehaus.plexus:plexus-classworlds:${plexusClasswordsVersion}",
             "org.codehaus.plexus:plexus-utils:${plexusUtilsVersion}",
             "org.slf4j:slf4j-api:${slf4jVersion}",
-            "commons-collections:commons-collections:${commonsCollectionsVersion}",
+            "org.apache.commons:commons-collections4:${commonsCollectionsVersion}",
                 "xml-apis:xml-apis:${xmlApiVersion}"
     }
 }

diff --git a/serenity-maven-plugin/gradle.properties b/serenity-maven-plugin/gradle.properties
@@ -21,6 +21,6 @@ groovyVersion = 2.4.11
 gradleVersion = 4.0
 
 xmlApiVersion=1.4.01
-commonsCollectionsVersion = 3.2.2
+commonsCollectionsVersion = 4.4
 slf4jVersion = 1.7.21
 
diff --git a/serenity-model/build.gradle b/serenity-model/build.gradle
@@ -14,7 +14,7 @@ dependencies {
     implementation "org.apache.commons:commons-text:${commonsTextVersion}"
     implementation "commons-beanutils:commons-beanutils-core:${beanUtilsVersion}"
     implementation "commons-net:commons-net:${commonsNetVersion}"
-    implementation "commons-collections:commons-collections:${commonsCollectionsVersion}"
+    implementation "org.apache.commons:commons-collections4:${commonsCollectionsVersion}"
     implementation "commons-codec:commons-codec:${commonsCodecVersion}"
     implementation "com.google.guava:guava:${guavaVersion}"
     api "org.slf4j:slf4j-api:${slf4jVersion}"

diff --git a/serenity-model/pom.xml b/serenity-model/pom.xml
@@ -76,8 +76,8 @@
             <artifactId>commons-net</artifactId>
         </dependency>
         <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
         </dependency>
         <dependency>
             <groupId>commons-codec</groupId>