From d78135180c8f9e9f4c6c361679759d3eacb63be3 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Mon, 10 Feb 2014 21:56:35 +0100 Subject: [deps] Updated eclipse deps to 3.9 tree. This also enables testing java7 features on ecj. [Log] updated naming for @Log (topic= instead of mchmulder's 'value'). --- .../ivy-repo/org.eclipse.custom-core.runtime-3.9.0.xml | 14 ++++++++++++++ buildScripts/ivy-repo/org.eclipse.custom-ecj-4.3.1.xml | 14 ++++++++++++++ .../ivy-repo/org.eclipse.custom-equinox.common-3.6.200.xml | 14 ++++++++++++++ .../ivy-repo/org.eclipse.custom-jdt.core-3.9.1.xml | 14 ++++++++++++++ buildScripts/ivy-repo/org.eclipse.custom-jdt.ui-3.9.1.xml | 14 ++++++++++++++ buildScripts/ivy-repo/org.eclipse.custom-osgi-3.9.0.xml | 14 ++++++++++++++ 6 files changed, 84 insertions(+) create mode 100644 buildScripts/ivy-repo/org.eclipse.custom-core.runtime-3.9.0.xml create mode 100644 buildScripts/ivy-repo/org.eclipse.custom-ecj-4.3.1.xml create mode 100644 buildScripts/ivy-repo/org.eclipse.custom-equinox.common-3.6.200.xml create mode 100644 buildScripts/ivy-repo/org.eclipse.custom-jdt.core-3.9.1.xml create mode 100644 buildScripts/ivy-repo/org.eclipse.custom-jdt.ui-3.9.1.xml create mode 100644 buildScripts/ivy-repo/org.eclipse.custom-osgi-3.9.0.xml (limited to 'buildScripts/ivy-repo') diff --git a/buildScripts/ivy-repo/org.eclipse.custom-core.runtime-3.9.0.xml b/buildScripts/ivy-repo/org.eclipse.custom-core.runtime-3.9.0.xml new file mode 100644 index 00000000..45d6a9c3 --- /dev/null +++ b/buildScripts/ivy-repo/org.eclipse.custom-core.runtime-3.9.0.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/buildScripts/ivy-repo/org.eclipse.custom-ecj-4.3.1.xml b/buildScripts/ivy-repo/org.eclipse.custom-ecj-4.3.1.xml new file mode 100644 index 00000000..4ebfc8a4 --- /dev/null +++ b/buildScripts/ivy-repo/org.eclipse.custom-ecj-4.3.1.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/buildScripts/ivy-repo/org.eclipse.custom-equinox.common-3.6.200.xml b/buildScripts/ivy-repo/org.eclipse.custom-equinox.common-3.6.200.xml new file mode 100644 index 00000000..74f7a705 --- /dev/null +++ b/buildScripts/ivy-repo/org.eclipse.custom-equinox.common-3.6.200.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/buildScripts/ivy-repo/org.eclipse.custom-jdt.core-3.9.1.xml b/buildScripts/ivy-repo/org.eclipse.custom-jdt.core-3.9.1.xml new file mode 100644 index 00000000..0e7c5363 --- /dev/null +++ b/buildScripts/ivy-repo/org.eclipse.custom-jdt.core-3.9.1.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/buildScripts/ivy-repo/org.eclipse.custom-jdt.ui-3.9.1.xml b/buildScripts/ivy-repo/org.eclipse.custom-jdt.ui-3.9.1.xml new file mode 100644 index 00000000..0577ee8a --- /dev/null +++ b/buildScripts/ivy-repo/org.eclipse.custom-jdt.ui-3.9.1.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/buildScripts/ivy-repo/org.eclipse.custom-osgi-3.9.0.xml b/buildScripts/ivy-repo/org.eclipse.custom-osgi-3.9.0.xml new file mode 100644 index 00000000..247d76de --- /dev/null +++ b/buildScripts/ivy-repo/org.eclipse.custom-osgi-3.9.0.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + -- cgit From 15e7adfa08a3dc86e34008c80b5719e93fb73811 Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Mon, 24 Feb 2014 23:16:28 +0100 Subject: Another shot in the dark to fix deadlock issues with eclipse and build plugins, issue #645 and issue #531. The actual fix is in lombok.patcher, this is just a dep update to use v0.8 of lombok.patcher which is the real shot in the dark. --- .../ivy-repo/org.projectlombok-lombok.patcher-0.8.xml | 14 ++++++++++++++ buildScripts/ivy.xml | 2 +- doc/changelog.markdown | 1 + 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.8.xml (limited to 'buildScripts/ivy-repo') diff --git a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.8.xml b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.8.xml new file mode 100644 index 00000000..410c4a97 --- /dev/null +++ b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.8.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml index eed69ac3..c202fae1 100644 --- a/buildScripts/ivy.xml +++ b/buildScripts/ivy.xml @@ -14,7 +14,7 @@ - + diff --git a/doc/changelog.markdown b/doc/changelog.markdown index a5b3bbe3..67f6f63f 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -2,6 +2,7 @@ Lombok Changelog ---------------- ### v1.12.5 "Edgy Guinea Pig" +* GOOSECHASE: We're trying to fix a deadlock/race condition in the EquinoxClassLoader when Eclipse works with SVN or Gradle. * BUGFIX: Eclipse quickfix _Surround with try/catch block_ didn't work inside `@SneakyThrows` annotated methods [Issue #438](https://code.google.com/p/projectlombok/issues/detail?id=438). * BUGFIX: Eclipse refactoring _Extract Local Variable_ didn't work inside `@SneakyThrows` annotated methods [Issue #633](https://code.google.com/p/projectlombok/issues/detail?id=633). * FEATURE: The various `@Log` annotations now support the `topic` parameter, which sets the logger's name. The default remains the fully qualified type name of the class itself. [Issue #632](https://code.google.com/p/projectlombok/issues/detail?id=632). -- cgit From e82a1c052e7d06a64b7b065d38db35e030323f1a Mon Sep 17 00:00:00 2001 From: Roel Spilker Date: Tue, 25 Feb 2014 21:20:45 +0100 Subject: yet another (much better) attempt at fixing the deadlock issue. Again all the work is in lombok.patcher, this is just updating the deps. --- .../ivy-repo/org.projectlombok-lombok.patcher-0.9.xml | 14 ++++++++++++++ buildScripts/ivy.xml | 2 +- doc/changelog.markdown | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.9.xml (limited to 'buildScripts/ivy-repo') diff --git a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.9.xml b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.9.xml new file mode 100644 index 00000000..15460eee --- /dev/null +++ b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.9.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml index c202fae1..48c3661b 100644 --- a/buildScripts/ivy.xml +++ b/buildScripts/ivy.xml @@ -14,7 +14,7 @@ - + diff --git a/doc/changelog.markdown b/doc/changelog.markdown index 67f6f63f..b0e08003 100644 --- a/doc/changelog.markdown +++ b/doc/changelog.markdown @@ -2,7 +2,7 @@ Lombok Changelog ---------------- ### v1.12.5 "Edgy Guinea Pig" -* GOOSECHASE: We're trying to fix a deadlock/race condition in the EquinoxClassLoader when Eclipse works with SVN or Gradle. +* GOOSECHASE: We're trying to fix a deadlock/race condition in the EquinoxClassLoader when Eclipse works with SVN or Gradle. (v2) * BUGFIX: Eclipse quickfix _Surround with try/catch block_ didn't work inside `@SneakyThrows` annotated methods [Issue #438](https://code.google.com/p/projectlombok/issues/detail?id=438). * BUGFIX: Eclipse refactoring _Extract Local Variable_ didn't work inside `@SneakyThrows` annotated methods [Issue #633](https://code.google.com/p/projectlombok/issues/detail?id=633). * FEATURE: The various `@Log` annotations now support the `topic` parameter, which sets the logger's name. The default remains the fully qualified type name of the class itself. [Issue #632](https://code.google.com/p/projectlombok/issues/detail?id=632). -- cgit From 33d6e5c45f77fc186ad8c4c2bc94ac0c40392260 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Thu, 27 Feb 2014 16:06:40 +0100 Subject: Fixed lombok support in eclipse 4.4 ('luna'). --- .../ivy-repo/org.projectlombok-lombok.patcher-0.10.xml | 14 ++++++++++++++ buildScripts/ivy.xml | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.10.xml (limited to 'buildScripts/ivy-repo') diff --git a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.10.xml b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.10.xml new file mode 100644 index 00000000..e57c8d30 --- /dev/null +++ b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.10.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml index 48c3661b..49410a5a 100644 --- a/buildScripts/ivy.xml +++ b/buildScripts/ivy.xml @@ -14,7 +14,7 @@ - + -- cgit From 1fa01142832bf9ba6ddd9d08d7392bd807f8430f Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Sat, 1 Mar 2014 02:42:30 +0100 Subject: Updated to new patcher to get rid of JNA dep. --- .../ivy-repo/org.projectlombok-lombok.patcher-0.10.xml | 14 -------------- .../ivy-repo/org.projectlombok-lombok.patcher-0.11.xml | 14 ++++++++++++++ .../ivy-repo/org.projectlombok-lombok.patcher-0.8.xml | 14 -------------- .../ivy-repo/org.projectlombok-lombok.patcher-0.9.xml | 14 -------------- buildScripts/ivy.xml | 2 +- 5 files changed, 15 insertions(+), 43 deletions(-) delete mode 100644 buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.10.xml create mode 100644 buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.11.xml delete mode 100644 buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.8.xml delete mode 100644 buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.9.xml (limited to 'buildScripts/ivy-repo') diff --git a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.10.xml b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.10.xml deleted file mode 100644 index e57c8d30..00000000 --- a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.10.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.11.xml b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.11.xml new file mode 100644 index 00000000..0cb3bb89 --- /dev/null +++ b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.11.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.8.xml b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.8.xml deleted file mode 100644 index 410c4a97..00000000 --- a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.8.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.9.xml b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.9.xml deleted file mode 100644 index 15460eee..00000000 --- a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.9.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml index 49410a5a..84baef80 100644 --- a/buildScripts/ivy.xml +++ b/buildScripts/ivy.xml @@ -14,7 +14,7 @@ - + -- cgit From fbab1ca77cb8306843e26c5bad91186b34563282 Mon Sep 17 00:00:00 2001 From: Reinier Zwitserloot Date: Sat, 1 Mar 2014 02:55:46 +0100 Subject: yet another patcher-sourced fix, heh. Version-a-day! --- .../ivy-repo/org.projectlombok-lombok.patcher-0.11.xml | 14 -------------- .../ivy-repo/org.projectlombok-lombok.patcher-0.12.xml | 14 ++++++++++++++ .../ivy-repo/org.projectlombok-lombok.patcher-0.6.xml | 14 -------------- .../ivy-repo/org.projectlombok-lombok.patcher-0.7.xml | 14 -------------- buildScripts/ivy.xml | 2 +- .../DisableCheckedExceptionsAgent.java | 4 ++-- src/core/lombok/core/AnnotationProcessor.java | 4 ++-- src/core/lombok/core/PublicApiCreatorApp.java | 4 ++-- src/installer/lombok/installer/IdeLocation.java | 4 ++-- src/installer/lombok/installer/Installer.java | 4 ++-- 10 files changed, 25 insertions(+), 53 deletions(-) delete mode 100644 buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.11.xml create mode 100644 buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.12.xml delete mode 100644 buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.6.xml delete mode 100644 buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.7.xml (limited to 'buildScripts/ivy-repo') diff --git a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.11.xml b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.11.xml deleted file mode 100644 index 0cb3bb89..00000000 --- a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.11.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.12.xml b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.12.xml new file mode 100644 index 00000000..f402dcc9 --- /dev/null +++ b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.12.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.6.xml b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.6.xml deleted file mode 100644 index e952ce9d..00000000 --- a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.6.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.7.xml b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.7.xml deleted file mode 100644 index ca41f64c..00000000 --- a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.7.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml index 84baef80..32f8d790 100644 --- a/buildScripts/ivy.xml +++ b/buildScripts/ivy.xml @@ -14,7 +14,7 @@ - + diff --git a/experimental/src/lombok/javac/disableCheckedExceptions/DisableCheckedExceptionsAgent.java b/experimental/src/lombok/javac/disableCheckedExceptions/DisableCheckedExceptionsAgent.java index f9598be5..d023a399 100644 --- a/experimental/src/lombok/javac/disableCheckedExceptions/DisableCheckedExceptionsAgent.java +++ b/experimental/src/lombok/javac/disableCheckedExceptions/DisableCheckedExceptionsAgent.java @@ -34,7 +34,7 @@ import javax.lang.model.element.Element; import javax.lang.model.element.TypeElement; import javax.tools.Diagnostic.Kind; -import lombok.patcher.HomeFinder; +import lombok.patcher.ClassRootFinder; import lombok.patcher.Hook; import lombok.patcher.MethodTarget; import lombok.patcher.ScriptManager; @@ -57,7 +57,7 @@ public class DisableCheckedExceptionsAgent extends AbstractProcessor { procEnv.getMessager().printMessage(Kind.WARNING, "You aren't using a compiler based around javac v1.6, so disableCheckedExceptions will not work.\n" + "Your processor class is: " + className); } else { - new LiveInjector().inject(HomeFinder.findHomeOfClass(DisableCheckedExceptionsAgent.class)); + new LiveInjector().inject(ClassRootFinder.findClassRootOfClass(DisableCheckedExceptionsAgent.class)); } } diff --git a/src/core/lombok/core/AnnotationProcessor.java b/src/core/lombok/core/AnnotationProcessor.java index 6c61fef2..734150cd 100644 --- a/src/core/lombok/core/AnnotationProcessor.java +++ b/src/core/lombok/core/AnnotationProcessor.java @@ -43,7 +43,7 @@ import javax.lang.model.element.Element; import javax.lang.model.element.TypeElement; import javax.tools.Diagnostic.Kind; -import lombok.patcher.HomeFinder; +import lombok.patcher.ClassRootFinder; @SupportedAnnotationTypes("*") public class AnnotationProcessor extends AbstractProcessor { @@ -102,7 +102,7 @@ public class AnnotationProcessor extends AbstractProcessor { if (environmentClassLoader != null && environmentClassLoader.getClass().getCanonicalName().equals("org.codehaus.plexus.compiler.javac.IsolatedClassLoader")) { if (lombokAlreadyAddedTo.put(environmentClassLoader, true) == null) { Method m = environmentClassLoader.getClass().getDeclaredMethod("addURL", URL.class); - URL selfUrl = new File(HomeFinder.findHomeOfClass(AnnotationProcessor.class)).toURI().toURL(); + URL selfUrl = new File(ClassRootFinder.findClassRootOfClass(AnnotationProcessor.class)).toURI().toURL(); m.invoke(environmentClassLoader, selfUrl); } return environmentClassLoader; diff --git a/src/core/lombok/core/PublicApiCreatorApp.java b/src/core/lombok/core/PublicApiCreatorApp.java index b776bf8f..178a45e8 100644 --- a/src/core/lombok/core/PublicApiCreatorApp.java +++ b/src/core/lombok/core/PublicApiCreatorApp.java @@ -35,7 +35,7 @@ import java.util.jar.JarOutputStream; import java.util.zip.ZipEntry; import lombok.Lombok; -import lombok.patcher.HomeFinder; +import lombok.patcher.ClassRootFinder; import org.mangosdk.spi.ProviderFor; @@ -79,7 +79,7 @@ public class PublicApiCreatorApp extends LombokApp { * a jar that wasn't accessed via the file-system, or if its started via e.g. unpacking the jar. */ private static File findOurJar() { - return new File(HomeFinder.findHomeOfClass(PublicApiCreatorApp.class)); + return new File(ClassRootFinder.findClassRootOfClass(PublicApiCreatorApp.class)); } private int writeApiJar(File outFile) throws Exception { diff --git a/src/installer/lombok/installer/IdeLocation.java b/src/installer/lombok/installer/IdeLocation.java index ea1f470f..4e3a7e41 100644 --- a/src/installer/lombok/installer/IdeLocation.java +++ b/src/installer/lombok/installer/IdeLocation.java @@ -26,7 +26,7 @@ import java.io.IOException; import java.net.URL; import lombok.installer.eclipse.EclipseFinder; -import lombok.patcher.HomeFinder; +import lombok.patcher.ClassRootFinder; /** * Represents a location that contains an IDE. @@ -46,7 +46,7 @@ public abstract class IdeLocation { * a jar that wasn't accessed via the file-system, or if its started via e.g. unpacking the jar. */ public static File findOurJar() { - return new File(HomeFinder.findHomeOfClass(IdeFinder.class)); + return new File(ClassRootFinder.findClassRootOfClass(IdeFinder.class)); } @Override public String toString() { diff --git a/src/installer/lombok/installer/Installer.java b/src/installer/lombok/installer/Installer.java index 4050ad95..b9faeebd 100644 --- a/src/installer/lombok/installer/Installer.java +++ b/src/installer/lombok/installer/Installer.java @@ -39,7 +39,7 @@ import lombok.core.LombokApp; import lombok.core.SpiLoadUtil; import lombok.core.Version; import lombok.installer.IdeFinder.OS; -import lombok.patcher.HomeFinder; +import lombok.patcher.ClassRootFinder; import org.mangosdk.spi.ProviderFor; @@ -101,7 +101,7 @@ public class Installer { } public static boolean isSelf(String jar) { - String self = HomeFinder.findHomeOfClass(Installer.class); + String self = ClassRootFinder.findClassRootOfClass(Installer.class); if (self == null) return false; File a = new File(jar).getAbsoluteFile(); File b = new File(self).getAbsoluteFile(); -- cgit