Spring 6.0.3 upgrade (#1768)

* Spring 6.0.3 upgrade
FluentLenium · Dec 26, 2022 · b9bd83d · b9bd83d
1 parent 2833a82
commit b9bd83d
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 26 deletions.
diff --git a/.github/workflows/build-workflow.yml b/.github/workflows/build-workflow.yml
@@ -79,44 +79,44 @@ jobs:
         run: |
           mvn -B -Pjava17 -DrepoToken=$REPO_TOKEN coveralls:report
 
-  java11-parallelism-tests:
+  java17-parallelism-tests:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'zulu'
           cache: "maven"
 
       - name: determine Fluentlenium version
         run: echo "FLUENTLENIUM_VERSION=$(mvn -B -N org.apache.maven.plugins:maven-help-plugin:evaluate -Dexpression=project.version| fgrep -v '[INFO]')" >> $GITHUB_ENV
 
-      - name: Java 11 - unit & integration tests
-        run: mvn -Dit.project.version=$FLUENTLENIUM_VERSION -B -Pframework-integration-tests,java11 -pl '!fluentlenium-integration-tests,!fluentlenium-kotest,!fluentlenium-kotest-assertions,!fluentlenium-cucumber,!fluentlenium-spock,!fluentlenium-coverage-report,!fluentlenium-spring-testng' clean test -Dtest=*/it/* -Dsurefire.failIfNoSpecifiedTests=false
+      - name: Java 17 - unit & integration tests
+        run: mvn -Dit.project.version=$FLUENTLENIUM_VERSION -B -Pframework-integration-tests,java17 -pl '!fluentlenium-integration-tests,!fluentlenium-kotest,!fluentlenium-kotest-assertions,!fluentlenium-cucumber,!fluentlenium-spock,!fluentlenium-coverage-report,!fluentlenium-spring-testng' clean test -Dtest=*/it/* -Dsurefire.failIfNoSpecifiedTests=false
 
-  java11-javadoc:
+  java17-javadoc:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v2
       with:
-        java-version: 11
+        java-version: 17
         distribution: 'zulu'
         cache: "maven"
-    - name: Java 11 - JavaDoc
-      run: mvn -B -Pjava11 javadoc:aggregate
+    - name: Java 17 - JavaDoc
+      run: mvn -B -Pjava17 javadoc:aggregate
 
   compile-gradle-example:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'zulu'
           cache: "maven"
       - name: Install Fluentlenium
@@ -134,10 +134,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v2
         with:
-          java-version: 11
+          java-version: 17
           distribution: 'zulu'
           cache: "maven"
       - name: Install Fluentlenium

diff --git a/examples/appium/pom.xml b/examples/appium/pom.xml
@@ -6,15 +6,15 @@
 
     <artifactId>fluentlenium-examples-appium</artifactId>
     <groupId>org.fluentlenium</groupId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
 
     <name>FluentLenium Examples Appium</name>
     <description>FluentLenium Appium examples</description>
     <url>https://github.com/FluentLenium/FluentLenium</url>
 
     <properties>
         <fluentlenium.version>6.0.0-SNAPSHOT</fluentlenium.version>
-        <spring.version>5.3.23</spring.version>
+        <spring.version>6.0.3</spring.version>
         <selenium.version>4.2.2</selenium.version>
     </properties>
 

diff --git a/examples/cucumber/pom.xml b/examples/cucumber/pom.xml
@@ -5,7 +5,7 @@
 
     <groupId>org.fluentlenium</groupId>
     <artifactId>fluentlenium-examples-cucumber</artifactId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
 
     <name>FluentLenium Cucumber example</name>
     <description>FluentLenium cucumber example</description>

diff --git a/examples/hooks/pom.xml b/examples/hooks/pom.xml
@@ -5,7 +5,7 @@
 
     <artifactId>fluentlenium-examples-hooks</artifactId>
     <groupId>org.fluentlenium</groupId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
 
     <properties>
         <!-- Configure this property to latest available version -->

diff --git a/examples/performance/pom.xml b/examples/performance/pom.xml
@@ -5,7 +5,7 @@
 
     <artifactId>fluentlenium-examples-performance</artifactId>
     <groupId>org.fluentlenium</groupId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
 
     <properties>
         <!-- Configure this property to latest available version -->

diff --git a/examples/quickstart-chrome/pom.xml b/examples/quickstart-chrome/pom.xml
@@ -5,7 +5,7 @@
 
     <artifactId>fluentlenium-examples-quickstart-chrome</artifactId>
     <groupId>org.fluentlenium</groupId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
 
     <properties>
         <!-- Configure this property to latest available version -->

diff --git a/examples/quickstart-firefox/build.gradle b/examples/quickstart-firefox/build.gradle
@@ -28,7 +28,7 @@ configurations.all {
 }
 
 group = 'org.fluentlenium'
-version = '5.0.0-SNAPSHOT'
+version = '6.0.0-SNAPSHOT'
 description = 'FluentLenium Examples Firefox'
 sourceCompatibility = '11'
 compileKotlin {

diff --git a/examples/quickstart-microsoft-browsers/pom.xml b/examples/quickstart-microsoft-browsers/pom.xml
@@ -5,7 +5,7 @@
 
     <artifactId>fluentlenium-examples-quickstart-microsoft-browsers</artifactId>
     <groupId>org.fluentlenium</groupId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
 
     <properties>
         <!-- Configure this property to latest available version -->

diff --git a/examples/quickstart-safari/pom.xml b/examples/quickstart-safari/pom.xml
@@ -5,7 +5,7 @@
 
     <artifactId>fluentlenium-examples-quickstart-safari</artifactId>
     <groupId>org.fluentlenium</groupId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
 
     <properties>
         <!-- Configure this property to latest available version -->

diff --git a/examples/spock/pom.xml b/examples/spock/pom.xml
@@ -6,7 +6,7 @@
 
     <artifactId>fluentlenium-examples-spock</artifactId>
     <groupId>org.fluentlenium</groupId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
 
     <name>FluentLenium Examples Spock</name>
 

diff --git a/examples/spring/pom.xml b/examples/spring/pom.xml
@@ -6,7 +6,7 @@
 
     <artifactId>fluentlenium-examples-spring</artifactId>
     <groupId>org.fluentlenium</groupId>
-    <version>5.0.0-SNAPSHOT</version>
+    <version>6.0.0-SNAPSHOT</version>
 
     <name>FluentLenium Examples Spring</name>
 

diff --git a/pom.xml b/pom.xml
@@ -123,7 +123,7 @@
         <testng.version>7.7.0</testng.version>
         <junit.jupiter.version>5.6.1</junit.jupiter.version>
         <maven.version.rules>file:///${project.basedir}/maven-version-rules.xml</maven.version.rules>
-        <spring.version>5.3.23</spring.version>
+        <spring.version>6.0.3</spring.version>
         <slf4j.version>2.0.6</slf4j.version>
         <seleniumDevtools.artifactId>selenium-devtools-v102</seleniumDevtools.artifactId>
         <fluentlenium.capabilities.default>{"goog:chromeOptions": {"args": ["headless","no-sandbox", "disable-gpu", "disable-dev-shm-usage"]}}</fluentlenium.capabilities.default>
@@ -385,6 +385,11 @@
                 <plugin>
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>3.4.1</version>
+                    <configuration>
+                        <additionalparam>-Xdoclint:none</additionalparam>
+                        <additionalOptions>-Xdoclint:none</additionalOptions>
+                        <additionalJOption>-Xdoclint:none</additionalJOption>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <artifactId>maven-resources-plugin</artifactId>
@@ -571,6 +576,7 @@
             </activation>
             <properties>
                 <java.version>11</java.version>
+                <spring.version>5.3.23</spring.version>
             </properties>
             <build>
                 <pluginManagement>