diff options
Diffstat (limited to 'buildScripts')
11 files changed, 47 insertions, 68 deletions
diff --git a/buildScripts/ivy-repo/eclipse.org-ecj-3.6.0.xml b/buildScripts/ivy-repo/eclipse.org-ecj-3.6.0.xml deleted file mode 100644 index e3b8aceb..00000000 --- a/buildScripts/ivy-repo/eclipse.org-ecj-3.6.0.xml +++ /dev/null @@ -1,14 +0,0 @@ -<ivy-module version="2.0"> - <info organisation="eclipse.org" module="ecj" revision="3.6.0" publication="20100608091100"> - <license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" /> - <description homepage="http://www.eclipse.org/eclipse/" /> - </info> - <configurations> - <conf name="runtime" /> - <conf name="sources" /> - </configurations> - <publications> - <artifact conf="runtime" url="http://mirror.selfnet.de/eclipse/eclipse/downloads/drops/R-3.6-201006080911/ecj-3.6.jar" /> - <artifact type="zip" conf="sources" url="http://mirror.selfnet.de/eclipse/eclipse/downloads/drops/R-3.6-201006080911/ecjsrc-3.6.zip" /> - </publications> -</ivy-module> diff --git a/buildScripts/ivy-repo/jcraft.com-jsch-0.1.42.xml b/buildScripts/ivy-repo/jcraft.com-jsch-0.1.42.xml deleted file mode 100644 index 8c91c0cf..00000000 --- a/buildScripts/ivy-repo/jcraft.com-jsch-0.1.42.xml +++ /dev/null @@ -1,12 +0,0 @@ -<ivy-module version="2.0"> - <info organisation="jcraft.com" module="jsch" revision="0.1.42" publication="20100225011200"> - <license name="BSD" url="http://www.jcraft.com/jsch/LICENSE.txt" /> - <description homepage="http://www.jcraft.com/jsch/" /> - </info> - <configurations> - <conf name="build" /> - </configurations> - <publications> - <artifact conf="build" url="http://mesh.dl.sourceforge.net/project/jsch/jsch.jar/0.1.42/jsch-0.1.42.jar" /> - </publications> -</ivy-module> diff --git a/buildScripts/ivy-repo/eclipse.org-core.runtime-3.6.0.xml b/buildScripts/ivy-repo/org.eclipse.custom-core.runtime-3.6.0.xml index d1232780..fe812bbc 100644 --- a/buildScripts/ivy-repo/eclipse.org-core.runtime-3.6.0.xml +++ b/buildScripts/ivy-repo/org.eclipse.custom-core.runtime-3.6.0.xml @@ -1,14 +1,14 @@ <ivy-module version="2.0"> - <info organisation="eclipse.org" module="core.runtime" revision="3.6.0" publication="20100505120000"> + <info organisation="org.eclipse.custom" module="core.runtime" revision="3.6.0" publication="20100505120000"> <license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" /> <description homepage="http://www.eclipse.org/eclipse/" /> </info> <configurations> - <conf name="runtime" /> + <conf name="default" /> <conf name="sources" /> </configurations> <publications> - <artifact conf="runtime" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.core.runtime_3.6.0.v20100505.jar" /> + <artifact conf="default" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.core.runtime_3.6.0.v20100505.jar" /> <artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.core.runtime_3.6.0.v20100505-sources.jar" /> </publications> </ivy-module> diff --git a/buildScripts/ivy-repo/org.eclipse.custom-ecj-3.6.2.xml b/buildScripts/ivy-repo/org.eclipse.custom-ecj-3.6.2.xml new file mode 100644 index 00000000..fc9fa661 --- /dev/null +++ b/buildScripts/ivy-repo/org.eclipse.custom-ecj-3.6.2.xml @@ -0,0 +1,14 @@ +<ivy-module version="2.0"> + <info organisation="org.eclipse.custom" module="ecj" revision="3.6.2" publication="20110401190400"> + <license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" /> + <description homepage="http://www.eclipse.org/eclipse/" /> + </info> + <configurations> + <conf name="default" /> + <conf name="sources" /> + </configurations> + <publications> + <artifact conf="default" url="http://projectlombok.org/ivyrepo/eclipse/ecj-3.6.2.jar" /> + <artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/ecjsrc-3.6.2.zip" /> + </publications> +</ivy-module> diff --git a/buildScripts/ivy-repo/eclipse.org-equinox.common-3.6.0.xml b/buildScripts/ivy-repo/org.eclipse.custom-equinox.common-3.6.0.xml index acb748b0..889a2ceb 100644 --- a/buildScripts/ivy-repo/eclipse.org-equinox.common-3.6.0.xml +++ b/buildScripts/ivy-repo/org.eclipse.custom-equinox.common-3.6.0.xml @@ -1,14 +1,14 @@ <ivy-module version="2.0"> - <info organisation="eclipse.org" module="equinox.common" revision="3.6.0" publication="20100503120000"> + <info organisation="org.eclipse.custom" module="equinox.common" revision="3.6.0" publication="20100503120000"> <license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" /> <description homepage="http://www.eclipse.org/eclipse/" /> </info> <configurations> - <conf name="runtime" /> + <conf name="default" /> <conf name="sources" /> </configurations> <publications> - <artifact conf="runtime" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.equinox.common_3.6.0.v20100503.jar" /> + <artifact conf="default" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.equinox.common_3.6.0.v20100503.jar" /> <artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.equinox.common_3.6.0.v20100503-sources.jar" /> </publications> -</ivy-module> +</ivy-module>
\ No newline at end of file diff --git a/buildScripts/ivy-repo/eclipse.org-jdt.core-3.6.0.xml b/buildScripts/ivy-repo/org.eclipse.custom-jdt.core-3.6.0.xml index 7a3225d8..f9a8f52d 100644 --- a/buildScripts/ivy-repo/eclipse.org-jdt.core-3.6.0.xml +++ b/buildScripts/ivy-repo/org.eclipse.custom-jdt.core-3.6.0.xml @@ -1,14 +1,14 @@ <ivy-module version="2.0"> - <info organisation="eclipse.org" module="jdt.core" revision="3.6.0" publication="20100505120000"> + <info organisation="org.eclipse.custom" module="jdt.core" revision="3.6.0" publication="20100505120000"> <license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" /> <description homepage="http://www.eclipse.org/eclipse/" /> </info> <configurations> - <conf name="runtime" /> + <conf name="default" /> <conf name="sources" /> </configurations> <publications> - <artifact conf="runtime" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.core_3.6.0.v_A58.jar" /> + <artifact conf="default" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.core_3.6.0.v_A58.jar" /> <artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.core_3.6.0.v_A58-sources.jar" /> </publications> </ivy-module> diff --git a/buildScripts/ivy-repo/eclipse.org-jdt.ui-3.6.0.xml b/buildScripts/ivy-repo/org.eclipse.custom-jdt.ui-3.6.0.xml index 6244df5b..dbee2865 100644 --- a/buildScripts/ivy-repo/eclipse.org-jdt.ui-3.6.0.xml +++ b/buildScripts/ivy-repo/org.eclipse.custom-jdt.ui-3.6.0.xml @@ -1,14 +1,14 @@ <ivy-module version="2.0"> - <info organisation="eclipse.org" module="jdt.ui" revision="3.6.0" publication="20100602160000"> + <info organisation="org.eclipse.custom" module="jdt.ui" revision="3.6.0" publication="20100602160000"> <license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" /> <description homepage="http://www.eclipse.org/eclipse/" /> </info> <configurations> - <conf name="runtime" /> + <conf name="default" /> <conf name="sources" /> </configurations> <publications> - <artifact conf="runtime" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.ui_3.6.0.v20100602-1600.jar" /> + <artifact conf="default" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.ui_3.6.0.v20100602-1600.jar" /> <artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.jdt.ui_3.6.0.v20100602-1600-sources.jar" /> </publications> </ivy-module> diff --git a/buildScripts/ivy-repo/eclipse.org-osgi-3.6.0.xml b/buildScripts/ivy-repo/org.eclipse.custom-osgi-3.6.0.xml index 55bae381..93a7f381 100644 --- a/buildScripts/ivy-repo/eclipse.org-osgi-3.6.0.xml +++ b/buildScripts/ivy-repo/org.eclipse.custom-osgi-3.6.0.xml @@ -1,14 +1,14 @@ <ivy-module version="2.0"> - <info organisation="eclipse.org" module="osgi" revision="3.6.0" publication="20100517120000"> + <info organisation="org.eclipse.custom" module="osgi" revision="3.6.0" publication="20100517120000"> <license name="Eclipse Public Licence v1.0" url="http://www.eclipse.org/org/documents/epl-v10.php" /> <description homepage="http://www.eclipse.org/eclipse/" /> </info> <configurations> - <conf name="runtime" /> + <conf name="default" /> <conf name="sources" /> </configurations> <publications> - <artifact conf="runtime" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.osgi_3.6.0.v20100517.jar" /> + <artifact conf="default" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.osgi_3.6.0.v20100517.jar" /> <artifact type="zip" conf="sources" url="http://projectlombok.org/ivyrepo/eclipse/org.eclipse.osgi_3.6.0.v20100517-sources.jar" /> </publications> </ivy-module> diff --git a/buildScripts/ivy-repo/projectlombok.org-junit-4.8.1.xml b/buildScripts/ivy-repo/projectlombok.org-junit-4.8.1.xml deleted file mode 100644 index aa31e5b0..00000000 --- a/buildScripts/ivy-repo/projectlombok.org-junit-4.8.1.xml +++ /dev/null @@ -1,13 +0,0 @@ -<ivy-module version="2.0"> - <info organisation="projectlombok.org" module="junit" revision="4.8.1" publication="20100225011200"> - <license name="MIT License" url="http://www.opensource.org/licenses/mit-license.php" /> - <ivyauthor name="KentBeck" url="http://www.threeriversinstitute.org/Kent%20Beck.htm" /> - <description homepage="http://junit.org/" /> - </info> - <configurations> - <conf name="test" /> - </configurations> - <publications> - <artifact conf="test" url="http://cloud.github.com/downloads/KentBeck/junit/junit-4.8.1.jar" /> - </publications> -</ivy-module> diff --git a/buildScripts/ivy.xml b/buildScripts/ivy.xml index 25f21928..7ff6bdc9 100644 --- a/buildScripts/ivy.xml +++ b/buildScripts/ivy.xml @@ -12,31 +12,32 @@ <dependency org="projectlombok.org" name="lombok.patcher" rev="0.4" conf="build; runtime->build" /> <dependency org="zwitserloot.com" name="cmdreader" rev="1.2" conf="build->runtime; runtime" /> - <dependency org="projectlombok.org" name="junit" rev="4.8.1" conf="test" /> - <dependency org="log4j" name="log4j" rev="1.2.16" conf="test->master"/> - <dependency org="commons-logging" name="commons-logging" rev="1.1.1" conf="test->master"/> - <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1" conf="test->master"/> + <dependency org="junit" name="junit" rev="4.8.2" conf="test->default; contrib->sources" /> + <dependency org="log4j" name="log4j" rev="1.2.16" conf="test->default; contrib->sources" /> + <dependency org="commons-logging" name="commons-logging" rev="1.1.1" conf="test->default; contrib->sources"/> + <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1" conf="test->default; contrib->sources"/> + <dependency org="com.googlecode.jarjar" name="jarjar" rev="1.1" conf="build->default" /> - <dependency org="org.apache.ant" name="ant" rev="1.8.0" conf="build->master" /> + <dependency org="org.apache.ant" name="ant" rev="1.8.0" conf="build->default; contrib->sources" /> <dependency org="projectlombok.org" name="spi" rev="0.2.4" conf="build" /> <dependency org="projectlombok.org" name="ant-googlecode" rev="0.0.2" conf="build" /> - <dependency org="jcraft.com" name="jsch" rev="0.1.42" conf="build" /> + <dependency org="com.jcraft" name="jsch" rev="0.1.42" conf="build->default" /> <dependency org="projectlombok.org" name="jsch-ant-fixed" rev="0.1.42" conf="build" /> <dependency org="projectlombok.org" name="markdownj" rev="1.02b4" conf="build" /> - <dependency org="de.java2html" name="java2html" rev="5.0" conf="build->master" /> + <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="eclipse.org" name="ecj" rev="3.6.0" conf="build->runtime; contrib->sources" /> + <dependency org="org.eclipse.custom" name="ecj" rev="3.6.2" conf="build->default; contrib->sources" /> <dependency org="netbeans.org" name="boot" rev="6.8beta" conf="netbeansBuild->build" /> <dependency org="netbeans.org" name="openide.modules" rev="6.8beta" conf="netbeansBuild->build" /> <dependency org="netbeans.org" name="openide.util" rev="6.8beta" conf="netbeansBuild->build" /> <dependency org="netbeans.org" name="modules.java.source" rev="6.8beta" conf="netbeansBuild->build" /> - <dependency org="eclipse.org" name="core.runtime" rev="3.6.0" conf="eclipseBuild->runtime; contrib->sources" /> - <dependency org="eclipse.org" name="jdt.core" rev="3.6.0" conf="eclipseBuild->runtime; contrib->sources" /> - <dependency org="eclipse.org" name="jdt.ui" rev="3.6.0" conf="eclipseBuild->runtime; contrib->sources" /> - <dependency org="eclipse.org" name="equinox.common" rev="3.6.0" conf="eclipseBuild->runtime; contrib->sources" /> - <dependency org="eclipse.org" name="osgi" rev="3.6.0" conf="eclipseBuild->runtime; contrib->sources" /> + <dependency org="org.eclipse.custom" name="core.runtime" rev="3.6.0" conf="eclipseBuild->default; contrib->sources" /> + <dependency org="org.eclipse.custom" name="jdt.core" rev="3.6.0" conf="eclipseBuild->default; contrib->sources" /> + <dependency org="org.eclipse.custom" name="jdt.ui" rev="3.6.0" conf="eclipseBuild->default; contrib->sources" /> + <dependency org="org.eclipse.custom" name="equinox.common" rev="3.6.0" conf="eclipseBuild->default; contrib->sources" /> + <dependency org="org.eclipse.custom" name="osgi" rev="3.6.0" conf="eclipseBuild->default; contrib->sources" /> </dependencies> </ivy-module> diff --git a/buildScripts/website.ant.xml b/buildScripts/website.ant.xml index aabc337c..68e20eae 100644 --- a/buildScripts/website.ant.xml +++ b/buildScripts/website.ant.xml @@ -144,6 +144,9 @@ such as converting the changelog into HTML, and creating javadoc. <antcall target="-integrateSnippet"> <param name="transformationName" value="Delegate" /> </antcall> + <antcall target="-integrateSnippet"> + <param name="transformationName" value="onX" /> + </antcall> </target> <target name="-website-dist"> |