Index: TestHarness4LAMS2/build.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r47d555d1abf1b7ceca685f1a6186ff08fa2590bb
--- TestHarness4LAMS2/build.xml	(.../build.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ TestHarness4LAMS2/build.xml	(.../build.xml)	(revision 47d555d1abf1b7ceca685f1a6186ff08fa2590bb)
@@ -16,7 +16,7 @@
 
 	<target name="compile" depends="clean">
 		<javac destdir="${basedir}/build" srcdir="${src}"
-        	debug="on" source="1.8" target="1.8" includeantruntime="false" >
+        	debug="on" source="10" target="10" includeantruntime="false" >
 			<classpath>
 				<path refid="project.classpath"/>
 			</classpath>
Index: lams_bb_integration/build.xml
===================================================================
diff -u -rdd6e1e0906e59b3a0badd40b98ff6028e8b4e1f3 -r47d555d1abf1b7ceca685f1a6186ff08fa2590bb
--- lams_bb_integration/build.xml	(.../build.xml)	(revision dd6e1e0906e59b3a0badd40b98ff6028e8b4e1f3)
+++ lams_bb_integration/build.xml	(.../build.xml)	(revision 47d555d1abf1b7ceca685f1a6186ff08fa2590bb)
@@ -46,7 +46,7 @@
 	<!-- ================================================================ -->
    <target name="compile" depends="clean, preparedirs" description="compile java sources">
    		<javac srcdir="${src}"
-         	 	destdir="${build.classes}" deprecation="on" debug="on" target="1.7">
+         	 	destdir="${build.classes}" deprecation="on" debug="on" target="10">
   			<classpath>
       			<path refid="project.classpath"/>
       		</classpath>
Index: lams_build/build_base.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r47d555d1abf1b7ceca685f1a6186ff08fa2590bb
--- lams_build/build_base.xml	(.../build_base.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_build/build_base.xml	(.../build_base.xml)	(revision 47d555d1abf1b7ceca685f1a6186ff08fa2590bb)
@@ -161,14 +161,15 @@
 		<echo>${ant.project.name}: Compiling Java sources</echo>
 		<javac srcdir="${src.java.dir}"
 			   compiler="modern"
-	           source="1.8"
-			   target="1.8"
+	           source="10"
+			   target="10"
                debug="on"
                includeantruntime="false"
 			   debuglevel="lines,vars,source"
                classpathref="libs.classpath"
                destdir="${basedir}/build/classes/java">
                <compilerarg line="-encoding utf-8"/>
+			   <compilerarg line="--add-modules java.activation"/>
         </javac>
         
 		<echo>${ant.project.name}: Copying additional non-Java resources</echo>
Index: lams_common/.classpath
===================================================================
diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r47d555d1abf1b7ceca685f1a6186ff08fa2590bb
--- lams_common/.classpath	(.../.classpath)	(revision 62aaf160878735888d077bf28fac3c1989bb8fbd)
+++ lams_common/.classpath	(.../.classpath)	(revision 47d555d1abf1b7ceca685f1a6186ff08fa2590bb)
@@ -1,49 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/java"/>
-	<classpathentry kind="src" path="conf/hibernate/mappings"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_3.1_spec-1.0.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/servlet-api">
-		<attributes>
-			<attribute name="javadoc_location" value="http://tomcat.apache.org/tomcat-8.0-doc/servletapi/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/jsp/api/main/jboss-jsp-api_2.3_spec-1.0.1.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jsp-api">
-		<attributes>
-			<attribute name="javadoc_location" value="http://docs.oracle.com/javaee/7/api/javax/servlet/jsp/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.2.Final.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/remoting-jmx/main/remoting-jmx-2.0.1.Final.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/slf4j/main/slf4j-api-1.7.7.jbossorg-1.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/slf4j/impl/main/slf4j-jboss-logmanager-1.0.3.GA.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/logging/main/jboss-logging-3.3.0.Final.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/javassist/main/javassist-3.18.1-GA.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/jstl/api/main/jboss-jstl-api_1.2_spec-1.1.3.Final.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/mail/api/main/javax.mail-1.5.5.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/transaction/api/main/jboss-transaction-api_1.2_spec-1.0.0.Final.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/hibernate/main/hibernate-core-5.0.10.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/hibernate-core">
-		<attributes>
-			<attribute name="javadoc_location" value="http://docs.jboss.org/hibernate/orm/4.3/javadocs/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/beanutils/main/commons-beanutils-1.9.2.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/collections/main/commons-collections-3.2.2.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/io/main/commons-io-2.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-io"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">
-		<attributes>
-			<attribute name="javadoc_location" value="http://commons.apache.org/proper/commons-lang/javadocs/api-2.6/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/slf4j/jcl-over-slf4j/main/jcl-over-slf4j-1.7.7.jbossorg-1.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/codec/main/commons-codec-1.10.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/io/undertow/core/main/undertow-core-1.4.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/undertow"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/io/undertow/servlet/main/undertow-servlet-1.4.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/undertow"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/as/controller-client/main/wildfly-controller-client-2.2.0.Final.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/dmr/main/jboss-dmr-1.3.0.Final.jar"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/jackson-core-2.7.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jackson"/>
-	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/jackson-databind-2.7.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jackson"/>
-	<classpathentry kind="output" path="bin"/>
-	<referencedentry kind="lib" path="/lams_build/lib/lams/lams.jar" sourcepath=""/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/java"/>
+	<classpathentry kind="src" path="conf/hibernate/mappings"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+			<attribute name="limit-modules" value="java.se,jdk.accessibility,jdk.attach,jdk.compiler,jdk.httpserver,jdk.jartool,jdk.javadoc,jdk.jconsole,jdk.jdi,jdk.management,jdk.sctp,jdk.security.auth,jdk.security.jgss,jdk.unsupported,jdk.dynalink,jdk.incubator.httpclient,jdk.jshell,jdk.jsobject,jdk.net,jdk.scripting.nashorn,jdk.xml.dom,java.activation"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/api/main/jboss-servlet-api_3.1_spec-1.0.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/servlet-api">
+		<attributes>
+			<attribute name="javadoc_location" value="http://tomcat.apache.org/tomcat-8.0-doc/servletapi/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/jsp/api/main/jboss-jsp-api_2.3_spec-1.0.1.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jsp-api">
+		<attributes>
+			<attribute name="javadoc_location" value="http://docs.oracle.com/javaee/7/api/javax/servlet/jsp/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/log4j/logmanager/main/log4j-jboss-logmanager-1.1.2.Final.jar"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/remoting-jmx/main/remoting-jmx-2.0.1.Final.jar"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/slf4j/main/slf4j-api-1.7.7.jbossorg-1.jar"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/slf4j/impl/main/slf4j-jboss-logmanager-1.0.3.GA.jar"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/logging/main/jboss-logging-3.3.0.Final.jar"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/javassist/main/javassist-3.18.1-GA.jar"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/servlet/jstl/api/main/jboss-jstl-api_1.2_spec-1.1.3.Final.jar"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/mail/api/main/javax.mail-1.5.5.jar"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/javax/transaction/api/main/jboss-transaction-api_1.2_spec-1.0.0.Final.jar"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/hibernate/main/hibernate-core-5.0.10.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/hibernate-core">
+		<attributes>
+			<attribute name="javadoc_location" value="http://docs.jboss.org/hibernate/orm/4.3/javadocs/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/beanutils/main/commons-beanutils-1.9.2.jar"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/collections/main/commons-collections-3.2.2.jar"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/io/main/commons-io-2.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-io"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/lang/main/commons-lang-2.6.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/commons-lang">
+		<attributes>
+			<attribute name="javadoc_location" value="http://commons.apache.org/proper/commons-lang/javadocs/api-2.6/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/slf4j/jcl-over-slf4j/main/jcl-over-slf4j-1.7.7.jbossorg-1.jar"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/apache/commons/codec/main/commons-codec-1.10.jar"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/io/undertow/core/main/undertow-core-1.4.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/undertow"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/io/undertow/servlet/main/undertow-servlet-1.4.0.Final.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/undertow"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/as/controller-client/main/wildfly-controller-client-2.2.0.Final.jar"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/org/jboss/dmr/main/jboss-dmr-1.3.0.Final.jar"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/com/fasterxml/jackson/core/jackson-core/main/jackson-core-2.7.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jackson"/>
+	<classpathentry kind="var" path="WILDFLY_HOME/modules/system/layers/base/com/fasterxml/jackson/core/jackson-databind/main/jackson-databind-2.7.4.jar" sourcepath="/3RDPARTY_SOURCES_PROJECT/jackson"/>
+	<classpathentry kind="output" path="bin"/>
+	<referencedentry kind="lib" path="/lams_build/lib/lams/lams.jar" sourcepath=""/>
+</classpath>
Index: lams_tool_deploy/build.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r47d555d1abf1b7ceca685f1a6186ff08fa2590bb
--- lams_tool_deploy/build.xml	(.../build.xml)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_deploy/build.xml	(.../build.xml)	(revision 47d555d1abf1b7ceca685f1a6186ff08fa2590bb)
@@ -35,8 +35,8 @@
 		<echo>${ant.project.name}: Compiling Java sources</echo>
 		<javac srcdir="src/java"
 			   compiler="modern"
-               source="1.8"
-			   target="1.8"
+               source="10"
+			   target="10"
                debug="on"
 			   includeantruntime="false"
 			   debuglevel="lines,vars,source"