From 49d5831e014d4a995aa7f1c3b19b6150e8635526 Mon Sep 17 00:00:00 2001
From: Stefan Ludwig <stefan.ludwig@novatec-gmbh.de>
Date: Mon, 16 Nov 2015 21:58:47 +0100
Subject: [PATCH] Updated compile level to Java 7 and Selenium to the newest
 version. This is done because with v1.1.0 WebTester will no longer support
 Java 6 (like Selenium has dropped the support with v2.47.0)

---
 pom.xml                                                      | 5 ++---
 .../testit/webtester/utils/conditions/syntax/Either.java     | 1 +
 .../testit/webtester/junit/runner/WebTesterJUnitRunner.java  | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 442ff9f..b0eab00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
 
 	<properties>
 
-		<java.version>1.6</java.version>
+		<java.version>1.7</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
@@ -69,8 +69,7 @@
 		<version.mockito>1.10.19</version.mockito>
 		<version.checkstyle>6.9</version.checkstyle>
 
-		<!-- higher selenium versions require java 7! -->
-		<version.selenium>2.46.0</version.selenium>
+		<version.selenium>2.48.2</version.selenium>
 
 		<version.slf4j>1.7.12</version.slf4j>
 		<version.logback>1.1.3</version.logback>
diff --git a/webtester-core/src/main/java/info/novatec/testit/webtester/utils/conditions/syntax/Either.java b/webtester-core/src/main/java/info/novatec/testit/webtester/utils/conditions/syntax/Either.java
index 11bf652..23ba62f 100644
--- a/webtester-core/src/main/java/info/novatec/testit/webtester/utils/conditions/syntax/Either.java
+++ b/webtester-core/src/main/java/info/novatec/testit/webtester/utils/conditions/syntax/Either.java
@@ -23,6 +23,7 @@ public class Either<T> implements Predicate<T> {
 
     private List<Predicate<T>> predicates;
 
+    @SafeVarargs
     public Either(Predicate<T>... predicates) {
         this.predicates = Arrays.asList(predicates);
     }
diff --git a/webtester-support-junit/src/main/java/info/novatec/testit/webtester/junit/runner/WebTesterJUnitRunner.java b/webtester-support-junit/src/main/java/info/novatec/testit/webtester/junit/runner/WebTesterJUnitRunner.java
index 4d353f5..5dd149c 100644
--- a/webtester-support-junit/src/main/java/info/novatec/testit/webtester/junit/runner/WebTesterJUnitRunner.java
+++ b/webtester-support-junit/src/main/java/info/novatec/testit/webtester/junit/runner/WebTesterJUnitRunner.java
@@ -92,7 +92,6 @@
  * </ol>
  * <p>
  * <b>Exaple test class:</b>
- * <p>
  * <pre>
  * <code>
  * public class FooTest {