Merge branch 'BETA_JAVA8'

Conflicts:
	build/usedForMavenUpload/aspectjrt.pom
	build/usedForMavenUpload/aspectjtools.pom
	build/usedForMavenUpload/aspectjweaver.pom
	docs/dist/doc/README-174.html
	docs/dist/doc/index.html
	lib/asm/build.xml
	org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
	weaver/.classpath
	weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java

4 files changed, 3 insertions, 3 deletions

diff --git a/lib/asm/asm-5.0.1.jar b/lib/asm/asm-5.0.1.jar
new file mode 100644
index 000000000..eeb3bc6f9
--- /dev/null
+++ b/lib/asm/asm-5.0.1.jar
diff --git a/lib/asm/asm-5.0.1.renamed.jar b/lib/asm/asm-5.0.1.renamed.jar
new file mode 100644
index 000000000..8a6bf1574
--- /dev/null
+++ b/lib/asm/asm-5.0.1.renamed.jar
diff --git a/lib/asm/build.xml b/lib/asm/build.xml
index 192d81a2e..0bbda2998 100644
--- a/lib/asm/build.xml
+++ b/lib/asm/build.xml
@@ -3,9 +3,9 @@
 	<!-- if you need this defining, use the jarjar-1.0.jar in this project -->
     <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"/>
 
-	<target name="package" description="Jarjar asm-4.2.jar and prefix package name with aj">
-	        <jarjar destfile="asm-4.2.renamed.jar">
-	          <zipfileset src="asm-4.2.jar"/>
+	<target name="package" description="Jarjar asm-5.0.1.jar and prefix package name with aj">
+	        <jarjar destfile="asm-5.0.1.renamed.jar">
+	          <zipfileset src="asm-5.0.1.jar"/>
 	          <rule pattern="org.objectweb.asm.**" result="aj.org.objectweb.asm.@1"/>
 	        </jarjar>
 	</target> 
diff --git a/lib/build/build.jar b/lib/build/build.jar
index 49eab50aa..380218b6b 100644
--- a/lib/build/build.jar
+++ b/lib/build/build.jar