aboutsummaryrefslogtreecommitdiff
path: root/buildScripts
diff options
context:
space:
mode:
authorReinier Zwitserloot <reinier@zwitserloot.com>2011-08-15 20:33:45 +0200
committerReinier Zwitserloot <reinier@zwitserloot.com>2011-08-15 20:33:45 +0200
commit7773bd4e60784b9018e9eed82a5a41e0b51c3024 (patch)
tree8304559a452f95fce0e0eb7bef2193f2e7d6568e /buildScripts
parentf7ec1e33ed4db5f31d288dd7d2c909b83b2d418f (diff)
downloadlombok-7773bd4e60784b9018e9eed82a5a41e0b51c3024.tar.gz
lombok-7773bd4e60784b9018e9eed82a5a41e0b51c3024.tar.bz2
lombok-7773bd4e60784b9018e9eed82a5a41e0b51c3024.zip
Changed dep name of 'javac' into 'javac6' and added 'javac7', mostly for contrib purposes (we still compile against javac6, but having javac7 around for testing and such is nice).
Diffstat (limited to 'buildScripts')
-rw-r--r--buildScripts/ivy-repo/net.java.openjdk.custom-javac6-1.6.0.18.xml14
-rw-r--r--buildScripts/ivy-repo/net.java.openjdk.custom-javac7-1.7.0.xml (renamed from buildScripts/ivy-repo/projectlombok.org-javac-1.6.0.18.xml)6
-rw-r--r--buildScripts/ivy.xml4
3 files changed, 20 insertions, 4 deletions
diff --git a/buildScripts/ivy-repo/net.java.openjdk.custom-javac6-1.6.0.18.xml b/buildScripts/ivy-repo/net.java.openjdk.custom-javac6-1.6.0.18.xml
new file mode 100644
index 00000000..f2c59547
--- /dev/null
+++ b/buildScripts/ivy-repo/net.java.openjdk.custom-javac6-1.6.0.18.xml
@@ -0,0 +1,14 @@
+<ivy-module version="2.0">
+ <info organisation="net.java.openjdk.custom" module="javac6" revision="1.6.0.18" publication="20100225011200">
+ <license name="GNU General Public License v2 with Classpath Exception" url="http://openjdk.java.net/legal/gplv2+ce.html" />
+ <description homepage="http://openjdk.java.net/" />
+ </info>
+ <configurations>
+ <conf name="runtime" />
+ <conf name="sources" />
+ </configurations>
+ <publications>
+ <artifact conf="runtime" url="http://projectlombok.org/ivyrepo/langtools/javac-1.6.0.18.jar" />
+ <artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/langtools/javac-1.6.0.18-sources.zip" />
+ </publications>
+</ivy-module>
diff --git a/buildScripts/ivy-repo/projectlombok.org-javac-1.6.0.18.xml b/buildScripts/ivy-repo/net.java.openjdk.custom-javac7-1.7.0.xml
index f2335aa1..2ef76782 100644
--- a/buildScripts/ivy-repo/projectlombok.org-javac-1.6.0.18.xml
+++ b/buildScripts/ivy-repo/net.java.openjdk.custom-javac7-1.7.0.xml
@@ -1,5 +1,5 @@
<ivy-module version="2.0">
- <info organisation="projectlombok.org" module="javac" revision="1.6.0.18" publication="20100225011200">
+ <info organisation="net.java.openjdk.custom" module="javac7" revision="1.7.0" publication="20110811230000">
<license name="GNU General Public License v2 with Classpath Exception" url="http://openjdk.java.net/legal/gplv2+ce.html" />
<description homepage="http://openjdk.java.net/" />
</info>
@@ -8,7 +8,7 @@
<conf name="sources" />
</configurations>
<publications>
- <artifact conf="runtime" url="http://projectlombok.org/ivyrepo/langtools/javac.jar" />
- <artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/langtools/javac-sources.zip" />
+ <artifact conf="runtime" url="http://projectlombok.org/ivyrepo/langtools/javac-1.7.0.jar" />
+ <artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/langtools/javac-1.7.0-sources.zip" />
</publications>
</ivy-module>
diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml
index add6eb44..e226439c 100644
--- a/buildScripts/ivy.xml
+++ b/buildScripts/ivy.xml
@@ -8,6 +8,7 @@
<conf name="test" extends="build, runtime" />
<conf name="contrib" />
<conf name="ecj" />
+ <conf name="javac7" />
</configurations>
<dependencies>
<dependency org="org.projectlombok" name="lombok.patcher" rev="0.5" conf="build; runtime->build" />
@@ -27,7 +28,8 @@
<dependency org="projectlombok.org" name="markdownj" rev="1.02b4" conf="build" />
<dependency org="de.java2html" name="java2html" rev="5.0" conf="build->default" />
- <dependency org="projectlombok.org" name="javac" rev="1.6.0.18" conf="build->runtime; contrib->sources" />
+ <dependency org="net.java.openjdk.custom" name="javac6" rev="1.6.0.18" conf="build->runtime; contrib->sources" />
+ <dependency org="net.java.openjdk.custom" name="javac7" rev="1.7.0" conf="javac7->runtime; contrib->sources" />
<dependency org="org.eclipse.custom" name="ecj" rev="3.6.2" conf="ecj->default; contrib->sources" />
<dependency org="netbeans.org" name="boot" rev="6.8beta" conf="netbeansBuild->build" />