Merge branch 'feature/#631-jdk11-upgrade' into develop

# Conflicts: # examples/cucumber/pom.xml # examples/hooks/pom.xml # examples/quickstart-chrome/pom.xml # examples/quickstart/pom.xml # examples/spock/pom.xml # examples/spring/pom.xml # fluentlenium-assertj/pom.xml # fluentlenium-core/pom.xml # fluentlenium-cucumber/pom.xml # fluentlenium-junit-jupiter/pom.xml # fluentlenium-junit-jupiter/src/it/junit-jupiter/pom.xml # fluentlenium-junit/pom.xml # fluentlenium-junit/src/it/junit/pom.xml # fluentlenium-spock/pom.xml # fluentlenium-testng/pom.xml # fluentlenium-testng/src/it/testng/pom.xml # pom.xml
FluentLenium · Nov 29, 2018 · fbf4abf · fbf4abf
2 parents 579d8ec + 10e89af
commit fbf4abf
Show file tree

Hide file tree

Showing 23 changed files with 104 additions and 93 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,12 +1,12 @@
 language: java
 jdk:
-  - oraclejdk8
+  - oraclejdk11
 script:
   - mvn -Pexamples clean compile # Ensure examples compiles properly
   - mvn clean verify jacoco:report
 after_success:
   - mvn coveralls:report
-  - "[[ ${TRAVIS_JDK_VERSION} == 'oraclejdk8' ]] && [[ ${TRAVIS_PULL_REQUEST} == 'false' ]] && [[ ${TRAVIS_BRANCH} == 'develop' ]] && [[ ${TRAVIS_TAG} == '' ]] && mvn deploy -DskipTests --settings deploy-settings.xml"
+  - "[[ ${TRAVIS_JDK_VERSION} == 'oraclejdk11' ]] && [[ ${TRAVIS_PULL_REQUEST} == 'false' ]] && [[ ${TRAVIS_BRANCH} == 'develop' ]] && [[ ${TRAVIS_TAG} == '' ]] && mvn deploy -DskipTests --settings deploy-settings.xml"
 env:
   global:
   # env.CI_DEPLOY_USERNAME

diff --git a/README.md b/README.md
@@ -20,15 +20,18 @@ the assertion framework you want.
 
 # Choose the right version
 
-FluentLenium 3.x is still in development and includes latest enhancements and features, but Selenium 3 and Java 8 are
-required to run it.
+FluentLenium 4.x is the newest version of FluentLenium it is based on JDK 11 it includes latest enhancements and features, but Selenium 3 is required to run it.
+
+FluentLenium 3.x is based on JDK 1.8 - we are not going to add new features to this version but still planning work on bugfixes.
+
+FluentLenium 1.x is in maintenance state, and no new feature will be added anymore. It requires Selenium 2 and
+Java 7, but can also be used with Java 8. Selenium 3 is not supported in this version though.
 
 Starting from FluentLenium 3.1.0 you can use all sparks of Java 8, including lambdas. It is a nice extension in
 comparison to Selenium 3 which is still basing on Guava objects. Please take a look on documentation to find `await`
 lambda usage example.
 
-FluentLenium 1.x is in maintenance state, and no new feature will be added anymore. It requires Selenium 2 and
-Java 7, but can also be used with Java 8. Selenium 3 is not supported in this version though.
+If you want to keep up to date please upgrade you testing framework to FluentLenium 4.x
 
 # Quickstart with JUnit and AssertJ
 
@@ -37,21 +40,21 @@ Java 7, but can also be used with Java 8. Selenium 3 is not supported in this ve
 ```xml
 <properties>
     <!-- Configure this property to latest available version -->
-    <fluentlenium.version>3.7.0</fluentlenium.version>
+    <fluentlenium.version>4.0.0</fluentlenium.version>
     <!-- Make sure the selenium.version won't be overriden by another pom.xml -->
     <selenium.version>3.11.59</selenium.version>
 </properties>
 
 <dependency>
     <groupId>org.fluentlenium</groupId>
     <artifactId>fluentlenium-junit</artifactId>
-    <version>3.7.0</version>
+    <version>4.0.0</version>
     <scope>test</scope>
 </dependency>
 <dependency>
     <groupId>org.fluentlenium</groupId>
     <artifactId>fluentlenium-assertj</artifactId>
-    <version>3.7.0</version>
+    <version>4.0.0</version>
     <scope>test</scope>
 </dependency>
 <dependency>
@@ -63,7 +66,7 @@ Java 7, but can also be used with Java 8. Selenium 3 is not supported in this ve
 <dependency>
     <groupId>org.seleniumhq.selenium</groupId>
     <artifactId>htmlunit-driver</artifactId>
-    <version>2.32.1</version>
+    <version>2.33.3</version>
     <scope>test</scope>
 </dependency>
 ```

