Simplifying the build. Move Java8 code into the main module (springloaded).

This means the springloaded module must be built on top of a 1.8 JRE
although it can be built with 1.6 compliance.

settings.gradle

@@ -1,5 +1,4 @@
 include "springloaded"
-include "springloaded-java8"
 include "testdata"
 include "testdata-java8"
 include "testdata-groovy"

springloaded-java8/.classpath

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J180_b128"/>
-	<classpathentry kind="lib" path="lib/asm-5.0_BETA.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>

springloaded-java8/.project

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>springloaded-java8</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>

springloaded-java8/.settings/org.eclipse.jdt.core.prefs

@@ -1,11 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.source=1.3

springloaded-java8/build.gradle

@@ -1,14 +0,0 @@
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-dependencies {
-        compile 'org.ow2.asm:asm:5.0_BETA'
-        compile 'org.ow2.asm:asm-tree:5.0_BETA'
-}
-
-sourceSets {
-        main {
-                java {
-                        srcDir 'src'
-                }
-        }
-}

springloaded-java8/readme.txt

@@ -1,3 +0,0 @@
-The main springloaded codebase is not yet using Java8. The Java8 'stuff' is captured here in this
-project and included in the distributed agent. It should only be loaded if we find ourselves on a
-Java8 VM. This code is not using Java8 source constructs, it is calling Java8 APIs.

springloaded/.classpath

@@ -4,7 +4,7 @@
 	<classpathentry kind="src" path="src/test/java"/>
 	<classpathentry kind="lib" path="lib/asm-5.0_BETA.jar"/>
 	<classpathentry kind="lib" path="lib/asm-tree-5.0_BETA.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J180_b128"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/springloaded-java8"/>
 	<classpathentry kind="output" path="bin"/>

springloaded/build.gradle

@@ -42,8 +42,6 @@ dependencies {
 	compile 'org.ow2.asm:asm:5.0_BETA'
 	compile 'org.ow2.asm:asm-tree:5.0_BETA'
 
-	compile project(':springloaded-java8')
-	
 	testCompile 'junit:junit:4.11'
 	
 	testCompileOnly files("../testdata-groovy/groovy-all-1.8.6.jar")
@@ -69,11 +67,6 @@ test {
 
 // org.springsource.loaded-VERSION.jar
 jar {
-doFirst {
-  for (file in configurations.compile) {
-    jar.merge(file)
-  }
-}
     from 'LICENSES/LICENSE'
     baseName = 'org.springsource.loaded'
 }