From fa69108d3ac9ac1625d23aede3ecf039a536a71f Mon Sep 17 00:00:00 2001
From: MishaDemianenko <mikhaylo.demianenko@neotechnology.com>
Date: Fri, 17 Nov 2017 16:22:57 +0100
Subject: [PATCH] Scala and java 9.

Upgrade scala to latest 2.11.12. Update -target:jvm option to be jvm-1.8.
Add -nobootcp compiler argument for java 9.
---
 community/cypher/pom.xml  | 1 -
 community/pom.xml         | 1 -
 enterprise/cypher/pom.xml | 1 -
 enterprise/pom.xml        | 1 -
 pom.xml                   | 6 +++++-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/community/cypher/pom.xml b/community/cypher/pom.xml
index 920bb69627f2a..e17dce9fa13a5 100644
--- a/community/cypher/pom.xml
+++ b/community/cypher/pom.xml
@@ -32,7 +32,6 @@
     <profile>
       <id>include-cypher</id>
       <activation>
-        <jdk>!9</jdk>
         <property>
           <name>!skipCypher</name>
         </property>
diff --git a/community/pom.xml b/community/pom.xml
index e4f18842b4451..5658f97f37c14 100644
--- a/community/pom.xml
+++ b/community/pom.xml
@@ -85,7 +85,6 @@ the relevant Commercial Agreement.
     <profile>
       <id>include-cypher</id>
       <activation>
-        <jdk>!9</jdk>
         <property>
           <name>!skipCypher</name>
         </property>
diff --git a/enterprise/cypher/pom.xml b/enterprise/cypher/pom.xml
index ddca334882f3b..9fd045eb28fbd 100644
--- a/enterprise/cypher/pom.xml
+++ b/enterprise/cypher/pom.xml
@@ -32,7 +32,6 @@
     <profile>
       <id>include-cypher</id>
       <activation>
-        <jdk>!9</jdk>
         <property>
           <name>!skipCypher</name>
         </property>
diff --git a/enterprise/pom.xml b/enterprise/pom.xml
index 699b5b9e24c73..e1b37b145f1d8 100644
--- a/enterprise/pom.xml
+++ b/enterprise/pom.xml
@@ -47,7 +47,6 @@
     <profile>
       <id>include-cypher</id>
       <activation>
-        <jdk>!9</jdk>
         <property>
           <name>!skipCypher</name>
         </property>
diff --git a/pom.xml b/pom.xml
index cc88e175123a0..11ef91d6c7e91 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,9 +85,10 @@
     <licensesVersion>7</licensesVersion>
     <license-text.header>AGPL-3-header.txt</license-text.header>
 
-    <scala.version>2.11.11</scala.version>
+    <scala.version>2.11.12</scala.version>
     <scala.binary.version>2.11</scala.binary.version>
     <asm.version>6.0</asm.version>
+    <scala.java9.arg/>
   </properties>
 
   <modules>
@@ -454,6 +455,8 @@
               <arg>-Xmax-classfile-name</arg>
               <arg>100</arg>
               <arg>-Xlint</arg>
+              <arg>-target:jvm-${maven.compiler.target}</arg>
+              <arg>${scala.java9.arg}</arg>
             </args>
             <jvmArgs>
               <jvmArg>-Xms64m</jvmArg>
@@ -792,6 +795,7 @@
       </activation>
       <properties>
         <maven.javadoc.skip>true</maven.javadoc.skip>
+        <scala.java9.arg>-nobootcp</scala.java9.arg>
       </properties>
     </profile>
   </profiles>