diff --git a/docs/_includes/fluentlenium-code.md b/docs/_includes/fluentlenium-code.md
@@ -72,10 +72,9 @@ public class First extends FluentTest {
     <plugins>
     <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.0</version>
+        <version>3.8.0</version>
         <configuration>
-            <source>1.8</source>
-            <target>1.8</target>
+            <release>11</release>
         </configuration>
     </plugin>
     </plugins>

diff --git a/docs/docs.md b/docs/docs.md
@@ -32,21 +32,21 @@ Java 7, but can also be used with Java 8. Selenium 3 is not supported in this ve
 ```xml
 <properties>
     <!-- Configure this property to latest available version -->
-    <fluentlenium.version>3.7.0</fluentlenium.version>
+    <fluentlenium.version>4.0.0</fluentlenium.version>
     <!-- Make sure the selenium.version won't be overriden by another pom.xml -->
     <selenium.version>3.141.59</selenium.version>
 </properties>
 
 <dependency>
     <groupId>org.fluentlenium</groupId>
     <artifactId>fluentlenium-junit</artifactId>
-    <version>3.7.0</version>
+    <version>4.0.0</version>
     <scope>test</scope>
 </dependency>
 <dependency>
     <groupId>org.fluentlenium</groupId>
     <artifactId>fluentlenium-assertj</artifactId>
-    <version>3.7.0</version>
+    <version>4.0.0</version>
     <scope>test</scope>
 </dependency>
 <dependency>
@@ -1800,7 +1800,7 @@ Then use ```SNAPSHOT``` version when declaring the dependencies.
 <dependency>
     <groupId>org.fluentlenium</groupId>
     <artifactId>fluentlenium-junit</artifactId>
-    <version>3.7.0</version>
+    <version>4.0.0</version>
     <scope>test</scope>
 </dependency>
 ```
@@ -1815,7 +1815,7 @@ Then use ```SNAPSHOT``` version when declaring the dependencies.
 <dependency>
     <groupId>org.fluentlenium</groupId>
     <artifactId>fluentlenium-junit-jupiter</artifactId>
-    <version>3.7.0</version>
+    <version>4.0.0</version>
     <scope>test</scope>
 </dependency>
 ```
@@ -1830,7 +1830,7 @@ Then use ```SNAPSHOT``` version when declaring the dependencies.
 <dependency>
     <groupId>org.fluentlenium</groupId>
     <artifactId>fluentlenium-testng</artifactId>
-    <version>3.7.0</version>
+    <version>4.0.0</version>
     <scope>test</scope>
 </dependency>
 ```
@@ -1845,7 +1845,7 @@ Then use ```SNAPSHOT``` version when declaring the dependencies.
 <dependency>
     <groupId>org.fluentlenium</groupId>
     <artifactId>fluentlenium-cucumber</artifactId>
-    <version>3.7.0</version>
+    <version>4.0.0</version>
 </dependency>
 ```
 
@@ -1929,7 +1929,7 @@ add Before and After hooks to every Cucumber Step for correct injecting FluentLe
 <dependency>
     <groupId>org.fluentlenium</groupId>
     <artifactId>fluentlenium-spock</artifactId>
-    <version>3.7.0</version>
+    <version>4.0.0</version>
     <scope>test</scope>
 </dependency>
 ```
@@ -1957,7 +1957,7 @@ assertEqual("Hello toto",window().title());
 <dependency>
     <groupId>org.fluentlenium</groupId>
     <artifactId>fluentlenium-assertj</artifactId>
-    <version>3.7.0</version>
+    <version>4.0.0</version>
     <scope>test</scope>
 </dependency>
 ```

diff --git a/examples/cucumber/pom.xml b/examples/cucumber/pom.xml
@@ -6,14 +6,14 @@
 
     <groupId>org.fluentlenium</groupId>
     <artifactId>fluentlenium-cucumber-example</artifactId>
-    <version>3.7.2-SNAPSHOT</version>
+    <version>4.0.0</version>
 
     <name>FluentLenium Cucumber example</name>
     <description>FluentLenium cucumber example</description>
     <url>https://github.com/FluentLenium/FluentLenium</url>
 
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
         <fluentlenium.version>${project.version}</fluentlenium.version>
         <cucumber.version>3.0.2</cucumber.version>
     </properties>
@@ -39,7 +39,7 @@
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>3.9.1</version>
+            <version>3.11.1</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -54,9 +54,9 @@
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.0</version>
                 <configuration>
-                    <source>${java.version}</source>
-                    <target>${java.version}</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
             <plugin>

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>3.7.2-SNAPSHOT</version>
+    <version>4.0.0</version>
 
     <properties>
         <!-- Configure this property to latest available version -->
@@ -27,10 +27,9 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/examples/quickstart-chrome/pom.xml b/examples/quickstart-chrome/pom.xml
@@ -5,7 +5,7 @@
 
     <artifactId>fluentlenium-examples-quickstart</artifactId>
     <groupId>org.fluentlenium</groupId>
-    <version>3.7.2-SNAPSHOT</version>
+    <version>4.0.0</version>
 
     <properties>
         <!-- Configure this property to latest available version -->
@@ -27,10 +27,9 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/examples/quickstart/pom.xml b/examples/quickstart/pom.xml
@@ -5,7 +5,7 @@
 
     <artifactId>fluentlenium-examples-quickstart</artifactId>
     <groupId>org.fluentlenium</groupId>
-    <version>3.7.2-SNAPSHOT</version>
+    <version>4.0.0</version>
 
     <properties>
         <!-- Configure this property to latest available version -->
@@ -27,10 +27,9 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
         </plugins>

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>3.7.2-SNAPSHOT</version>
+    <version>4.0.0</version>
 
     <name>FluentLenium Examples Spock</name>
 
@@ -63,10 +63,9 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
             <plugin>
@@ -112,7 +111,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.1</version>
+                <version>3.0.0-M1</version>
                 <configuration>
                     <includes>
                         <include>**/*Spec.*</include>

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>3.7.2-SNAPSHOT</version>
+    <version>4.0.0</version>
 
     <name>FluentLenium Examples Spring</name>
 
@@ -29,10 +29,9 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.6.0</version>
+                <version>3.8.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
         </plugins>

diff --git a/fluentlenium-assertj/pom.xml b/fluentlenium-assertj/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.fluentlenium</groupId>
         <artifactId>fluentlenium-parent</artifactId>
-        <version>3.7.2-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
     <artifactId>fluentlenium-assertj</artifactId>
     <packaging>jar</packaging>
@@ -13,7 +13,7 @@
     <description>AssertJ Extension for FluentLenium</description>
 
     <properties>
-        <assertj.version>3.9.1</assertj.version>
+        <assertj.version>3.11.1</assertj.version>
     </properties>
 
 

diff --git a/fluentlenium-core/pom.xml b/fluentlenium-core/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.fluentlenium</groupId>
         <artifactId>fluentlenium-parent</artifactId>
-        <version>3.7.2-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
     <artifactId>fluentlenium-core</artifactId>
     <packaging>jar</packaging>
@@ -47,7 +47,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.20</version>
+            <version>1.18.4</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/fluentlenium-core/src/test/java/org/fluentlenium/integration/JavascriptTest.java b/fluentlenium-core/src/test/java/org/fluentlenium/integration/JavascriptTest.java
@@ -1,5 +1,6 @@
 package org.fluentlenium.integration;
 
+import org.assertj.core.api.Assertions;
 import org.fluentlenium.core.script.FluentJavascript;
 import org.fluentlenium.integration.localtest.IntegrationFluentTest;
 import org.junit.Before;
@@ -103,9 +104,9 @@ public void shouldExecuteScriptReturnList() {
         assertThat(fluentJavascript.isStringResult()).isFalse();
 
         assertThat((Object) fluentJavascript.getListResult()).isEqualTo(fluentJavascript.getResult());
-        assertThat(fluentJavascript.getListResult())
+        Assertions.<Object>assertThat(fluentJavascript.getListResult())
                 .containsExactly("string 1", "string 2", 5L, 12.12D, true, Arrays.asList("test 1", "test 2"));
-        assertThat(fluentJavascript.getListResult())
+        Assertions.<Object>assertThat(fluentJavascript.getListResult())
                 .containsExactly("string 1", "string 2", 5L, 12.12D, true, Arrays.asList("test 1", "test 2"));
     }
 

diff --git a/fluentlenium-cucumber/pom.xml b/fluentlenium-cucumber/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <artifactId>fluentlenium-parent</artifactId>
         <groupId>org.fluentlenium</groupId>
-        <version>3.7.2-SNAPSHOT</version>
+        <version>4.0.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>