aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReinier Zwitserloot <reinier@zwitserloot.com>2014-05-12 15:14:38 +0200
committerReinier Zwitserloot <reinier@zwitserloot.com>2014-05-12 15:15:57 +0200
commit05ca21b75e5c20e1e731d9141857f346bb3eca9f (patch)
tree1dd3392a199965e7e05037f9ed0c9f1224cfd631
parenta49483c2f6d7fa793e1175d089e5220cfa36b492 (diff)
downloadlombok-05ca21b75e5c20e1e731d9141857f346bb3eca9f.tar.gz
lombok-05ca21b75e5c20e1e731d9141857f346bb3eca9f.tar.bz2
lombok-05ca21b75e5c20e1e731d9141857f346bb3eca9f.zip
patcher upgrade for issue 666.
-rw-r--r--buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.14.xml (renamed from buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.13.xml)4
-rw-r--r--buildScripts/ivy.xml2
-rw-r--r--doc/changelog.markdown1
3 files changed, 4 insertions, 3 deletions
diff --git a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.13.xml b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.14.xml
index 0d223e38..924c2968 100644
--- a/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.13.xml
+++ b/buildScripts/ivy-repo/org.projectlombok-lombok.patcher-0.14.xml
@@ -1,5 +1,5 @@
<ivy-module version="2.0">
- <info organisation="org.projectlombok" module="lombok.patcher" revision="0.13" publication="20140402011000">
+ <info organisation="org.projectlombok" module="lombok.patcher" revision="0.14" publication="20140512151400">
<license name="MIT License" url="http://www.opensource.org/licenses/mit-license.php" />
<ivyauthor name="rzwitserloot" url="http://zwitserloot.com/" />
<ivyauthor name="rspilker" url="http://github.com/rspilker" />
@@ -9,6 +9,6 @@
<conf name="default" />
</configurations>
<publications>
- <artifact conf="default" url="http://projectlombok.org/downloads/lombok.patcher-0.13.jar" />
+ <artifact conf="default" url="http://projectlombok.org/downloads/lombok.patcher-0.14.jar" />
</publications>
</ivy-module>
diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml
index a26f4751..a8fa3fd6 100644
--- a/buildScripts/ivy.xml
+++ b/buildScripts/ivy.xml
@@ -15,7 +15,7 @@
<conf name="javac7" />
</configurations>
<dependencies>
- <dependency org="org.projectlombok" name="lombok.patcher" rev="0.13" conf="buildBase->default; runtime->default" />
+ <dependency org="org.projectlombok" name="lombok.patcher" rev="0.14" conf="buildBase->default; runtime->default" />
<dependency org="zwitserloot.com" name="cmdreader" rev="1.2" conf="buildBase->runtime; runtime" />
<dependency org="junit" name="junit" rev="4.8.2" conf="test->default; contrib->sources" />
diff --git a/doc/changelog.markdown b/doc/changelog.markdown
index 8ac2fb9c..10fedb75 100644
--- a/doc/changelog.markdown
+++ b/doc/changelog.markdown
@@ -7,6 +7,7 @@ Lombok Changelog
* CHANGE: The `canEqual` method generated by `@EqualsAndHashCode`, `@Value` and `@Data` is now `protected` instead of `public`. [Issue #660](https://code.google.com/p/projectlombok/issues/detail?id=660)
* BUGFIX: Deadlocks would occasionally occur in eclipse when using lazy getters [Issue #590](https://code.google.com/p/projectlombok/issues/detail?id=590)
* BUGFIX: Usage of `@SneakyThrows` with a javac from JDK8 with `-target 1.8` would result in a post compiler error. [Issue #655](https://code.google.com/p/projectlombok/issues/detail?id=655)
+* BUGFIX: Switching workspace on some versions of eclipse resulted in a 'duplicate field' error. [Issue #666](https://code.google.com/p/projectlombok/issues/detail?id=666)
### v1.12.6 (March 6th, 2014)
* BUGFIX: Deadlocks would occasionally occur in eclipse during project builds, especially if using the gradle plugin. [Issue #645](https://code.google.com/p/projectlombok/issues/detail?id=645)