diff --git a/releng.wtpbuilder/components/jst-sdk/dependency.xml b/releng.wtpbuilder/components/jst-sdk/dependency.xml index 60c33b44d8a90fc516ef8e786b698f822ce907b6..7942193783e8916a739742e0236ffb084724c424 100644 --- a/releng.wtpbuilder/components/jst-sdk/dependency.xml +++ b/releng.wtpbuilder/components/jst-sdk/dependency.xml @@ -27,11 +27,6 @@ name="groupId" value="jem" /> </antcall> - <antcall target="getAndInstall"> - <param - name="groupId" - value="jempatch" /> - </antcall> <antcall target="getAndInstall"> <param name="groupId" diff --git a/releng.wtpbuilder/components/jst.tests/dependency.xml b/releng.wtpbuilder/components/jst.tests/dependency.xml index 186dfc08324d436ee48a1439f1704e87a964da78..faf49a752d5a5eee0d74fe262a6f1370ab0fd3dc 100644 --- a/releng.wtpbuilder/components/jst.tests/dependency.xml +++ b/releng.wtpbuilder/components/jst.tests/dependency.xml @@ -23,12 +23,13 @@ name="groupId" value="gef" /> </antcall> + <!-- <antcall target="getAndInstall"> <param name="groupId" value="jem" /> </antcall> - + --> <antcall target="getAndInstall"> <param name="groupId" diff --git a/releng.wtpbuilder/components/jst/dependency.xml b/releng.wtpbuilder/components/jst/dependency.xml index b5b41376d7b21eccb658b4fc1a43e0b95c9246fb..6d3f241b925233cc408779f50ef57f958f76602c 100644 --- a/releng.wtpbuilder/components/jst/dependency.xml +++ b/releng.wtpbuilder/components/jst/dependency.xml @@ -28,11 +28,6 @@ name="groupId" value="jem" /> </antcall> - <antcall target="getAndInstall"> - <param - name="groupId" - value="jempatch" /> - </antcall> <antcall target="getAndInstall"> <param name="groupId" diff --git a/releng.wtpbuilder/components/wst-sdk/customTargets.xml b/releng.wtpbuilder/components/wst-sdk/customTargets.xml index 6955250e1b5dde3243da230e5be8b691157729c0..7f8edfeb57b8b670d78cf424a7b1fa4c2e8a6d71 100644 --- a/releng.wtpbuilder/components/wst-sdk/customTargets.xml +++ b/releng.wtpbuilder/components/wst-sdk/customTargets.xml @@ -74,17 +74,6 @@ src="${thirdparty.dir}/${thirdparty.file}" /> </zip> - <!-- add zip entries of jempatch, the jem dev. patch --> - <echo message="${buildDirectory}/../" /> - <property file="${buildDirectory}/../installmanifest.properties" /> - <zip - destfile="${buildDirectory}/${buildLabel}/${archiveName}" - update="true" - duplicate="preserve"> - <zipfileset - src="${jempatch.dir}/${jempatch.file}" /> - </zip> - <ant antfile="${wtp.builder.home}/scripts/build/buildutilities.xml" target="createChecksums"> diff --git a/releng.wtpbuilder/components/wst-sdk/dependency.xml b/releng.wtpbuilder/components/wst-sdk/dependency.xml index 245a3c3d600c935dbeab3e5a88f1c639600ed51f..5835821947e354bd215ee971dfb9a628f2760b5e 100644 --- a/releng.wtpbuilder/components/wst-sdk/dependency.xml +++ b/releng.wtpbuilder/components/wst-sdk/dependency.xml @@ -8,73 +8,46 @@ ====================================================================== --> -<project - name="test" - default="get"> +<project name="test" default="get"> <target name="get"> - <antcall target="getAndInstall"> - <param - name="groupId" - value="thirdparty" /> - </antcall> - <antcall target="getAndInstall"> - <param - name="groupId" - value="emf" /> + <param name="groupId" value="thirdparty" /> </antcall> + <antcall target="getAndInstall"> - <param - name="groupId" - value="gef" /> + <param name="groupId" value="emf" /> </antcall> <antcall target="getAndInstall"> - <param - name="groupId" - value="jem" /> + <param name="groupId" value="gef" /> </antcall> - <antcall target="getAndInstall"> - <param - name="groupId" - value="jempatch" /> + <antcall target="getAndInstall"> + <param name="groupId" value="jem" /> </antcall> <antcall target="getAndInstall"> - <param - name="groupId" - value="eclipse" /> + <param name="groupId" value="eclipse" /> </antcall> <antcall target="getAndInstall"> - <param - name="groupId" - value="eclipseTestFramework" /> + <param name="groupId" + value="eclipseTestFramework" /> </antcall> <antcall target="getAndInstall"> - <param - name="groupId" - value="dita" /> + <param name="groupId" value="dita" /> </antcall> </target> <target name="getAndInstall"> - <ant - antfile="${dependencyTargets}" - target="checkDependency"> - <property - name="groupId" - value="${groupId}" /> + <ant antfile="${dependencyTargets}" + target="checkDependency"> + <property name="groupId" value="${groupId}" /> </ant> - <ant - antfile="${dependencyTargets}" - target="installDependency"> - <property - name="groupId" - value="${groupId}" /> - <property - name="install.destination" - value="${base.install.dir}" /> + <ant antfile="${dependencyTargets}" + target="installDependency"> + <property name="groupId" value="${groupId}" /> + <property name="install.destination" + value="${base.install.dir}" /> </ant> </target> diff --git a/releng.wtpbuilder/components/wst.tests/dependency.xml b/releng.wtpbuilder/components/wst.tests/dependency.xml index dbb1b4a6f051792371862c4f2cc562c8ee69612d..e2c38c8d95cf0883302feb01fd906b8a014b07b5 100644 --- a/releng.wtpbuilder/components/wst.tests/dependency.xml +++ b/releng.wtpbuilder/components/wst.tests/dependency.xml @@ -23,11 +23,13 @@ name="groupId" value="gef" /> </antcall> + <!-- <antcall target="getAndInstall"> <param name="groupId" value="jem" /> </antcall> + --> <antcall target="getAndInstall"> <param name="groupId" diff --git a/releng.wtpbuilder/components/wst/customTargets.xml b/releng.wtpbuilder/components/wst/customTargets.xml index 6cb86806603af28563514025ed7bf85bf514bf0b..73f327fd25d758e0a94a7d46b036fc70785faed9 100644 --- a/releng.wtpbuilder/components/wst/customTargets.xml +++ b/releng.wtpbuilder/components/wst/customTargets.xml @@ -74,17 +74,6 @@ src="${thirdparty.dir}/${thirdparty.file}" /> </zip> - <!-- add zip entries of jempatch, the jem dev. patch --> - <echo message="${buildDirectory}/../" /> - <property file="${buildDirectory}/../installmanifest.properties" /> - <zip - destfile="${buildDirectory}/${buildLabel}/${archiveName}" - update="true" - duplicate="preserve"> - <zipfileset - src="${jempatch.dir}/${jempatch.file}" /> - </zip> - <ant antfile="${wtp.builder.home}/scripts/build/buildutilities.xml" target="createChecksums"> diff --git a/releng.wtpbuilder/components/wst/dependency.xml b/releng.wtpbuilder/components/wst/dependency.xml index e54c05513a8b894304b914bf4e0adfb49df1519d..e020dfc805c1ce8166d46489091bde9ad9c58489 100644 --- a/releng.wtpbuilder/components/wst/dependency.xml +++ b/releng.wtpbuilder/components/wst/dependency.xml @@ -33,11 +33,6 @@ name="groupId" value="jem" /> </antcall> - <antcall target="getAndInstall"> - <param - name="groupId" - value="jempatch" /> - </antcall> <antcall target="getAndInstall"> <param name="groupId" diff --git a/releng.wtpbuilder/distribution/wtp.api/build.xml b/releng.wtpbuilder/distribution/wtp.api/build.xml index 3444b57e4789f85a2536e88dd6d9447c59f2af6c..e5d6ebd5446650dc632cf8086b96abecd7a19273 100644 --- a/releng.wtpbuilder/distribution/wtp.api/build.xml +++ b/releng.wtpbuilder/distribution/wtp.api/build.xml @@ -74,9 +74,11 @@ <antcall target="getAndInstall"> <param name="groupId" value="gef" /> </antcall> +<!-- <antcall target="getAndInstall"> <param name="groupId" value="jem" /> </antcall> + --> <antcall target="getAndInstall"> <param name="groupId" value="tomcat.5" /> </antcall> diff --git a/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml b/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml index f767fd4f706429b84c745de1bd9b5a528a63cbc1..158ebf7f9032435e9903362d4682467cd727856b 100644 --- a/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml +++ b/releng.wtpbuilder/distribution/wtp.tests/testdependency.xml @@ -16,9 +16,11 @@ <antcall target="getAndInstall"> <param name="groupId" value="gef" /> </antcall> + <!-- <antcall target="getAndInstall"> <param name="groupId" value="jem" /> </antcall> + --> <antcall target="getAndInstall"> <param name="groupId" value="eclipse" /> </antcall>