From d282666b49c05475f648a5ad31b2c3ecec1641bc Mon Sep 17 00:00:00 2001
From: "M.P. Korstanje" <rien.korstanje@gmail.com>
Date: Mon, 12 Jun 2017 22:38:04 +0200
Subject: [PATCH] Use 1.7 as the source and target level for compilation

Cucumber-jvm is using some library features that were introduced in Java 7.
Setting the compilation explicitly to Java 7 should avoid any unexpected
surprises.
---
 openejb/pom.xml | 20 +++++++++++++++++++-
 pom.xml         |  4 ++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/openejb/pom.xml b/openejb/pom.xml
index fe784418dc..7653bc8b8a 100644
--- a/openejb/pom.xml
+++ b/openejb/pom.xml
@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -33,4 +35,20 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
+
+    <!--
+    Using source level 1.7 in combination with openejb-core results in 'An unknown compilation
+    error'. Use 1.6 instead and compile up to 1.7 to avoid this problem.
+     -->
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.6</source>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/pom.xml b/pom.xml
index f7eb48d32c..62f5805f42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -724,8 +724,8 @@
                     <version>3.6.2</version>
                     <configuration>
                         <encoding>UTF-8</encoding>
-                        <source>1.6</source>
-                        <target>1.6</target>
+                        <source>1.7</source>
+                        <target>1.7</target>
                         <compilerArgument>-Werror</compilerArgument>
                     </configuration>
                 </plugin>