eclipse-disable-junit4-apt.patch

   1 diff -uNr assemble.org.eclipse.sdk.linux.gtk.ia64.xml assemble.org.eclipse.sdk.linux.gtk.ia64.xml
   2 --- assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2006-07-04 13:40:47.000000000 -0400
   3 +++ assemble.org.eclipse.sdk.linux.gtk.ia64.xml 2006-07-04 13:33:17.000000000 -0400
   4 @@ -106,9 +106,6 @@
   5                 <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.ui" target="gather.bin.parts">
   6                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
   7                 </ant>
   8 -               <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
   9 -                       <property name="destination.temp.folder" value="${eclipse.plugins}"/>
  10 -               </ant>
  11                 <ant antfile="build.xml" dir="plugins/org.eclipse.osgi" target="gather.bin.parts">
  12                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
  13                 </ant>
  14 @@ -130,9 +127,6 @@
  15                 <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts">
  16                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
  17                 </ant>
  18 -               <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
  19 -                       <property name="destination.temp.folder" value="${eclipse.plugins}"/>
  20 -               </ant>
  21                 <ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.user" target="gather.bin.parts">
  22                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
  23                 </ant>
  24 @@ -295,9 +289,6 @@
  25                 <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts">
  26                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
  27                 </ant>
  28 -               <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
  29 -                       <property name="destination.temp.folder" value="${eclipse.plugins}"/>
  30 -               </ant>
  31                 <ant antfile="build.xml" dir="plugins/org.eclipse.jface.text" target="gather.bin.parts">
  32                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
  33                 </ant>
  34 @@ -325,9 +316,6 @@
  35                 <ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts">
  36                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
  37                 </ant>
  38 -               <ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
  39 -                       <property name="destination.temp.folder" value="${eclipse.plugins}"/>
  40 -               </ant>
  41                 <ant antfile="build.xml" dir="plugins/org.eclipse.pde.source" target="gather.bin.parts">
  42                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
  43                 </ant>
  44 @@ -471,10 +459,6 @@
  45                 </antcall>
  46                 <antcall target="jarUp">
  47                         <param name="source" value="${eclipse.plugins}"/>
  48 -                       <param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060605-1400"/>
  49 -               </antcall>
  50 -               <antcall target="jarUp">
  51 -                       <param name="source" value="${eclipse.plugins}"/>
  52                         <param name="elementName" value="org.eclipse.osgi_3.2.0.v20060601"/>
  53                 </antcall>
  54                 <antcall target="jarUp">
  55 @@ -495,10 +479,6 @@
  56                 </antcall>
  57                 <antcall target="jarUp">
  58                         <param name="source" value="${eclipse.plugins}"/>
  59 -                       <param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060602-1740"/>
  60 -               </antcall>
  61 -               <antcall target="jarUp">
  62 -                       <param name="source" value="${eclipse.plugins}"/>
  63                         <param name="elementName" value="org.eclipse.platform.doc.user_3.2.0.v20060605"/>
  64                 </antcall>
  65                 <antcall target="jarUp">
  66 @@ -675,10 +655,6 @@
  67                 </antcall>
  68                 <antcall target="jarUp">
  69                         <param name="source" value="${eclipse.plugins}"/>
  70 -                       <param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060602-1740"/>
  71 -               </antcall>
  72 -               <antcall target="jarUp">
  73 -                       <param name="source" value="${eclipse.plugins}"/>
  74                         <param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060605-1400"/>
  75                 </antcall>
  76                 <antcall target="jarUp">
  77 diff -uNr assemble.org.eclipse.sdk.linux.gtk.ppc64.xml assemble.org.eclipse.sdk.linux.gtk.ppc64.xml
  78 --- assemble.org.eclipse.sdk.linux.gtk.ppc64.xml        2006-07-04 13:40:47.000000000 -0400
  79 +++ assemble.org.eclipse.sdk.linux.gtk.ppc64.xml        2006-07-04 13:33:54.000000000 -0400
  80 @@ -106,9 +106,6 @@
  81                 <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.ui" target="gather.bin.parts">
  82                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
  83                 </ant>
  84 -               <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
  85 -                       <property name="destination.temp.folder" value="${eclipse.plugins}"/>
  86 -               </ant>
  87                 <ant antfile="build.xml" dir="plugins/org.eclipse.osgi" target="gather.bin.parts">
  88                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
  89                 </ant>
  90 @@ -130,9 +127,6 @@
  91                 <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts">
  92                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
  93                 </ant>
  94 -               <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
  95 -                       <property name="destination.temp.folder" value="${eclipse.plugins}"/>
  96 -               </ant>
  97                 <ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.user" target="gather.bin.parts">
  98                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
  99                 </ant>
 100 @@ -292,9 +286,6 @@
 101                 <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts">
 102                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 103                 </ant>
 104 -               <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
 105 -                       <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 106 -               </ant>
 107                 <ant antfile="build.xml" dir="plugins/org.eclipse.jface.text" target="gather.bin.parts">
 108                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 109                 </ant>
 110 @@ -322,9 +313,6 @@
 111                 <ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts">
 112                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 113                 </ant>
 114 -               <ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
 115 -                       <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 116 -               </ant>
 117                 <ant antfile="build.xml" dir="plugins/org.eclipse.pde.source" target="gather.bin.parts">
 118                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 119                 </ant>
 120 @@ -462,10 +450,6 @@
 121                 </antcall>
 122                 <antcall target="jarUp">
 123                         <param name="source" value="${eclipse.plugins}"/>
 124 -                       <param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060605-1400"/>
 125 -               </antcall>
 126 -               <antcall target="jarUp">
 127 -                       <param name="source" value="${eclipse.plugins}"/>
 128                         <param name="elementName" value="org.eclipse.osgi_3.2.0.v20060601"/>
 129                 </antcall>
 130                 <antcall target="jarUp">
 131 @@ -486,10 +470,6 @@
 132                 </antcall>
 133                 <antcall target="jarUp">
 134                         <param name="source" value="${eclipse.plugins}"/>
 135 -                       <param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060602-1740"/>
 136 -               </antcall>
 137 -               <antcall target="jarUp">
 138 -                       <param name="source" value="${eclipse.plugins}"/>
 139                         <param name="elementName" value="org.eclipse.platform.doc.user_3.2.0.v20060605"/>
 140                 </antcall>
 141                 <antcall target="jarUp">
 142 @@ -662,10 +642,6 @@
 143                 </antcall>
 144                 <antcall target="jarUp">
 145                         <param name="source" value="${eclipse.plugins}"/>
 146 -                       <param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060602-1740"/>
 147 -               </antcall>
 148 -               <antcall target="jarUp">
 149 -                       <param name="source" value="${eclipse.plugins}"/>
 150                         <param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060605-1400"/>
 151                 </antcall>
 152                 <antcall target="jarUp">
 153 diff -uNr assemble.org.eclipse.sdk.linux.gtk.ppc.xml assemble.org.eclipse.sdk.linux.gtk.ppc.xml
 154 --- assemble.org.eclipse.sdk.linux.gtk.ppc.xml  2006-07-04 13:40:47.000000000 -0400
 155 +++ assemble.org.eclipse.sdk.linux.gtk.ppc.xml  2006-07-04 13:34:22.000000000 -0400
 156 @@ -109,9 +109,6 @@
 157                 <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.ui" target="gather.bin.parts">
 158                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 159                 </ant>
 160 -               <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
 161 -                       <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 162 -               </ant>
 163                 <ant antfile="build.xml" dir="plugins/org.eclipse.osgi" target="gather.bin.parts">
 164                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 165                 </ant>
 166 @@ -133,9 +130,6 @@
 167                 <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts">
 168                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 169                 </ant>
 170 -               <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
 171 -                       <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 172 -               </ant>
 173                 <ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.user" target="gather.bin.parts">
 174                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 175                 </ant>
 176 @@ -298,9 +292,6 @@
 177                 <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts">
 178                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 179                 </ant>
 180 -               <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
 181 -                       <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 182 -               </ant>
 183                 <ant antfile="build.xml" dir="plugins/org.eclipse.jface.text" target="gather.bin.parts">
 184                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 185                 </ant>
 186 @@ -328,9 +319,6 @@
 187                 <ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts">
 188                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 189                 </ant>
 190 -               <ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
 191 -                       <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 192 -               </ant>
 193                 <ant antfile="build.xml" dir="plugins/org.eclipse.pde.source" target="gather.bin.parts">
 194                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 195                 </ant>
 196 @@ -471,10 +459,6 @@
 197                 </antcall>
 198                 <antcall target="jarUp">
 199                         <param name="source" value="${eclipse.plugins}"/>
 200 -                       <param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060605-1400"/>
 201 -               </antcall>
 202 -               <antcall target="jarUp">
 203 -                       <param name="source" value="${eclipse.plugins}"/>
 204                         <param name="elementName" value="org.eclipse.osgi_3.2.0.v20060601"/>
 205                 </antcall>
 206                 <antcall target="jarUp">
 207 @@ -495,10 +479,6 @@
 208                 </antcall>
 209                 <antcall target="jarUp">
 210                         <param name="source" value="${eclipse.plugins}"/>
 211 -                       <param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060602-1740"/>
 212 -               </antcall>
 213 -               <antcall target="jarUp">
 214 -                       <param name="source" value="${eclipse.plugins}"/>
 215                         <param name="elementName" value="org.eclipse.platform.doc.user_3.2.0.v20060605"/>
 216                 </antcall>
 217                 <antcall target="jarUp">
 218 @@ -675,10 +655,6 @@
 219                 </antcall>
 220                 <antcall target="jarUp">
 221                         <param name="source" value="${eclipse.plugins}"/>
 222 -                       <param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060602-1740"/>
 223 -               </antcall>
 224 -               <antcall target="jarUp">
 225 -                       <param name="source" value="${eclipse.plugins}"/>
 226                         <param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060605-1400"/>
 227                 </antcall>
 228                 <antcall target="jarUp">
 229 diff -uNr assemble.org.eclipse.sdk.linux.gtk.x86_64.xml assemble.org.eclipse.sdk.linux.gtk.x86_64.xml
 230 --- assemble.org.eclipse.sdk.linux.gtk.x86_64.xml       2006-07-04 13:40:47.000000000 -0400
 231 +++ assemble.org.eclipse.sdk.linux.gtk.x86_64.xml       2006-07-04 13:34:53.000000000 -0400
 232 @@ -106,9 +106,6 @@
 233                 <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.ui" target="gather.bin.parts">
 234                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 235                 </ant>
 236 -               <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
 237 -                       <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 238 -               </ant>
 239                 <ant antfile="build.xml" dir="plugins/org.eclipse.osgi" target="gather.bin.parts">
 240                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 241                 </ant>
 242 @@ -130,9 +127,6 @@
 243                 <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts">
 244                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 245                 </ant>
 246 -               <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
 247 -                       <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 248 -               </ant>
 249                 <ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.user" target="gather.bin.parts">
 250                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 251                 </ant>
 252 @@ -298,9 +292,6 @@
 253                 <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts">
 254                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 255                 </ant>
 256 -               <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
 257 -                       <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 258 -               </ant>
 259                 <ant antfile="build.xml" dir="plugins/org.eclipse.jface.text" target="gather.bin.parts">
 260                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 261                 </ant>
 262 @@ -331,9 +322,6 @@
 263                 <ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts">
 264                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 265                 </ant>
 266 -               <ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
 267 -                       <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 268 -               </ant>
 269                 <ant antfile="build.xml" dir="plugins/org.eclipse.pde.source" target="gather.bin.parts">
 270                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 271                 </ant>
 272 @@ -474,10 +462,6 @@
 273                 </antcall>
 274                 <antcall target="jarUp">
 275                         <param name="source" value="${eclipse.plugins}"/>
 276 -                       <param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060605-1400"/>
 277 -               </antcall>
 278 -               <antcall target="jarUp">
 279 -                       <param name="source" value="${eclipse.plugins}"/>
 280                         <param name="elementName" value="org.eclipse.osgi_3.2.0.v20060601"/>
 281                 </antcall>
 282                 <antcall target="jarUp">
 283 @@ -498,10 +482,6 @@
 284                 </antcall>
 285                 <antcall target="jarUp">
 286                         <param name="source" value="${eclipse.plugins}"/>
 287 -                       <param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060602-1740"/>
 288 -               </antcall>
 289 -               <antcall target="jarUp">
 290 -                       <param name="source" value="${eclipse.plugins}"/>
 291                         <param name="elementName" value="org.eclipse.platform.doc.user_3.2.0.v20060605"/>
 292                 </antcall>
 293                 <antcall target="jarUp">
 294 @@ -678,10 +658,6 @@
 295                 </antcall>
 296                 <antcall target="jarUp">
 297                         <param name="source" value="${eclipse.plugins}"/>
 298 -                       <param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060602-1740"/>
 299 -               </antcall>
 300 -               <antcall target="jarUp">
 301 -                       <param name="source" value="${eclipse.plugins}"/>
 302                         <param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060605-1400"/>
 303                 </antcall>
 304                 <antcall target="jarUp">
 305 diff -uNr assemble.org.eclipse.sdk.linux.gtk.x86.xml assemble.org.eclipse.sdk.linux.gtk.x86.xml
 306 --- assemble.org.eclipse.sdk.linux.gtk.x86.xml  2006-07-04 13:40:47.000000000 -0400
 307 +++ assemble.org.eclipse.sdk.linux.gtk.x86.xml  2006-07-04 13:35:31.000000000 -0400
 308 @@ -112,9 +112,6 @@
 309                 <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.ui" target="gather.bin.parts">
 310                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 311                 </ant>
 312 -               <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit4.runtime" target="gather.bin.parts">
 313 -                       <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 314 -               </ant>
 315                 <ant antfile="build.xml" dir="plugins/org.eclipse.osgi" target="gather.bin.parts">
 316                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 317                 </ant>
 318 @@ -136,9 +133,6 @@
 319                 <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts">
 320                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 321                 </ant>
 322 -               <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.ui" target="gather.bin.parts">
 323 -                       <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 324 -               </ant>
 325                 <ant antfile="build.xml" dir="plugins/org.eclipse.platform.doc.user" target="gather.bin.parts">
 326                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 327                 </ant>
 328 @@ -298,9 +292,6 @@
 329                 <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit.runtime" target="gather.bin.parts">
 330                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 331                 </ant>
 332 -               <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.apt.core" target="gather.bin.parts">
 333 -                       <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 334 -               </ant>
 335                 <ant antfile="build.xml" dir="plugins/org.eclipse.jface.text" target="gather.bin.parts">
 336                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 337                 </ant>
 338 @@ -331,9 +322,6 @@
 339                 <ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts">
 340                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 341                 </ant>
 342 -               <ant antfile="build.xml" dir="plugins/org.junit4" target="gather.bin.parts">
 343 -                       <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 344 -               </ant>
 345                 <ant antfile="build.xml" dir="plugins/org.eclipse.pde.source" target="gather.bin.parts">
 346                         <property name="destination.temp.folder" value="${eclipse.plugins}"/>
 347                 </ant>
 348 @@ -474,10 +462,6 @@
 349                 </antcall>
 350                 <antcall target="jarUp">
 351                         <param name="source" value="${eclipse.plugins}"/>
 352 -                       <param name="elementName" value="org.eclipse.jdt.junit4.runtime_1.0.0.v20060605-1400"/>
 353 -               </antcall>
 354 -               <antcall target="jarUp">
 355 -                       <param name="source" value="${eclipse.plugins}"/>
 356                         <param name="elementName" value="org.eclipse.osgi_3.2.0.v20060601"/>
 357                 </antcall>
 358                 <antcall target="jarUp">
 359 @@ -498,10 +482,6 @@
 360                 </antcall>
 361                 <antcall target="jarUp">
 362                         <param name="source" value="${eclipse.plugins}"/>
 363 -                       <param name="elementName" value="org.eclipse.jdt.apt.ui_3.2.0.v20060602-1740"/>
 364 -               </antcall>
 365 -               <antcall target="jarUp">
 366 -                       <param name="source" value="${eclipse.plugins}"/>
 367                         <param name="elementName" value="org.eclipse.platform.doc.user_3.2.0.v20060605"/>
 368                 </antcall>
 369                 <antcall target="jarUp">
 370 @@ -678,10 +658,6 @@
 371                 </antcall>
 372                 <antcall target="jarUp">
 373                         <param name="source" value="${eclipse.plugins}"/>
 374 -                       <param name="elementName" value="org.eclipse.jdt.apt.core_3.2.0.v20060602-1740"/>
 375 -               </antcall>
 376 -               <antcall target="jarUp">
 377 -                       <param name="source" value="${eclipse.plugins}"/>
 378                         <param name="elementName" value="org.eclipse.jface.text_3.2.0.v20060605-1400"/>
 379                 </antcall>
 380                 <antcall target="jarUp">
 381 diff -uNr features/org.eclipse.jdt/build.xml features/org.eclipse.jdt/build.xml
 382 --- features/org.eclipse.jdt/build.xml  2006-07-04 13:40:47.000000000 -0400
 383 +++ features/org.eclipse.jdt/build.xml  2006-07-04 13:38:22.000000000 -0400
 384 @@ -12,11 +12,6 @@
 385                         <property name="os" value="win32"/>
 386                         <property name="ws" value="win32"/>
 387                 </ant>
 388 -               <ant antfile="build.xml" dir="../../plugins/org.junit4" target="${target}">
 389 -                       <property name="arch" value="x86"/>
 390 -                       <property name="os" value="win32"/>
 391 -                       <property name="ws" value="win32"/>
 392 -               </ant>
 393                 <ant antfile="build.xml" dir="../../plugins/org.junit" target="${target}">
 394                         <property name="arch" value="x86"/>
 395                         <property name="os" value="win32"/>
 396 @@ -27,11 +22,6 @@
 397                         <property name="os" value="win32"/>
 398                         <property name="ws" value="win32"/>
 399                 </ant>
 400 -               <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.junit4.runtime" target="${target}">
 401 -                       <property name="arch" value="x86"/>
 402 -                       <property name="os" value="win32"/>
 403 -                       <property name="ws" value="win32"/>
 404 -               </ant>
 405                 <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.core" target="${target}">
 406                         <property name="arch" value="x86"/>
 407                         <property name="os" value="win32"/>
 408 @@ -77,16 +67,6 @@
 409                         <property name="os" value="win32"/>
 410                         <property name="ws" value="win32"/>
 411                 </ant>
 412 -               <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.apt.core" target="${target}">
 413 -                       <property name="arch" value="x86"/>
 414 -                       <property name="os" value="win32"/>
 415 -                       <property name="ws" value="win32"/>
 416 -               </ant>
 417 -               <ant antfile="build.xml" dir="../../plugins/org.eclipse.jdt.apt.ui" target="${target}">
 418 -                       <property name="arch" value="x86"/>
 419 -                       <property name="os" value="win32"/>
 420 -                       <property name="ws" value="win32"/>
 421 -               </ant>
 422                 <ant antfile="build.xml" dir="../../plugins/org.eclipse.ant.ui" target="${target}">
 423                         <property name="arch" value="x86"/>
 424                         <property name="os" value="win32"/>
 425 @@ -150,7 +130,7 @@
 426                 <copy todir="${feature.base}/features/org.eclipse.jdt_3.2.0.v20060609m-F7snq1fxia-Z4XP" failonerror="true" overwrite="false">
 427                         <fileset dir="${basedir}" includes="epl-v10.html,feature.xml,feature.properties,eclipse_update_120.jpg,license.html"                    />
 428                 </copy>
 429 -               <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.jdt_3.2.0.v20060609m-F7snq1fxia-Z4XP/feature.xml"  selfVersion="3.2.0.v20060609m-F7snq1fxia-Z4XP" featureIds="" pluginIds="org.eclipse.jdt,3.2.0.v20060605-1400,org.eclipse.ant.ui,3.2.0.v20060531,org.eclipse.jdt.apt.core,3.2.0.v20060602-1740,org.eclipse.jdt.apt.ui,3.2.0.v20060602-1740,org.eclipse.jdt.core,3.2.0.v_671,org.eclipse.jdt.core.manipulation,1.0.0.v20060605-1400,org.eclipse.jdt.debug.ui,3.2.0.v20060605,org.eclipse.jdt.debug,3.2.0.v20060605,org.eclipse.jdt.junit,3.2.0.v20060605-1400,org.eclipse.jdt.junit.runtime,3.2.0.v20060605-1400,org.eclipse.jdt.junit4.runtime,1.0.0.v20060605-1400,org.eclipse.jdt.launching,3.2.0.v20060605,org.eclipse.jdt.ui,3.2.0.v20060605-1400,org.junit,3.8.1,org.junit4,4.1.0,org.eclipse.jdt.doc.user,3.2.0.v20060605-1400,org.eclipse.jdt.launching.macosx,3.1.100.v20060605,"/>
 430 +               <eclipse.idReplacer featureFilePath="${feature.base}/features/org.eclipse.jdt_3.2.0.v20060609m-F7snq1fxia-Z4XP/feature.xml"  selfVersion="3.2.0.v20060609m-F7snq1fxia-Z4XP" featureIds="" pluginIds="org.eclipse.jdt,3.2.0.v20060605-1400,org.eclipse.ant.ui,3.2.0.v20060531,org.eclipse.jdt.core,3.2.0.v_671,org.eclipse.jdt.core.manipulation,1.0.0.v20060605-1400,org.eclipse.jdt.debug.ui,3.2.0.v20060605,org.eclipse.jdt.debug,3.2.0.v20060605,org.eclipse.jdt.junit,3.2.0.v20060605-1400,org.eclipse.jdt.junit.runtime,3.2.0.v20060605-1400,org.eclipse.jdt.launching,3.2.0.v20060605,org.eclipse.jdt.ui,3.2.0.v20060605-1400,org.junit,3.8.1,org.eclipse.jdt.doc.user,3.2.0.v20060605-1400,org.eclipse.jdt.launching.macosx,3.1.100.v20060605,"/>
 431                 <antcall target="rootFiles${os}_${ws}_${arch}"/>
 432         </target>
 433         <target name="rootFileswin32_win32_x86">
 434 diff -uNr features/org.eclipse.jdt/feature.xml features/org.eclipse.jdt/feature.xml
 435 --- features/org.eclipse.jdt/feature.xml        2006-07-04 13:40:47.000000000 -0400
 436 +++ features/org.eclipse.jdt/feature.xml        2006-07-04 12:05:17.000000000 -0400
 437 @@ -38,20 +38,6 @@
 438           unpack="false"/>
 439
 440     <plugin
 441 -         id="org.eclipse.jdt.apt.core"
 442 -         download-size="0"
 443 -         install-size="0"
 444 -         version="0.0.0"
 445 -         unpack="false"/>
 446 -
 447 -   <plugin
 448 -         id="org.eclipse.jdt.apt.ui"
 449 -         download-size="0"
 450 -         install-size="0"
 451 -         version="0.0.0"
 452 -         unpack="false"/>
 453 -
 454 -   <plugin
 455           id="org.eclipse.jdt.core"
 456           download-size="0"
 457           install-size="0"
 458 @@ -91,13 +77,6 @@
 459           version="0.0.0"/>
 460
 461     <plugin
 462 -         id="org.eclipse.jdt.junit4.runtime"
 463 -         download-size="0"
 464 -         install-size="0"
 465 -         version="0.0.0"
 466 -         unpack="false"/>
 467 -
 468 -   <plugin
 469           id="org.eclipse.jdt.launching"
 470           download-size="0"
 471           install-size="0"
 472 @@ -118,12 +97,6 @@
 473           version="3.8.1"/>
 474
 475     <plugin
 476 -         id="org.junit4"
 477 -         download-size="0"
 478 -         install-size="0"
 479 -         version="0.0.0"/>
 480 -
 481 -   <plugin
 482           id="org.eclipse.jdt.doc.user"
 483           download-size="0"
 484           install-size="0"
 485 diff -uNr plugins/org.eclipse.jdt.doc.isv/buildDoc.xml plugins/org.eclipse.jdt.doc.isv/buildDoc.xml
 486 --- plugins/org.eclipse.jdt.doc.isv/buildDoc.xml        2006-07-04 13:40:47.000000000 -0400
 487 +++ plugins/org.eclipse.jdt.doc.isv/buildDoc.xml        2006-07-04 13:30:48.000000000 -0400
 488 @@ -75,7 +75,7 @@
 489                 <exec dir="." executable="${javadoc}" output="doc.bin.log">
 490                         <arg line="@${basedir}/${optionsFile} -J-Xmx500M" />
 491                 </exec>
 492 -               <antcall target="generateJdtAptJavadoc" />
 493 +               <!-- <antcall target="generateJdtAptJavadoc" /> -->
 494         </target>
 495
 496         <target name="generateJdtAptJavadoc">
 497 diff -uNr plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
 498 --- plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt      2006-07-04 13:40:47.000000000 -0400
 499 +++ plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt      2006-07-04 13:42:37.000000000 -0400
 500 @@ -22,12 +22,10 @@
 501  ;../org.eclipse.jdt.ui/ui refactoring
 502  ;../org.eclipse.jdt.ui/core extension
 503  ;../org.eclipse.jdt.core.manipulation/refactoring
 504 -;../org.eclipse.jdt.core.manipulation/common
 505 -;../org.eclipse.jdt.apt.core/src"
 506 +;../org.eclipse.jdt.core.manipulation/common"
 507  -d reference/api
 508  -classpath @rt@
 509  ;../../baseLocation/plugins/com.ibm.icu_3.4.4.1.jar
 510 -;../org.eclipse.jdt.apt.core/mirrorapi.jar
 511  ;../org.apache.ant/lib/ant.jar
 512  ;../org.eclipse.compare/@dot
 513  ;../org.eclipse.core.commands/@dot