From 653eb56883a6be109ee7e767fae920cae70f569d Mon Sep 17 00:00:00 2001
From: Reinier Zwitserloot <reinier@zwitserloot.com>
Date: Mon, 11 Mar 2013 22:06:09 +0100
Subject: changed the pattern for writing dependencies to the various lib/
 directories to be organization-name.jar instead of just name.jar, in order to
 account for the ever lovely and wonderful apache's crazy decision to call the
 entirely separate log4j v2.0 also 'log4j'. This does mean you'll have to 'ant
 clean'.

---
 build.xml                                | 8 ++++----
 test/core/src/lombok/RunTestsViaEcj.java | 9 +++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index 84e77883..9de92d59 100644
--- a/build.xml
+++ b/build.xml
@@ -27,7 +27,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 	
 	<property name="credentialsFile" value="google.properties" />
 	<property name="build.compiler" value="javac1.6" />
-	<property name="ivy.retrieve.pattern" value="lib/[conf]/[artifact].[ext]" />
+	<property name="ivy.retrieve.pattern" value="lib/[conf]/[organisation]-[artifact].[ext]" />
 	<available file="lib/ivyplusplus.jar" property="ivyplusplus.available" />
 	
 	<path id="build.path">
@@ -196,7 +196,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 	<target name="dist" description="Builds THE lombok.jar file which contains everything." depends="version, compile">
 		<mkdir dir="dist" />
 		<copy file="doc/changelog.markdown" tofile="build/changelog.txt" />
-		<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/build/jarjar.jar" />
+		<taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/build/com.googlecode.jarjar-jarjar.jar" />
 		<jarjar destfile="dist/lombok-${lombok.version}.jar">
 			<fileset dir="build/lombok">
 				<exclude name="com/sun/tools/javac/**"/>
@@ -271,7 +271,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 			<settings>
 				<url url="http://projectlombok.org/downloads/lombok.eclipse.settings" />
 			</settings>
-			<apt location="lib/build/spi.jar" />
+			<apt location="lib/build/projectlombok.org-spi.jar" />
 		</ivy:eclipsegen>
 		
 		<copy
@@ -299,7 +299,7 @@ the common tasks and can be called on to run the main aspects of all the sub-scr
 	</target>
 	
 	<target name="test-ecj" depends="dist, contrib" unless="tests.skip">
-		<java jar="lib/ecj/ecj.jar" fork="true" failonerror="true">
+		<java jar="lib/ecj/org.eclipse.custom-ecj.jar" fork="true" failonerror="true">
 			<jvmarg value="-javaagent:dist/lombok.jar=ecj" />
 			<arg value="-source" />
 			<arg value="1.6" />
diff --git a/test/core/src/lombok/RunTestsViaEcj.java b/test/core/src/lombok/RunTestsViaEcj.java
index 0bf97213..ca443620 100644
--- a/test/core/src/lombok/RunTestsViaEcj.java
+++ b/test/core/src/lombok/RunTestsViaEcj.java
@@ -129,10 +129,11 @@ public class RunTestsViaEcj extends AbstractRunTests {
 			}
 		}
 		classpath.add("dist/lombok.jar");
-		classpath.add("lib/test/commons-logging.jar");
-		classpath.add("lib/test/slf4j-api.jar");
-		classpath.add("lib/test/slf4j-ext.jar");
-		classpath.add("lib/test/log4j.jar");
+		classpath.add("lib/test/commons-logging-commons-logging.jar");
+		classpath.add("lib/test/org.slf4j-slf4j-api.jar");
+		classpath.add("lib/test/org.slf4j-slf4j-ext.jar");
+		classpath.add("lib/test/log4j-log4j.jar");
+		classpath.add("lib/test/org.apache.logging.log4j-log4j-api.jar");
 		return new FileSystem(classpath.toArray(new String[0]), new String[] {file.getAbsolutePath()}, "UTF-8");
 	}
 }
-- 
cgit