Bug 562457 - Cleanup Old build scripts from aggregator repo

Change-Id: Iaf875228100dad2cd01e275b266db1a1d34f72cf
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
diff --git a/cje-production/X-build/buildproperties.txt b/cje-production/X-build/buildproperties.txt
deleted file mode 100644
index cac5422..0000000
--- a/cje-production/X-build/buildproperties.txt
+++ /dev/null
@@ -1,55 +0,0 @@
-#*******************************************************************************
-# Copyright (c) 2019 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     Sravan Lakkimsetti - initial API and implementation
-#*******************************************************************************
-
-# This file contains environmental properties as key value pairs. Lines starting
-# with # are considered comments and no spaces allowed in keys
-
-# CJE build variables
-BRANCH="master"
-PATCH_OR_BRANCH_LABEL="master"
-BUILD_TYPE_NAME="Experimental"
-BUILD_TYPE="X"
-TESTED_BUILD_TYPE="X"
-RELEASE_VER="4.16"
-STREAM="4.16.0"
-STREAMMajor="4"
-STREAMMinor="16"
-STREAMService="0"
-GIT_ROOT="ssh://genie.releng@git.eclipse.org:29418"
-AGG_REPO="/platform/eclipse.platform.releng.aggregator.git"
-AGG_DIR="gitCache/eclipse.platform.releng.aggregator"
-DROP_DIR="siteDir/eclipse/downloads/drops4"
-UPDATES_DIR="siteDir/eclipse/updates"
-EQUINOX_DROP_DIR="siteDir/equinox/drops"
-TMP_DIR="tmp"
-DOWNLOAD_HOST="download.eclipse.org"
-BUILD_TO_COMPARE_SITE="ftp.osuosl.org/pub/eclipse/eclipse/updates"
-LOCAL_REPO="localMavenRepo"
-
-# Base builder parameters
-BASEBUILDER_TAG="4.15"
-API_PREV_REF_LABEL="4.15"
-#API_FREEZE_REF_LABEL="4.15RC1"
-API_FREEZE_REF_LABEL=""
-PREVIOUS_RELEASE_VER="4.15"
-PREVIOUS_RELEASE_ID="R-4.15-202003050155"
-BUILDTOOLS_REPO="https://download.eclipse.org/eclipse/updates/buildtools/"
-WEBTOOLS_REPO="https://download.eclipse.org/webtools/downloads/drops/R3.12.0/R-3.12.0-20181130055351/repositoryunittests/"
-WEBTOOLS_VER="1.2.0.v201405010053"
-BASEBUILDER_DIR="tmp/org.eclipse.releng.basebuilder"
-ECLIPSE_RUN_REPO="https://download.eclipse.org/eclipse/updates/4.16-I-builds/"
-
-#Maven parameters
-MAVEN_OPTS="-Xmx6G"
-JAVA_DOC_TOOL="-Declipse.javadoc=/opt/tools/java/openjdk/jdk-11/latest/bin/javadoc"
diff --git a/cje-production/X-build/pom.xml b/cje-production/X-build/pom.xml
deleted file mode 100644
index f849f01..0000000
--- a/cje-production/X-build/pom.xml
+++ /dev/null
@@ -1,1160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2012, 2020 Eclipse Foundation and others.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  https://www.eclipse.org/org/documents/edl-v10.php
-
-  Contributors:
-  Igor Fedorenko - initial implementation
-  Thanh Ha - improvements and maintenance
-  David Williams - improvements and maintenance
-  Lars Vogel - Bug 442042
--->
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.eclipse</groupId>
-  <artifactId>eclipse-platform-parent</artifactId>
-  <version>4.16.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-  <!--
-    See maven-enforcer-plugin configuration to actually break the build if
-    run with older maven.
-    prerequisites section is kept for now as even if it doesn't break the build, it
-    is used by other plugins like versions-maven-plugin which check and warn
-    for using plugins with older than they require Maven version.
-    If version number changed in one place, be sure to change in the other.
-  -->
-  <prerequisites>
-    <maven>3.5.4</maven>
-  </prerequisites>
-  <properties>
-    <!-- As of Tycho 0.22, skipTests takes priority, if maven.test.skip also specified,
-      with different value. See https://bugs.eclipse.org/442976.
-      During production builds, we run with -DskipTests=true -->
-    <skipTests>false</skipTests>
-    <maven.build.timestamp.format>yyyyMMdd-HHmm</maven.build.timestamp.format>
-    <macSigner.forceContinue>false</macSigner.forceContinue>
-    <buildTimestamp>${maven.build.timestamp}</buildTimestamp>
-    <buildType>I</buildType>
-    <buildId>${buildType}${buildTimestamp}</buildId>
-     <!--
-      releaseName should match the yearly "release train" name.
-      For example, "Mars", "Mars.1", "Luna SR2", etc.
-      It will show up in "about box",
-      such as Version: Mars (4.5), for main features.
-      See bug 328139.
-    -->
-    <releaseName>2020-06</releaseName>
-    <!--
-      The releaseNumbers below, for SDK and Platform, might be
-      thought of as the "marketing number" or "branding number",
-      and in fact are used in the branding bundle of the corresponding products.
-      In practice, the SDK number and Platform number are always the same,
-      though in theory they would not always have to be ... so we'll use
-      separate numbers. Also in practice, they are almost always the same as
-      or nearly the same as the "product feature" numbers, but for example, for
-      the initial release, some prefer we not use the trailing zero, but instead
-      merely "4.5, instead of 4.5.0". And, hypothetically, there might be a time
-      in the future when the platform for a new release was "merely service",
-      but we'd still want the "marketing number" to be increased to reflect
-      "a new yearly release".
-    -->
-    <releaseNumberSDK>4.16</releaseNumberSDK>
-    <releaseNumberPlatform>4.16</releaseNumberPlatform>
-
-	<!-- using released version (normal case)
-	     when upgrading make sure you change pom-version-updater version in build-functions.shsource
-    -->
-    <tycho.version>1.7.0</tycho.version>
-
-    <cbi-plugins.version>1.1.8-SNAPSHOT</cbi-plugins.version>
-
-    <!--  
-      The tycho-eclipserun-plugin will create its instance of Eclipse from this
-      'eclipiserun-repo' repository, such as for computing .api-descriptions and
-      generating API Tools reports.
-    -->
-    <eclipserun-repo>https://download.eclipse.org/eclipse/updates/4.16-X-builds/</eclipserun-repo>
-    
-    <comparator.repo>https://download.eclipse.org/eclipse/updates/4.16-X-builds</comparator.repo>
-
-    <!--
-      NOTE: this EMF and ECF URL must match exactly what is in the eclipse-sdk-prereqs.target file.
-      We use it (the EMF repo and ECF repo) not only for resolving pre-reqs during the build, but also in 'repository' POM for mirroring
-      a copy of the EMF features and ECF features into our own repository. This is required since we merely "require" EMF (not "include"
-      it).
-      And, of course, in the PDE target file, the URL is expected to be the actual URL, not a variable.
-    -->
-    <emf-repo.url>https://download.eclipse.org/modeling/emf/emf/builds/release/2.21</emf-repo.url>
-
-    <ecf-repo.url>https://download.eclipse.org/rt/ecf/3.14.7/site.p2/</ecf-repo.url>
-
-    <!-- only used when Tycho snapshot repo is enabled in <pluginRepositories> further down -->
-    <tycho-snapshot-repo.url>https://repo.eclipse.org/content/repositories/tycho-snapshots/</tycho-snapshot-repo.url>
-
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cbi-jdt-repo.url>https://repo.eclipse.org/content/repositories/eclipse-staging/</cbi-jdt-repo.url>
-    <cbi-ecj-version>3.21.0.v20200304-1404</cbi-ecj-version>
-
-    <!--
-      Production bundles are produced by ignoring the compiler warnings specified
-      by ${code.ignoredWarnings} (see further down).
-      Good citizens don't override those default settings for their production bundles.
-    -->
-    <code.ignoredWarnings>-warn:-deprecation,unavoidableGenericProblems,warningToken</code.ignoredWarnings>
-
-    <!--
-      Test bundles may override the list of ignored warnings by setting this at the top of their pom.xml:
-      <properties>
-      <code.ignoredWarnings>${tests.ignoredWarnings}</code.ignoredWarnings>
-      </properties>
-      Good citizens use those default settings for their test bundles.
-    -->
-    <tests.ignoredWarnings>-warn:-deprecation,raw,unchecked,discouraged,warningToken</tests.ignoredWarnings>
-
-    <!--
-      repo for released versions of CBI. Note, we intentionally use as specific a repo as possible.
-      See bug 471835.
-    -->
-    <eclipse-repo.url>https://repo.eclipse.org/content/repositories/cbi/</eclipse-repo.url>
-    <cbi-snapshots-repo.url>https://repo.eclipse.org/content/repositories/cbi-snapshots/</cbi-snapshots-repo.url>
-
-
-    <!--
-      This eclipse-p2-repo.url is specifically for the build-individual-bundles profile.
-      See that profile for longer comment.
-    -->
-    <eclipse-p2-repo.url>This_URL_set_in_build-individual-bundles_profile</eclipse-p2-repo.url>
-
-    <!--
-      If configuration is not specified at all, in signing plugin, the default
-      is 'false' (do not exclude inner jars, that is inner jars are signed).
-    -->
-    <defaultSigning-excludeInnerJars>false</defaultSigning-excludeInnerJars>
-
-    <!--
-      Valid options: error, warning, and ignore
-      jgit.dirtyWorkingTree checking was added as of Tycho 0.19.0
-      see: https://bugs.eclipse.org/419030
-    -->
-    <jgit.dirtyWorkingTree-platformDefault>ignore</jgit.dirtyWorkingTree-platformDefault>
-
-    <qualifier.format>'v'yyyyMMdd-HHmm</qualifier.format>
-
-    <compare-version-with-baselines.skip>true</compare-version-with-baselines.skip>
-    <previous-release.baseline>https://download.eclipse.org/eclipse/updates/4.15milestones/</previous-release.baseline>
-
-    <!--
-      Declaration of properties that contribute to the arg line for the tycho-surefire-plugin.
-      The properties are declared empty by default and are overridden by automatic activation
-      of the profiles 'macos' and 'jdk9-or-newer' or specific configuration in modules.
-    -->
-    <!-- any additional surefire args; to be defined by a test-plugin -->
-    <surefire.testArgLine></surefire.testArgLine>
-    <!-- platform/OS specific JVM args -->
-    <surefire.platformSystemProperties></surefire.platformSystemProperties>
-    <!-- properties related to Java modules on Java 9+ -->
-    <surefire.moduleProperties></surefire.moduleProperties>
-    <!-- system specific JVM args; if needed provided by system properties to the build command -->
-    <surefire.systemProperties></surefire.systemProperties>
-  </properties>
-
-  <organization>
-    <name>Eclipse Foundation</name>
-    <url>https://www.eclipse.org/</url>
-  </organization>
-
-  <issueManagement>
-    <system>Bugzilla</system>
-    <url>https://bugs.eclipse.org/bugs/</url>
-  </issueManagement>
-
-  <distributionManagement>
-    <repository>
-      <id>repo.eclipse.org</id>
-      <name>Eclipse Repository - Releases</name>
-      <url>https://repo.eclipse.org/content/repositories/eclipse-releases/</url>
-    </repository>
-    <snapshotRepository>
-      <id>repo.eclipse.org</id>
-      <name>Eclipse Repository - Snapshots</name>
-      <url>https://repo.eclipse.org/content/repositories/eclipse-snapshots/</url>
-    </snapshotRepository>
-  </distributionManagement>
-  <pluginRepositories>
-
-    <!-- Released Tycho versions are available on maven central, which is now mirrored to Eclipse.org.
-         The tycho-snapshot-repo is only needed when using snapshots. -->
-    <pluginRepository>
-      <id>tycho-snapshots</id>
-      <url>${tycho-snapshot-repo.url}</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-
-    <pluginRepository>
-      <id>cbi-jdt</id>
-      <url>${cbi-jdt-repo.url}</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-    <pluginRepository>
-      <id>cbi-snapshots</id>
-      <url>${cbi-snapshots-repo.url}</url>
-      <snapshots>
-      <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-    <pluginRepository>
-      <id>eclipse</id>
-      <url>${eclipse-repo.url}</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>true</enabled>
-      </snapshots>
-    </pluginRepository>
-  </pluginRepositories>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-maven-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <extensions>true</extensions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <configuration>
-          <!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=453757
-            <resolveWithExecutionEnvironmentConstraints>false</resolveWithExecutionEnvironmentConstraints>
-          -->
-          <target>
-            <artifact>
-              <groupId>org.eclipse</groupId>
-              <artifactId>eclipse-sdk-prereqs</artifactId>
-              <version>4.16.0-SNAPSHOT</version>
-            </artifact>
-          </target>
-          <environments>
-            <environment>
-              <os>linux</os>
-              <ws>gtk</ws>
-              <arch>x86_64</arch>
-            </environment>
-            <environment>
-              <os>linux</os>
-              <ws>gtk</ws>
-              <arch>ppc64le</arch>
-            </environment>
-            <environment>
-              <os>win32</os>
-              <ws>win32</ws>
-              <arch>x86_64</arch>
-            </environment>
-            <environment>
-              <os>macosx</os>
-              <ws>cocoa</ws>
-              <arch>x86_64</arch>
-            </environment>
-          </environments>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
-        <configuration>
-          <archive>
-            <addMavenDescriptor>false</addMavenDescriptor>
-          </archive>
-        </configuration>
-        <executions>
-          <execution>
-            <id>plugin-source</id>
-            <goals>
-              <goal>plugin-source</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>filter-resources</id>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-            <phase>process-resources</phase>
-            <configuration>
-              <outputDirectory>${project.build.directory}/resources</outputDirectory>
-              <escapeString>\</escapeString>
-            </configuration>
-          </execution>
-          <execution>
-            <id>saveproperties</id>
-            <configuration>
-              <outputDirectory>${project.build.directory}</outputDirectory>
-              <overwrite>true</overwrite>
-              <resources>
-                <resource>
-                  <directory>saveproperties</directory>
-                  <filtering>true</filtering>
-                </resource>
-              </resources>
-            </configuration>
-            <phase>validate</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <!--
-          This maven-enforcer-plugin configuration to actually break the build if
-          run with older maven.
-          prerequisites section is kept for now as even if it doesn't break the build, it
-          is used by other plugins like versions-maven-plugin which check and warn
-          for using plugins with older than they require Maven version.
-          If version number changed in one place, be sure to change in the other.
-        -->
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-enforcer-plugin</artifactId>
-        <version>3.0.0-M3</version>
-        <executions>
-          <execution>
-            <id>enforce-maven</id>
-            <goals>
-              <goal>enforce</goal>
-            </goals>
-            <configuration>
-              <rules>
-                <requireMavenVersion>
-                  <version>3.5.4</version>
-                </requireMavenVersion>
-              </rules>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-       <groupId>org.eclipse.tycho.extras</groupId>
-       <artifactId>tycho-p2-extras-plugin</artifactId>
-       <version>${tycho.version}</version>
-       <executions>
-         <execution> <!-- Checks versions are properly bumped from one stream to the other -->
-           <id>compare-attached-artifacts-with-release</id>
-           <goals>
-             <goal>compare-version-with-baselines</goal>
-           </goals>
-           <configuration>
-             <skip>${compare-version-with-baselines.skip}</skip>
-             <baselines>
-               <baseline>${previous-release.baseline}</baseline>
-             </baselines>
-             <comparator>zip</comparator>
-           </configuration>
-         </execution>
-       </executions>
-     </plugin>
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.eclipse.tycho.extras</groupId>
-          <artifactId>tycho-eclipserun-plugin</artifactId>
-          <!-- this is actually present in any 0.14+ version -->
-          <version>${tycho.version}</version>
-          <configuration>
-            <executionEnvironment>JavaSE-1.8</executionEnvironment>
-            <repositories>
-              <repository>
-                <id>eclipse</id>
-                <layout>p2</layout>
-                <url>${eclipserun-repo}</url>
-              </repository>
-            </repositories>
-            <!--
-              This is to fix some lucene 3.x compatibility issues.
-              Required for 4.2 and earlier. Not for 4.3 and later.
-              <argLine>-Dhelp.lucene.tokenizer=standard</argLine>
-            -->
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-antrun-plugin</artifactId>
-          <version>3.0.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>target-platform-configuration</artifactId>
-          <version>${tycho.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-compiler-plugin</artifactId>
-          <version>${tycho.version}</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.eclipse.jdt</groupId>
-              <artifactId>ecj</artifactId>
-              <version>${cbi-ecj-version}</version>
-            </dependency>
-          </dependencies>
-          <configuration>
-            <compilerArgs>
-              <args>${code.ignoredWarnings}</args>
-              <args>-verbose</args>
-              <args>-inlineJSR</args>
-              <args>-enableJavadoc</args>
-              <args>-encoding</args>
-              <args>${project.build.sourceEncoding}</args>
-              <args>-proceedOnError</args>
-              <!-- Use this form, for Tycho 22 or less.
-                <args>-log</args>
-                <args>${project.build.directory}/@dot.xml</args>
-              -->
-            </compilerArgs>
-            <!-- Use this form for Tycho 23 or greater -->
-            <log>xml</log>
-            <logDirectory>${project.build.directory}/compilelogs</logDirectory>
-            <showWarnings>true</showWarnings>
-            <excludeResources>
-              <exclude>**/package.html</exclude>
-            </excludeResources>
-            <useProjectSettings>false</useProjectSettings>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-packaging-plugin</artifactId>
-          <version>${tycho.version}</version>
-          <dependencies>
-            <dependency>
-              <groupId>org.eclipse.tycho.extras</groupId>
-              <artifactId>tycho-buildtimestamp-jgit</artifactId>
-              <version>${tycho.version}</version>
-            </dependency>
-            <dependency>
-              <groupId>org.eclipse.tycho.extras</groupId>
-              <artifactId>tycho-sourceref-jgit</artifactId>
-              <version>${tycho.version}</version>
-            </dependency>
-          </dependencies>
-          <configuration>
-            <format>${qualifier.format}</format>
-            <timestampProvider>jgit</timestampProvider>
-            <jgit.ignore>
-              pom.xml
-              .polyglot.build.properties
-            </jgit.ignore>
-            <jgit.dirtyWorkingTree>${jgit.dirtyWorkingTree-platformDefault}</jgit.dirtyWorkingTree>
-            <sourceReferences>
-              <generate>true</generate>
-            </sourceReferences>
-            <archive>
-              <addMavenDescriptor>false</addMavenDescriptor>
-            </archive>
-            <additionalFileSets combine.children="append">
-              <fileSet>
-                <directory>${project.build.directory}</directory>
-                <includes>
-                  <include>.api_description</include>
-                </includes>
-              </fileSet>
-            </additionalFileSets>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-surefire-plugin</artifactId>
-          <version>${tycho.version}</version>
-          <configuration>
-            <enableAssertions>true</enableAssertions>
-            <argLine>${surefire.testArgLine} ${surefire.platformSystemProperties} ${surefire.systemProperties} ${surefire.moduleProperties}</argLine>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-source-plugin</artifactId>
-          <version>${tycho.version}</version>
-          <configuration>
-            <distinctSourceRoots>true</distinctSourceRoots>
-            <archive>
-              <addMavenDescriptor>false</addMavenDescriptor>
-            </archive>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-p2-director-plugin</artifactId>
-          <version>${tycho.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-p2-repository-plugin</artifactId>
-          <version>${tycho.version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho.extras</groupId>
-          <artifactId>tycho-source-feature-plugin</artifactId>
-          <version>${tycho.version}</version>
-          <configuration>
-            <archive>
-              <addMavenDescriptor>false</addMavenDescriptor>
-            </archive>
-            <reuseBrandingPlugin>false</reuseBrandingPlugin>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.eclipse.tycho</groupId>
-          <artifactId>tycho-p2-plugin</artifactId>
-          <version>${tycho.version}</version>
-          <configuration>
-            <baselineMode>warn</baselineMode>
-            <baselineReplace>all</baselineReplace>
-            <baselineRepositories>
-              <repository>
-                <url>${comparator.repo}</url>
-              </repository>
-            </baselineRepositories>
-            <ignoredPatterns>
-              <pattern>META-INF/ECLIPSE_.RSA</pattern>
-              <pattern>META-INF/ECLIPSE_.SF</pattern>
-            </ignoredPatterns>
-            <generateDownloadStatsProperty>true</generateDownloadStatsProperty>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>3.2.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-clean-plugin</artifactId>
-          <version>3.1.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>3.1.0</version>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>xml-maven-plugin</artifactId>
-          <version>1.0.2</version>
-        </plugin>
-        <plugin>
-          <groupId>org.codehaus.mojo</groupId>
-          <artifactId>sonar-maven-plugin</artifactId>
-          <version>3.3.0.603</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-  <profiles>
-   <profile>
-      <id>java14patch415</id>
-      <properties>
-        <qualifier.format>'v'yyyyMMdd-HHmm'_BETA_JAVA14'</qualifier.format>
- 
-        <featureToPatch>org.eclipse.jdt</featureToPatch>
-        <featureToPatchPDE>org.eclipse.pde</featureToPatchPDE>
-
-        <!--
-          For future versions, in addition to changing this value of "featureToPatchVersion",
-          the same value needs to be edited in
-          .../java14patch415/org.eclipse.jdt.java14patch/feature.xml
-          and
-          .../java14patch415/org.eclipse.jdt-feature-dummy/feature.xml
-          and it of course, must "match" what ever version was produced by the build specified
-          a few lines below, as the eclipse-p2-repo-java14patch415 p2 repository, as well as the lower
-          bound, in 'versionRangeForPatch'.
- 
-          Also, when new patch created, should update the wiki at
-          https://wiki.eclipse.org/Java14
-        -->
-        <!-- This needs the version of the feature to be patched. -->
-        <featureToPatchVersion>3.18.300.v20200226-1800</featureToPatchVersion>
-        <featureToPatchVersionPDE>3.14.300.v20200226-1800</featureToPatchVersionPDE>
-        <!-- Can specify an exact range here, or something of a loose range, depending on what's needed. -->
-        <versionRangeForPatch>[3.18.300.v20200226-1800,3.19.0.v20200610-0905)</versionRangeForPatch>
-        <versionRangeForPatchPDE>[3.14.300.v20200226-1800,3.14.400.v20200610-0905)</versionRangeForPatchPDE>
-        <!-- Comment this line when a patch is required on top of I-build -->
-        <comparator.repo>https://download.eclipse.org/eclipse/updates/4.15milestones/S-4.15RC1-202002261800/</comparator.repo>
-      </properties>
-      <repositories>
-       <repository>
-         <id>eclipse-p2-repo-java14patch415</id>
-         <url>https://download.eclipse.org/eclipse/updates/4.15milestones/S-4.15RC1-202002261800/</url>
-         <layout>p2</layout>
-       </repository>
-     </repositories>
-   </profile>
-   <profile>
-      <id>build-individual-bundles</id>
-      <activation>
-        <property>
-          <!-- Enable if aggregatorBuild property is not set -->
-          <name>!aggregatorBuild</name>
-        </property>
-      </activation>
-      <properties>
-        <!--
-          This eclipse-p2-repo.url is specifically for the build individual bundles profile and Gerrit jobs.
-          Default is set to I-builds for main development cycle.
-          For maintenance streams should always be "M-builds".
-          Ideally, this value would be provided by the environment, see bug 489789.
-        -->
-        <eclipse-p2-repo.url>https://download.eclipse.org/eclipse/updates/4.16-I-builds</eclipse-p2-repo.url>
-      </properties>
-      <repositories>
-        <repository>
-          <id>eclipse</id>
-          <url>${eclipse-p2-repo.url}</url>
-          <layout>p2</layout>
-        </repository>
-      </repositories>
-    </profile>
-    <profile>
-      <id>eclipse-sign</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.eclipse.tycho</groupId>
-            <artifactId>target-platform-configuration</artifactId>
-            <version>${tycho.version}</version>
-            <configuration>
-              <includePackedArtifacts>false</includePackedArtifacts>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.eclipse.tycho.extras</groupId>
-            <artifactId>tycho-pack200a-plugin</artifactId>
-            <version>${tycho.version}</version>
-            <executions>
-              <execution>
-                <id>pack200-normalize</id>
-                <goals>
-                  <goal>normalize</goal>
-                </goals>
-                <phase>verify</phase>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.eclipse.cbi.maven.plugins</groupId>
-            <artifactId>eclipse-jarsigner-plugin</artifactId>
-            <version>${cbi-plugins.version}</version>
-            <executions>
-              <execution>
-                <id>sign</id>
-                <goals>
-                  <goal>sign</goal>
-                </goals>
-                <phase>verify</phase>
-              </execution>
-            </executions>
-            <configuration>
-              <excludeInnerJars>${defaultSigning-excludeInnerJars}</excludeInnerJars>
-              <!--
-               The default timeout is 0 seconds which means "wait forever": https://www.eclipse.org/cbi/sitedocs/eclipse-jarsigner-plugin/sign-mojo.html#timeoutMillis
-               We don't want to wait until the build finally aborts, so, setting a timeout (see bug 507369).
-               Increasing timeout from 60000 to 120000 (see bug 544823).
-              -->
-              <timeoutMillis>120000</timeoutMillis>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.eclipse.tycho.extras</groupId>
-            <artifactId>tycho-pack200b-plugin</artifactId>
-            <version>${tycho.version}</version>
-            <executions>
-              <execution>
-                <id>pack200-pack</id>
-                <goals>
-                  <goal>pack</goal>
-                </goals>
-                <phase>verify</phase>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.eclipse.tycho</groupId>
-            <artifactId>tycho-p2-plugin</artifactId>
-            <version>${tycho.version}</version>
-            <executions>
-              <execution>
-                <id>p2-metadata</id>
-                <goals>
-                  <goal>p2-metadata</goal>
-                </goals>
-                <phase>verify</phase>
-              </execution>
-            </executions>
-            <configuration>
-              <defaultP2Metadata>false</defaultP2Metadata>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>eclipse-pack</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.eclipse.tycho</groupId>
-            <artifactId>target-platform-configuration</artifactId>
-            <version>${tycho.version}</version>
-            <configuration>
-              <includePackedArtifacts>false</includePackedArtifacts>
-            </configuration>
-          </plugin>
-          <plugin>
-            <groupId>org.eclipse.tycho.extras</groupId>
-            <artifactId>tycho-pack200a-plugin</artifactId>
-            <version>${tycho.version}</version>
-            <executions>
-              <execution>
-                <id>pack200-normalize</id>
-                <goals>
-                  <goal>normalize</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.eclipse.tycho.extras</groupId>
-            <artifactId>tycho-pack200b-plugin</artifactId>
-            <version>${tycho.version}</version>
-            <executions>
-              <execution>
-                <id>pack200-pack</id>
-                <goals>
-                  <goal>pack</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.eclipse.tycho</groupId>
-            <artifactId>tycho-p2-plugin</artifactId>
-            <version>${tycho.version}</version>
-            <executions>
-              <execution>
-                <id>p2-metadata</id>
-                <goals>
-                  <goal>p2-metadata</goal>
-                </goals>
-                <phase>package</phase>
-              </execution>
-            </executions>
-            <configuration>
-              <defaultP2Metadata>false</defaultP2Metadata>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>bree-libs</id>
-      <build>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.eclipse.tycho</groupId>
-              <artifactId>tycho-compiler-plugin</artifactId>
-              <version>${tycho.version}</version>
-              <configuration>
-                <!--
-                  this tells Tycho to use JRE libraries that match bundle runtime execution environment
-                  https://wiki.eclipse.org/Tycho/Release_Notes/0.14
-                  TODO provide CBI-specific wiki that explains how to setup BREE libraries and toolchain.xml
-                -->
-                <useJDK>BREE</useJDK>
-              </configuration>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-      </build>
-    </profile>
-    <profile>
-      <id>partial-build</id>
-      <activation>
-        <property>
-          <name>eclipse-sdk-repo.url</name>
-        </property>
-      </activation>
-      <repositories>
-        <repository>
-          <id>eclipse-sdk-repo</id>
-          <url>${eclipse-sdk-repo.url}</url>
-          <layout>p2</layout>
-        </repository>
-      </repositories>
-    </profile>
-    <profile>
-      <id>default-toolsjar</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-        <file>
-          <exists>${java.home}/../lib/tools.jar</exists>
-        </file>
-      </activation>
-      <properties>
-        <toolsjar>${java.home}/../lib/tools.jar</toolsjar>
-      </properties>
-    </profile>
-    <profile>
-      <id>missing-toolsjar</id>
-      <activation>
-        <activeByDefault>false</activeByDefault>
-        <file>
-          <exists>${java.home}/../Classes/classes.jar</exists>
-        </file>
-      </activation>
-      <properties>
-        <toolsjar>${java.home}/../Classes/classes.jar</toolsjar>
-      </properties>
-    </profile>
-    <profile>
-      <id>api-generation</id>
-      <activation>
-        <property>
-          <name>!longnotexistingproperty</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.eclipse.cbi.maven.plugins</groupId>
-            <artifactId>eclipse-cbi-plugin</artifactId>
-            <version>${cbi-plugins.version}</version>
-            <executions>
-              <execution>
-                <!--
-                    Default lifecycle phase: 'GENERATE_SOURCES'
-                    See https://maven.apache.org/ref/3.5.4/maven-core/lifecycles.html
-                -->
-                <goals>
-                  <goal>generate-api-build-xml</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.eclipse.tycho.extras</groupId>
-            <artifactId>tycho-eclipserun-plugin</artifactId>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>eclipse-run</goal>
-                </goals>
-                <phase>compile</phase>
-                <configuration>
-                  <!-- actual indexer call -->
-                  <appArgLine>-data target/apibuild-workspace -application org.eclipse.ant.core.antRunner -buildfile
-                    target/.apibuild.xml</appArgLine>
-                  <dependencies>
-                    <!-- list of bundles that we need -->
-                    <dependency>
-                      <artifactId>org.eclipse.ant.core</artifactId>
-                      <type>eclipse-plugin</type>
-                    </dependency>
-                    <dependency>
-                      <artifactId>org.apache.ant</artifactId>
-                      <type>eclipse-plugin</type>
-                    </dependency>
-                    <dependency>
-                      <artifactId>org.eclipse.pde.api.tools</artifactId>
-                      <type>eclipse-plugin</type>
-                    </dependency>
-                    <dependency>
-                      <artifactId>org.eclipse.pde.build</artifactId>
-                      <type>eclipse-plugin</type>
-                    </dependency>
-                    <dependency>
-                      <artifactId>org.eclipse.pde.core</artifactId>
-                      <type>eclipse-plugin</type>
-                    </dependency>
-                    <dependency>
-                      <artifactId>org.eclipse.equinox.launcher</artifactId>
-                      <type>eclipse-plugin</type>
-                    </dependency>
-                    <dependency>
-                      <artifactId>org.eclipse.osgi.compatibility.state</artifactId>
-                      <type>eclipse-plugin</type>
-                    </dependency>
-                    <dependency>
-                      <artifactId>javax.annotation</artifactId>
-                      <type>eclipse-plugin</type>
-                    </dependency>
-                  </dependencies>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-       <id>api-check</id>
-       <activation>
-         <activeByDefault>false</activeByDefault>
-       </activation>
-       <build>
-         <plugins>
-          <plugin>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>check-skip-api-analysis</id>
-                <phase>verify</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-                <configuration>
-                  <skip>${skipAPIAnalysis}</skip>
-                  <exportAntProperties>true</exportAntProperties>
-                  <target>
-                    <condition property="skipAPIAnalysis" value="true">
-                      <not>
-                        <available file="${basedir}/META-INF/MANIFEST.MF"/>
-                      </not>
-                    </condition>
-                    <echo file="${project.build.directory}/${project.artifactId}-apiBaseline.target">
-                      <![CDATA[
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?>
-<target name="${project.artifactId}-apiBaseline" sequenceNumber="1">
-	<locations>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
-			<repository location="${previous-release.baseline}"/>
-			<unit id="${project.artifactId}" version="0.0.0"/>
-		</location>
-	</locations>
-</target>
-                      ]]>
-                    </echo>
-                  </target>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.eclipse.tycho.extras</groupId>
-            <artifactId>tycho-dependency-tools-plugin</artifactId>
-            <version>${tycho.version}</version>
-            <executions>
-              <execution>
-                <id>list-dependencies</id>
-                <goals>
-                  <goal>list-dependencies</goal>
-                </goals>
-                <phase>verify</phase>
-                <configuration>
-                  <skip>${skipAPIAnalysis}</skip>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.eclipse.tycho.extras</groupId>
-            <artifactId>tycho-eclipserun-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>api-analysis</id>
-                <goals>
-                  <goal>eclipse-run</goal>
-                </goals>
-                <phase>verify</phase>
-                <configuration>
-                  <skip>${skipAPIAnalysis}</skip>
-                  <applicationsArgs>
-                    <!-- need to set workspace to a dir that's not a child of the project --> 
-                    <arg>-data</arg>
-                    <args>${project.basedir}/../target/${project.artifactId}-apiAnalyzer-workspace</args>
-                    <args>-application</args>
-                    <args>org.eclipse.pde.api.tools.apiAnalyzer</args>
-                    <args>-project</args>
-                    <args>${project.basedir}</args>
-                    <args>-baseline</args>
-                    <args>${project.build.directory}/${project.artifactId}-apiBaseline.target</args>
-                    <args>-dependencyList</args>
-                    <args>${project.build.directory}/dependencies-list.txt</args>
-                    <args>-failOnError</args>
-                  </applicationsArgs>
-                  <jvmArgs>
-                  	<jvmArg>-Xmx2048M</jvmArg>
-                  </jvmArgs>
-                  <repositories>
-                    <repository>
-                      <layout>p2</layout>
-                      <url>${comparator.repo}</url>
-                    </repository>
-                  </repositories>
-                  <dependencies>
-                    <dependency>
-                      <artifactId>org.eclipse.pde.api.tools</artifactId>
-                      <type>p2-installable-unit</type>
-                    </dependency>
-                    <dependency>
-                      <artifactId>javax.annotation</artifactId>
-                      <type>p2-installable-unit</type>
-                    </dependency>
-                    <dependency>
-                      <artifactId>org.eclipse.equinox.p2.transport.ecf</artifactId>
-                      <type>p2-installable-unit</type>
-                    </dependency>
-                    <dependency>
-                      <artifactId>org.eclipse.ecf.provider.filetransfer.ssl</artifactId>
-                      <type>p2-installable-unit</type>
-                    </dependency>
-                    <dependency>
-                      <artifactId>org.eclipse.equinox.p2.touchpoint.natives</artifactId>
-                      <type>p2-installable-unit</type>
-                    </dependency>
-                    <dependency>
-                      <artifactId>org.eclipse.osgi.compatibility.state</artifactId>
-                      <type>p2-installable-unit</type>
-                    </dependency>
-                  </dependencies>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-         </plugins>
-      </build>
-    </profile>
-
-    <profile>
-      <id>update-branding-plugins-about.mappings</id>
-      <activation>
-        <file>
-          <exists>${basedir}/about.mappings</exists>
-        </file>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-resources-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>process-about.mappings</id>
-                <phase>prepare-package</phase>
-                <configuration>
-                  <outputDirectory>${project.build.directory}</outputDirectory>
-                  <overwrite>true</overwrite>
-                  <resources>
-                    <resource>
-                      <directory>${basedir}</directory>
-                      <includes>
-                        <include>about.mappings</include>
-                      </includes>
-                      <filtering>true</filtering>
-                    </resource>
-                  </resources>
-                </configuration>
-                <goals>
-                  <goal>copy-resources</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.eclipse.tycho</groupId>
-            <artifactId>tycho-packaging-plugin</artifactId>
-            <version>${tycho.version}</version>
-            <configuration>
-              <additionalFileSets>
-                <fileSet>
-                  <directory>${project.build.directory}</directory>
-                  <includes>
-                    <include>about.mappings</include>
-                  </includes>
-                </fileSet>
-              </additionalFileSets>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
-      <id>coverage</id>
-      <properties>
-        <!-- Since we append output of various tests, write to a common folder besides tests -->
-        <!-- it's recommended to override that to an absolute value in specific Hudson configurations
-          and Sonar integration -->
-        <jacoco.destFile>${project.basedir}/../target/jacoco.exec</jacoco.destFile>
-        <sonar.jacoco.reportPath>${jacoco.destFile}</sonar.jacoco.reportPath>
-      </properties>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.jacoco</groupId>
-            <artifactId>jacoco-maven-plugin</artifactId>
-            <version>0.8.5</version>
-            <executions>
-              <execution>
-                <id>jacoco-agent</id>
-                <goals>
-                  <goal>prepare-agent</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <append>true</append>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
-    <profile>
-      <id>macos</id>
-      <activation>
-        <os>
-          <family>mac</family>
-        </os>
-      </activation>
-      <properties>
-        <surefire.platformSystemProperties>-XstartOnFirstThread</surefire.platformSystemProperties>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>jdk9-or-newer</id>
-      <activation>
-        <jdk>[9,)</jdk>
-      </activation>
-      <properties>
-        <surefire.moduleProperties>--add-modules=ALL-SYSTEM</surefire.moduleProperties>
-      </properties>
-    </profile>
-  </profiles>
-  <scm>
-    <connection>scm:git:https://git.eclipse.org/r/platform/eclipse.platform.releng.aggregator</connection>
-  </scm>
-</project>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml
deleted file mode 100644
index 15a2550..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/getBaseBuilderAndTools.xml
+++ /dev/null
@@ -1,311 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2019 IBM Corporation and others.
-
-  This program and the accompanying materials
-  are made available under the terms of the Eclipse Public License 2.0
-  which accompanies this distribution, and is available at
-  https://www.eclipse.org/legal/epl-2.0/
-
-  SPDX-License-Identifier: EPL-2.0
-
-  Contributors:
-  David Williams - initial API and implementation
--->
-
-<!--
-  A utility ant script which gets the Eclipse Platform binary from 'archive' server then uses it to
-  install additional tools and utilities from several p2 repositories: from 'downloads', the 'build' machine,
-  and one that is on an 'external' site, to actually test that proxies work. (The external one is a "real" project,
-  so this script should not be ran so often to "stress" that site, or throw off their download statistics.)
-
-  Hudson jobs (or builds) can call a script like this one from generic ant
-  as one of it first build steps to get the eclipse tools or applications, such as antRunner.
--->
-<project
-  name="getBaseBuilder"
-  default="getBaseBuilder"
-  basedir=".">
-
-  <target
-    name="init"
-    unless="getBaseBuilderInitialized">
-
-    <property environment="env" />
-
-    <!-- this property file is optional. It's primarily used to set
-      the "proxy setting preferences" for Eclpse. -->
-    <property file="platformSpecific.properties" />
-
-    <!-- jvm usually set in the platformSpecific.properties file, but if not, we
-      will force one possibly valid value. -->
-    <property
-      name="jvm"
-      value="/shared/common/java/openjdk/jdk-11_x64-latest/bin" />
-
-
-    <condition
-      property="TMP"
-      value="${env.TMP_DIR}">
-      <isset property="env.TMP_DIR" />
-    </condition>
-    <condition
-      property="TMP"
-      value="${TMP_DIR}">
-      <isset property="TMP_DIR" />
-    </condition>
-
-    <condition
-      property="TMP"
-      value="${env.BUILD_ROOT}/tmp">
-      <isset property="${env.BUILD_ROOT}" />
-    </condition>
-
-    <condition
-      property="TMP"
-      value="${BUILD_ROOT}/tmp">
-      <isset property="${BUILD_ROOT}" />
-    </condition>
-
-    <property
-      name="TMP"
-      value="${basedir}/tmp" />
-
-    <fail
-      unless="TMP"
-      message="TMP not defined, since TMP_DIR nor BUILD_ROOT was defined" />
-    <echo message="TMP: ${TMP}" />
-
-    <mkdir dir="${TMP}" />
-
-    <condition
-      property="basedownloadHost"
-      value="${env.BASE_DOWNLOAD_HOST}"
-      else="download.eclipse.org">
-      <isset property="env.BASE_DOWNLOAD_HOST" />
-    </condition>
-    <!--
-      TODO: need make platform independent, as in test.xml, to compute right one.
-      (and, pass in?)
-      (and make "version" variable)
-    -->
-    <!-- example of typical value, when "directory" and "label" are different
-      <property name="eclipseBaseDir" value="S-4.10M3-201710291100"/>
-      <property name="eclispeBaseLabel" value="4.10M3"/>
-    -->
-    <!-- for I or M build (which is the unusual case) the build directory and label are the same -->
-    <property
-      name="eclipseBaseDir"
-      value="R-4.15-202003050155" />
-    <property
-      name="eclispeBaseLabel"
-      value="4.15" />
-
-    <property
-      name="platformURL"
-      value="https://${basedownloadHost}/eclipse/downloads/drops4/${eclipseBaseDir}" />
-    <!--
-      We used to use binary platform, since smaller, but moved to SDK, to be able to use API Tools.
-      But then moved back to Platform, after having some cases where we need to pick up new fixes from
-      API tools while continuting to use older "base" for stability.
-    -->
-    <property
-      name="platformFile"
-      value="eclipse-platform-${eclispeBaseLabel}-linux-gtk-x86_64.tar.gz" />
-
-     <!-- the following setting is just to make sure we have a reasonable "fallback" value, such as when
-      using this script on Hudson to do "clean up" of repositories. Should change it to "well known" version,
-      such as updates/4.10/ once it is ready.
-    -->
-    <property
-      name="eclipserun-repo"
-      value="https://download.eclipse.org/eclipse/updates/4.16-I-builds/" />
-    <echo message="eclipserun-repo: ${eclipserun-repo}" />
-
-    <property
-      name="ide.repository"
-      value="${eclipserun-repo}" />
-    <property
-      name="ide.iu"
-      value="org.eclipse.platform.ide" />
-
-    <property
-      name="apiTools.repository"
-      value="${eclipserun-repo}" />
-    <property
-      name="apiTools.iu"
-      value="org.eclipse.pde.api.tools" />
-    <!-- since we specify specific repo for api tools, we can leave version to "highest" -->
-    <property
-      name="apiTools.iu.version"
-      value="" />
-
-    <property
-      name="buildTools.repository"
-      value="https://download.eclipse.org/eclipse/updates/buildtools/" />
-    <property
-      name="buildTools.feature"
-      value="org.eclipse.releng.build.tools.feature.feature.group" />
-    <!-- Here, even though not specific repo, we always want the "latest". But, if that ever changes,
-      we can specify a concrete version here.
-    -->
-    <property
-      name="buildTools.feature.version"
-      value="" />
-
-    <property
-      name="buildTools.derby.feature"
-      value="org.apache.derby.core.feature.feature.group" />
-    <property
-      name="buildTools.derby.feature.version"
-      value="" />
-
-    <property
-      name="webtools.repository"
-      value="https://download.eclipse.org/webtools/downloads/drops/R3.15.0/R-3.15.0-20190830034720/repositoryunittests/" />
-    <property
-      name="webtools.feature"
-      value="org.eclipse.wtp.releng.tools.feature.feature.group" />
-    <property
-      name="webtools.feature.version"
-      value="1.2.0.v201902122017" />
-
-    <!--
-      This repo ONLY used for testing proxies. Not production runs.
-      Have included this "external" site, just to give a true
-      test of the proxies themselves. I got this site from "marketplace"
-      and because this is a "real" project for someone, we should not
-      overuse the "test" aspect, or will throw off their numbers.
-      If it is ever desired to "run this test" ever day, or similar,
-      then a better "test site" should be found or created. -->
-    <property
-      name="external.repository"
-      value=" http://fabrizioiannetti.github.io/p2/" />
-    <property
-      name="external.feature"
-      value="com.github.fabeclipse.textedgrep_feature.feature.group" />
-    <property
-      name="external.feature.version"
-      value="" />
-
-    <!-- assign default WORKSPACE if not on Hudson, for local testing if nothing else -->
-    <property
-      name="WORKSPACE"
-      value="${basedir}" />
-    <echo message="WORKSPACE: ${WORKSPACE}" />
-
-    <!--
-      The desired folder name (made to stay consistent with cvs module name,
-      even though Git project is named eclipse.platform.releng.basebuilder.
-      And, *this* script does not even need to git the Git project!
-    -->
-    <property
-      name="folderName"
-      value="org.eclipse.releng.basebuilder" />
-
-    <property
-      name="java8vmbindir"
-      value="/shared/common/java/openjdk/jdk-11_x64-latest/bin/" />
-
-    <property
-      name="getBaseBuilderInitialized"
-      value="true" />
-  </target>
-
-
-  <target
-    name="getBaseBuilder"
-    depends="init">
-    <!-- remove old one, if there, and make sure one exists for eventual checkout/copy/globmapper -->
-    <delete dir="${WORKSPACE}/${folderName}" />
-    <mkdir dir="${WORKSPACE}/${folderName}" />
-    <antcall target="fetchBasePlatform" />
-  </target>
-
-  <target
-    name="fetchBasePlatform"
-    depends="init"
-    if="platformURL">
-    <get
-      dest="${TMP}/${platformFile}"
-      src="${platformURL}/${platformFile}"
-      usetimestamp="true" />
-    <!-- untar is broken in Ant 1.9.4. See https://bz.apache.org/bugzilla/show_bug.cgi?id=56641 -->
-    <untar
-      compression="gzip"
-      src="${TMP}/${platformFile}"
-      dest="${TMP}">
-    </untar>
-    <!-- untar is broken in Ant 1.9.4. See https://bz.apache.org/bugzilla/show_bug.cgi?id=56641
-      <exec
-      executable="/bin/tar"
-      dir="${TMP}">
-      <arg value="-xf" />
-      <arg value="${TMP}/${platformFile}" />
-      </exec>
-    -->
-    <chmod perm="ugo+x">
-      <fileset dir="${TMP}/eclipse">
-        <include name="eclipse" />
-        <include name="*.so*" />
-      </fileset>
-    </chmod>
-
-    <antcall target="installSettings" />
-
-    <exec
-      dir="${TMP}/eclipse"
-      failonerror="true"
-      executable="${TMP}/eclipse/eclipse">
-      <arg value="-nosplash" />
-      <arg value="-debug" />
-      <arg value="-consolelog" />
-      <arg value="-data" />
-      <arg value="${WORKSPACE}/workspace-toolsinstall" />
-      <arg value="-application" />
-      <arg value="org.eclipse.equinox.p2.director" />
-      <arg value="-repository" />
-      <arg value="${eclipserun-repo},${buildTools.repository},${webtools.repository}" />
-      <arg value="-installIU" />
-      <arg
-        value="${ide.iu},${apiTools.iu}/${apiTools.iu.version},${buildTools.feature}/${buildTools.feature.version},${webtools.feature}/${webtools.feature.version},${buildTools.derby.feature}/${buildTools.derby.feature.version}" />
-      <arg value="-destination" />
-      <arg value="${WORKSPACE}/${folderName}" />
-      <arg value="-profile" />
-      <arg value="SDKProfile" />
-      <arg value="-vm" />
-      <arg value="${java8vmbindir}" />
-      <!-- vmargs must come last -->
-      <arg value="-vmargs" />
-      <arg value="-Djava.io.tmpdir=${TMP}" />
-    </exec>
-
-    <!-- we generate basebuilder directly in the destination folder. no need of this
-     so the directory structure so it flat under basebuilder ...
-      for compatibility to very old code/scripts 
-    <move todir="${WORKSPACE}/${folderName}">
-      <fileset dir="${TMP}/eclipse/" />
-    </move>
-    -->
-  	
-  	<delete dir="${TMP}/eclipse" />
-
-    <echo
-      message="platform and tools installed. platformURL: ${platformURL} platform: ${platformFile}, fetched using tychoeclipsebuilder/getBaseBuilderAndTools.xml" />
-    <echo message="The following were the properties in effect:" />
-    <echoproperties />
-  </target>
-  <target
-    name="installSettings"
-    if="org.eclipse.core.net.prefs">
-    <property
-      name="settingsDir"
-      value="org.eclipse.releng.basebuilder/configuration/.settings" />
-
-    <mkdir dir="${settingsDir}" />
-    <echo
-      message="${org.eclipse.core.net.prefs}"
-      file="${settingsDir}/org.eclipse.core.net.prefs" />
-  </target>
-
-</project>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/eclipse.releng.repository.java14patch/antrunbuild.xml b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/eclipse.releng.repository.java14patch/antrunbuild.xml
deleted file mode 100644
index eb4be33..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/eclipse.releng.repository.java14patch/antrunbuild.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
-  default="default"
-  basedir=".">
-
-  <!-- 
-       This file is called by the pom's "antrun" plugin. These tasks were 
-       "pulled out" of using directly in the pom because it seems errors are 
-       not well captured, and only thing "left" on the build system is the 
-       last ant file created. (Makes me even wonder if you can call twice 
-       during same phase?)
-  -->
-
-  <target
-    name="preTransform"
-    depends="checkExistence">
-    <echoproperties />
-    <fail
-      unless="contentjarexists"
-      message="content.jar file did not exist as expected" />
-    <echo message="unzip content.jar, for xslt transform" />
-    <unzip
-      src="${project.build.directory}/repository/content.jar"
-      dest="${project.build.directory}/repository/" />
-    <echo message="backup, of originals, just to help debugging" />
-    <copy
-      file="${project.build.directory}/repository/content.jar"
-      tofile="${project.build.directory}/backup/contentORIG.jar"
-      preservelastmodified="true" />
-    <copy
-      file="${project.build.directory}/repository/content.xml"
-      tofile="${project.build.directory}/backup/contentORIG.xml"
-      preservelastmodified="true" />
-  </target>
-  <target name="checkExistence">
-    <condition property="contentjarexists">
-      <available file="${project.build.directory}/repository/content.jar" />
-    </condition>
-  </target>
-
-  <target name="postTransform">
-    <!-- In the pom file, are steps that do the transorm,
-        xxx and copy the transformed content.xml back to "here" -->
-    <delete
-      file="${project.build.directory}/repository/content.jar"
-      failonerror="true" />
-    <zip
-      destfile="${project.build.directory}/repository/content.jar"
-      basedir="${project.build.directory}/generated-resources/xml/xslt"
-      includes="content.xml"
-      filesonly="true" />
-    <!-- must delete, or will be kept in the final zipped up version. 
-         Would not really hurt much ... but, be confusing 
-    <delete file="${project.build.directory}/repository/content.xml" />
-    -->
-    <copy
-      file="${project.build.directory}/repository/content.jar"
-      tofile="${project.build.directory}/backup/contentORIG2.jar"
-      preservelastmodified="true" />
-  </target>
-
-  <target name="default">
-    <fail message="There is no default target for this antrunbuild.xml file." />
-  </target>
-</project>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/eclipse.releng.repository.java14patch/category.xml b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/eclipse.releng.repository.java14patch/category.xml
deleted file mode 100644
index 8d53a18..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/eclipse.releng.repository.java14patch/category.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature id="org.eclipse.jdt.java14patch" version="0.0.0" patch="true">
-      <category name="Eclipse Java 14 support for 2020-03 development stream"/>
-   </feature>
-   <feature id="org.eclipse.jdt.java14patch.source" version="0.0.0" patch="true">
-      <category name="Eclipse Java 14 support for 2020-03 development stream"/>
-   </feature>
-      <feature id="org.eclipse.pde.java14patch" version="0.0.0" patch="true">
-      <category name="Eclipse Java 14 support for 2020-03 development stream"/>
-   </feature>
-   <feature id="org.eclipse.pde.java14patch.source" version="0.0.0" patch="true">
-      <category name="Eclipse Java 14 support for 2020-03 development stream"/>
-   </feature>
-   <category-def name="Eclipse Java 14 support for 2020-03 development stream" label="Eclipse Java 14 support for 2020-03 development stream">
-      <description>
-         Eclipse Java 14 support for 2020-03 development stream.
-      </description>
-   </category-def>
-</site>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/eclipse.releng.repository.java14patch/patchMatchVersion.xsl b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/eclipse.releng.repository.java14patch/patchMatchVersion.xsl
deleted file mode 100644
index 112838c..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/eclipse.releng.repository.java14patch/patchMatchVersion.xsl
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet
-  version="1.0"
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-<!--  
-    This transform is to work around bug 350088.
-    https://bugs.eclipse.org/bugs/show_bug.cgi?id=350088
-    
-    The original idea of using and XSL transform for this work-around, 
-    came from a message list posting in 2009 by Paul Webster, 
-    https://www.eclipse.org/forums/index.php?t=msg&th=40931&start=0&
-    While was referenced in a 2009 blog post by Andrew Niefer, 
-    http://aniefer.blogspot.com/2009/06/patching-features-part-2.html. 
-    The details here are heavily modified, just wanted to acknowledge those
-    sources of inspiration. Paul also used XSLT to final form of metadata for 
-    our executable feature, in current builds. 
- -->
-
-  <xsl:param name="patchFeatureVersionRange">
-    $patchFeatureVersionRange
-  </xsl:param>
-  <xsl:param name="patchFeatureIU">
-    $patchFeatureIU
-  </xsl:param>
-  <!-- 
-  <xsl:variable name="patchFeatureVersionRange"><xsl:value-of select="$patchFeatureVersionRange" /></xsl:variable> 
-  <xsl:variable name="patchFeatureIU"><xsl:value-of select="$patchFeatureIU" /></xsl:variable>
-   -->
-  <xsl:variable name="quot">
-    "
-  </xsl:variable>
-  <xsl:variable name="apos">
-    '
-  </xsl:variable>
-
-  <xsl:template match="processing-instruction('metadataRepository')">
-  <xsl:text>&#xa;</xsl:text>
-  <xsl:copy />
-  <xsl:text>&#xa;</xsl:text>
-    <xsl:comment>
-      This content.xml file was transformed to include "specific range match" 
-      for the feature intended to be patched. 
-      Feature (IU) to be patched: 
-         <xsl:value-of select="$patchFeatureIU" />
-      Version Range:
-         <xsl:value-of select="$patchFeatureVersionRange" />   
-
-      XSLT Version = <xsl:copy-of select="system-property('xsl:version')" />
-      XSLT Vendor = <xsl:copy-of select="system-property('xsl:vendor')" />
-      XSLT Vendor URL = <xsl:copy-of select="system-property('xsl:vendor-url')" />
-    <xsl:text>&#xa;</xsl:text>
-    </xsl:comment>
-    <xsl:text>&#xa;</xsl:text>
-    <xsl:apply-templates />
-  </xsl:template>
-
-
-	<!-- standard copy template -->
-  <xsl:template match="@*|node()">
-
-    <xsl:copy>
-      <xsl:apply-templates select="@*" />
-      <xsl:apply-templates />
-    </xsl:copy>
-  </xsl:template>
-
-<!--  For this awkward use of concat, see http://www.oxygenxml.com/archives/xsl-list/200811/msg00544.html 
-  <xsl:template match="concat ($apos, @range [@name=, $apos, $patchFeatureIU, $apos,],$apos )">
-  -->
-  <xsl:template match="@range[../@name='org.eclipse.jdt.feature.group']">
-    <xsl:attribute name="range"><xsl:value-of select="$patchFeatureVersionRange" /></xsl:attribute>
-  </xsl:template>
-
-</xsl:stylesheet>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/eclipse.releng.repository.java14patch/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/eclipse.releng.repository.java14patch/pom.xml
deleted file mode 100644
index 584260f..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/eclipse.releng.repository.java14patch/pom.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2020 Eclipse Foundation and others.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  https://www.eclipse.org/org/documents/edl-v10.php
- 
-  Contributors:
-     IBM Corporation and others - initial implementation
--->
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng.java14patch415</artifactId>
-    <version>4.16.0-SNAPSHOT</version>
-    <relativePath>../</relativePath>
-  </parent>
-
-  <groupId>eclipse.platform.releng</groupId>
-  <artifactId>eclipse.releng.repository.java14patch</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
-  <packaging>eclipse-repository</packaging>
-
-  <!-- 
-     Notice that all the tasks in this pom are normally done during the packaging phase, 
-     but the last few we deliberately do later, during the pre-integration-test phase, 
-     in order that things be done in the right order, and changes maintained. 
-     See https://maven.apache.org/ref/3.5.4/maven-core/lifecycles.html
-     for complete list of phases. 
-   -->
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>target-platform-configuration</artifactId>
-        <configuration>
-          <dependency-resolution>
-            <extraRequirements>
-             <!-- this guarantees proper inclusion in reactor-->
-              <requirement>
-                <type>eclipse-feature</type>
-                <id>${featureToPatch}</id>
-                <versionRange>${featureToPatchVersion}</versionRange>
-              </requirement>
-              <requirement>
-                <type>eclipse-feature</type>
-                <id>${featureToPatchPDE}</id>
-                <versionRange>${featureToPatchVersionPDE}</versionRange>
-              </requirement>
-            </extraRequirements>
-          </dependency-resolution>
-        </configuration>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unpack-content-jar</id>
-            <phase>package</phase>
-            <configuration>
-              <target>
-                <ant antfile="${basedir}/antrunbuild.xml">
-                  <target name="preTransform" />
-                </ant>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>jar-content-xml</id>
-            <phase>pre-integration-test</phase>
-            <configuration>
-              <target>
-                <ant antfile="${basedir}/antrunbuild.xml">
-                  <target name="postTransform" />
-                </ant>
-              </target>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>xml-maven-plugin</artifactId>
-                <!-- 
-             The output of "transform, *always* goes to 
-             ${project.build.directory}/generated-resources/xml/xslt 
-             as far as I can tell.
-        -->
-        <configuration>
-          <forceCreation>true</forceCreation>
-          <transformationSets>
-            <transformationSet>
-              <dir>${project.build.directory}/repository/</dir>
-              <includes>
-                <include>content.xml</include>
-              </includes>
-              <stylesheet>${basedir}/patchMatchVersion.xsl</stylesheet>
-              <parameters>
-                <parameter>
-                  <name>patchFeatureVersionRange</name>
-                  <value>${versionRangeForPatch}</value>
-                </parameter>
-                <parameter>
-                  <name>patchFeatureIU</name>
-                  <value>${featureToPatch}.feature.group</value>
-                </parameter>
-              </parameters>
-            </transformationSet>
-          </transformationSets>
-        </configuration>
-        <executions>
-          <execution>
-            <id>transformForExactVersionRange</id>
-            <phase>package</phase>
-            <goals>
-              <goal>transform</goal>
-            </goals>
-          </execution>
-        </executions>
-
-      </plugin>
-      <!-- 
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copyModifiedContentXMLFile</id>
-            <phase>package</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${project.build.directory}/repository</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${project.build.directory}/generated-resources/xml/xslt</directory>
-                  <includes>
-                    <include>content.xml</include>
-                  </includes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      -->
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-p2-publisher-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <executions>
-          <execution>
-            <id>categories-java14patch</id>
-            <phase>package</phase>
-            <goals>
-              <goal>publish-categories</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-p2-repository-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <configuration>
-          <includeAllDependencies>false</includeAllDependencies>
-        </configuration>
-        <executions>
-          <execution>
-            <id>assemble-java14patch</id>
-            <phase>package</phase>
-            <configuration>
-              <repositoryName>Early Access of Java 14 support</repositoryName>
-              <finalName>Java14EarlyAccessPatchRepo</finalName>
-            </configuration>
-            <goals>
-              <goal>assemble-repository</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>archive-java14patch</id>
-            <phase>pre-integration-test</phase>
-            <configuration>
-              <repositoryName>Early Access of Java 14 support</repositoryName>
-              <finalName>Java14EarlyAccessPatchRepo</finalName>
-            </configuration>
-            <goals>
-              <goal>archive-repository</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-    </plugins>
-  </build>
-
-</project>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/eclipse.releng.repository.java14patch/testExactVersion.xml b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/eclipse.releng.repository.java14patch/testExactVersion.xml
deleted file mode 100644
index 7085b1f..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/eclipse.releng.repository.java14patch/testExactVersion.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project
-  default="main"
-  basedir=".">
-
-  <!-- 
-       This file is entirely to test the transform in the workspace. It is 
-       not part of the build. It transforms "example.content.xml" and 
-       produces "example.content.new.xml". 
-  -->
-  
-  <target name="main">
-    <property
-      name="patchFeatureVersionRange"
-      value="[3.18.300.v20200226-1800,3.19.0.v20200610-0905]" />
-    <property
-      name="patchFeatureIU"
-      value="org.eclipse.jdt.feature.group" />
-
-    <echo message="patchFeatureVersionRange: ${patchFeatureVersionRange}" />
-    <echo message="patchFeatureIU: ${patchFeatureIU}" />
-    <echo message="calling the XSLT ant task" />
-    <xslt
-      in="example.content.xml"
-      out="example.content.new.xml"
-      style="patchMatchVersion.xsl"
-      force="true">
-      <outputproperty
-        name="method"
-        value="xml" />
-      <outputproperty
-        name="encoding"
-        value="UTF-8" />
-      <outputproperty
-        name="indent"
-        value="yes" />
-      <param
-        name="patchFeatureIU"
-        expression="${patchFeatureIU}" />
-      <param
-        name="patchFeatureVersionRange"
-        expression="${patchFeatureVersionRange}" />
-    </xslt>
-  </target>
-
-</project>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt-feature-dummy/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt-feature-dummy/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt-feature-dummy/build.properties
deleted file mode 100644
index 157e859..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt-feature-dummy/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2020 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes=\
-feature.xml,\
-feature.properties
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt-feature-dummy/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt-feature-dummy/feature.properties
deleted file mode 100644
index 4b9e264..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt-feature-dummy/feature.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# Copyright (c) 2020 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Eclipse Java Development Tools - Dummy, for build only. 
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "description" property - description of the feature
-description=Dummy feature for build-time constraint.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2020 IBM Corporation and others.\n\
-\n\
-This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License 2.0\n\
-which accompanies this distribution, and is available at\n\
-https://www.eclipse.org/legal/epl-2.0/\n\
-\n\
-SPDX-License-Identifier: EPL-2.0\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt-feature-dummy/feature.xml b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt-feature-dummy/feature.xml
deleted file mode 100644
index 854943b..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt-feature-dummy/feature.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jdt"
-      label="%featureName"
-      version="3.18.300.v20200226-1800"
-      provider-name="%providerName"
-      license-feature="org.eclipse.license"
-      license-feature-version="0.0.0">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <plugin
-         id="org.eclipse.jdt.dummy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt
deleted file mode 100644
index 9d4f218..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt-feature-dummy/forceQualifierUpdate.txt
+++ /dev/null
@@ -1 +0,0 @@
-# To force a version qualifier update add the bug here
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt-feature-dummy/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt-feature-dummy/pom.xml
deleted file mode 100644
index a9e36eb..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt-feature-dummy/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2020 Eclipse Foundation and others.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  https://www.eclipse.org/org/documents/edl-v10.php
- 
-  Contributors:
-     IBM Corporation - initial API and implementation
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng.java14patch415</artifactId>
-    <version>4.16.0-SNAPSHOT</version>
-  </parent>
-  <groupId>org.eclipse.jdt.feature</groupId>
-  <artifactId>org.eclipse.jdt</artifactId>
-  <version>3.18.300.v20200226-1800</version>
-  <packaging>eclipse-feature</packaging>
-
-</project>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.dummy/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF
deleted file mode 100644
index f8d881a..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.dummy/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Dummy
-Bundle-SymbolicName: org.eclipse.jdt.dummy
-Bundle-Version: 1.0.1.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.dummy/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.dummy/build.properties
deleted file mode 100644
index 34d2e4d..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.dummy/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.dummy/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.dummy/pom.xml
deleted file mode 100644
index eca81a7..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.dummy/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2020 Eclipse Foundation and others.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  https://www.eclipse.org/org/documents/edl-v10.php
- 
-  Contributors:
-     IBM Corporation - initial API and implementation
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng.java14patch415</artifactId>
-    <version>4.16.0-SNAPSHOT</version>
-  </parent>
-  <groupId>org.eclipse.jdt</groupId>
-  <artifactId>org.eclipse.jdt.dummy</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-packaging-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <!--  I do not think this version (format) matters, to the patch.  -->
-        <configuration>
-          <format>'v20160301-1504'</format>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.java14patch/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.java14patch/build.properties
deleted file mode 100644
index 34345aa..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.java14patch/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2020 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     IBM Corporation and others - initial API and implementation
-###############################################################################
-bin.includes = feature.xml,\
-               feature.properties
-
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.java14patch/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.java14patch/feature.properties
deleted file mode 100644
index e7bdc4c..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.java14patch/feature.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# Copyright (c) 2020 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-# 
-# Contributors:
-#     IBM Corporation and others - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Eclipse JDT (Java Development Tools) Patch with Java 14 support for 2020-03 development stream
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "description" property - description of the feature
-description=Eclipse Java 14 support for 2020-03 development stream.\n
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2020 IBM Corporation and others.\n\
-\n\
-This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License 2.0\n\
-which accompanies this distribution, and is available at\n\
-https://www.eclipse.org/legal/epl-2.0/\n\
-\n\
-SPDX-License-Identifier: EPL-2.0\n\
-\n\
-Contributors:\n\
-    IBM Corporation and others - initial API and implementation\n
-################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.java14patch/feature.xml b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.java14patch/feature.xml
deleted file mode 100644
index 9eb9300..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.java14patch/feature.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jdt.java14patch"
-      label="%featureName"
-      version="1.1.1.qualifier"
-      provider-name="%providerName"
-      license-feature="org.eclipse.license"
-      license-feature-version="0.0.0">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.jdt" version="3.18.300.v20200226-1800" patch="true"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.jdt.compiler.tool"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.launching"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.core.manipulation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.junit.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.jdt.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.java14patch/forceQualifierUpdate.txt b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.java14patch/forceQualifierUpdate.txt
deleted file mode 100644
index e69de29..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.java14patch/forceQualifierUpdate.txt
+++ /dev/null
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.java14patch/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.java14patch/pom.xml
deleted file mode 100644
index 42d33a9..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.java14patch/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2020 Eclipse Foundation and others.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  https://www.eclipse.org/org/documents/edl-v10.php
- 
-  Contributors:
-     IBM Corporation and others - initial implementation
--->
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng.java14patch415</artifactId>
-    <version>4.16.0-SNAPSHOT</version>
-  </parent>
-  <groupId>org.eclipse.jdt.feature</groupId>
-  <artifactId>org.eclipse.jdt.java14patch</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
-  <packaging>eclipse-feature</packaging>
-
-
-  <build>
-
-    <plugins>
-
-
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-source-feature-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <id>source-feature</id>
-            <goals>
-              <goal>source-feature</goal>
-            </goals>
-            <!-- 
-            <configuration>
-              <plugins>
-                <plugin id="org.eclipse.jdt.doc.isv" versionRange="0.0.0"/>
-              </plugins>
-              <excludes>
-                <plugin id="org.eclipse.jdt"/>
-                <plugin id="org.eclipse.jdt.doc.user"/>
-              </excludes>
-            </configuration>
-             -->
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-p2-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <executions>
-          <execution>
-            <id>attached-p2-metadata</id>
-            <phase>package</phase>
-            <goals>
-              <goal>p2-metadata</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.java14patch/sourceTemplateFeature/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.java14patch/sourceTemplateFeature/feature.properties
deleted file mode 100644
index 1f8ef9c..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.java14patch/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# Copyright (c) 2020 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-# 
-# Contributors:
-#     IBM Corporation and others - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Eclipse JDT (Java Development Tools) Source Patch with Java 14 support for 2020-03 development stream
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "description" property - description of the feature
-description=Eclipse Java 14 support for 2020-03 development stream.\n
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2020 IBM Corporation and others.\n\
-\n\
-This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License 2.0\n\
-which accompanies this distribution, and is available at\n\
-https://www.eclipse.org/legal/epl-2.0/\n\
-\n\
-SPDX-License-Identifier: EPL-2.0\n\
-\n\
-Contributors:\n\
-    IBM Corporation and others - initial API and implementation\n
-################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.java14patch/sourceTemplateFeature/p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.java14patch/sourceTemplateFeature/p2.inf
deleted file mode 100644
index d419171..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.jdt.java14patch/sourceTemplateFeature/p2.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-properties.0.name = org.eclipse.equinox.p2.type.patch
-properties.0.value = true
\ No newline at end of file
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde-feature-dummy/.settings/org.eclipse.core.resources.prefs b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde-feature-dummy/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c0..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde-feature-dummy/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde-feature-dummy/.settings/org.eclipse.core.runtime.prefs b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde-feature-dummy/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index 5a0ad22..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde-feature-dummy/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde-feature-dummy/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde-feature-dummy/build.properties
deleted file mode 100644
index 157e859..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde-feature-dummy/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2020 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-bin.includes=\
-feature.xml,\
-feature.properties
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde-feature-dummy/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde-feature-dummy/feature.properties
deleted file mode 100644
index 4b9e264..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde-feature-dummy/feature.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# Copyright (c) 2020 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-# 
-# Contributors:
-#     IBM Corporation - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Eclipse Java Development Tools - Dummy, for build only. 
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "description" property - description of the feature
-description=Dummy feature for build-time constraint.
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2020 IBM Corporation and others.\n\
-\n\
-This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License 2.0\n\
-which accompanies this distribution, and is available at\n\
-https://www.eclipse.org/legal/epl-2.0/\n\
-\n\
-SPDX-License-Identifier: EPL-2.0\n\
-\n\
-Contributors:\n\
-    IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde-feature-dummy/feature.xml b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde-feature-dummy/feature.xml
deleted file mode 100644
index 17dcb09..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde-feature-dummy/feature.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.pde"
-      label="%featureName"
-      version="3.14.300.v20200226-1800"
-      provider-name="%providerName"
-      license-feature="org.eclipse.license"
-      license-feature-version="0.0.0">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <plugin
-         id="org.eclipse.pde.dummy"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde-feature-dummy/forceQualifierUpdate.txt b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde-feature-dummy/forceQualifierUpdate.txt
deleted file mode 100644
index 9d4f218..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde-feature-dummy/forceQualifierUpdate.txt
+++ /dev/null
@@ -1 +0,0 @@
-# To force a version qualifier update add the bug here
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde-feature-dummy/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde-feature-dummy/pom.xml
deleted file mode 100644
index e0ae113..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde-feature-dummy/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2020 Eclipse Foundation and others.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  https://www.eclipse.org/org/documents/edl-v10.php
- 
-  Contributors:
-     IBM Corporation - initial API and implementation
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng.java14patch415</artifactId>
-    <version>4.16.0-SNAPSHOT</version>
-  </parent>
-  <groupId>org.eclipse.pde.feature</groupId>
-  <artifactId>org.eclipse.pde</artifactId>
-  <version>3.14.300.v20200226-1800</version>
-  <packaging>eclipse-feature</packaging>
-
-</project>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.dummy/.settings/org.eclipse.jdt.core.prefs b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.dummy/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 0c68a61..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.dummy/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.dummy/META-INF/MANIFEST.MF b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.dummy/META-INF/MANIFEST.MF
deleted file mode 100644
index 68e125d..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.dummy/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,6 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Dummy
-Bundle-SymbolicName: org.eclipse.pde.dummy
-Bundle-Version: 1.0.1.qualifier
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.dummy/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.dummy/build.properties
deleted file mode 100644
index 34d2e4d..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.dummy/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.dummy/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.dummy/pom.xml
deleted file mode 100644
index b9e2717..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.dummy/pom.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2020 Eclipse Foundation and others.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  https://www.eclipse.org/org/documents/edl-v10.php
- 
-  Contributors:
-     IBM Corporation - initial API and implementation
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng.java14patch415</artifactId>
-    <version>4.16.0-SNAPSHOT</version>
-  </parent>
-  <groupId>org.eclipse.pde</groupId>
-  <artifactId>org.eclipse.pde.dummy</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
-  <packaging>eclipse-plugin</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-packaging-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <!--  I do not think this version (format) matters, to the patch.  -->
-        <configuration>
-          <format>'v20160301-1504'</format>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.java14patch/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.java14patch/build.properties
deleted file mode 100644
index 34345aa..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.java14patch/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2020 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     IBM Corporation and others - initial API and implementation
-###############################################################################
-bin.includes = feature.xml,\
-               feature.properties
-
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.java14patch/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.java14patch/feature.properties
deleted file mode 100644
index 30945df..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.java14patch/feature.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# Copyright (c) 2020 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-# 
-# Contributors:
-#     IBM Corporation and others - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Eclipse PDE Patch with Java 14 support for 2020-03 development stream
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "description" property - description of the feature
-description=Eclipse Java 14 support for 2020-03 development stream.\n
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2020 IBM Corporation and others.\n\
-\n\
-This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License 2.0\n\
-which accompanies this distribution, and is available at\n\
-https://www.eclipse.org/legal/epl-2.0/\n\
-\n\
-SPDX-License-Identifier: EPL-2.0\n\
-\n\
-Contributors:\n\
-    IBM Corporation and others - initial API and implementation\n
-################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.java14patch/feature.xml b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.java14patch/feature.xml
deleted file mode 100644
index fba0b4a..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.java14patch/feature.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.pde.java14patch"
-      label="%featureName"
-      version="1.1.1.qualifier"
-      provider-name="%providerName"
-      license-feature="org.eclipse.license"
-      license-feature-version="0.0.0">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <requires>
-      <import feature="org.eclipse.pde" version="3.14.300.v20200226-1800" patch="true"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.pde.api.tools"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.pde.build"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.java14patch/forceQualifierUpdate.txt b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.java14patch/forceQualifierUpdate.txt
deleted file mode 100644
index e69de29..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.java14patch/forceQualifierUpdate.txt
+++ /dev/null
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.java14patch/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.java14patch/pom.xml
deleted file mode 100644
index a144f20..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.java14patch/pom.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2020 Eclipse Foundation and others.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  https://www.eclipse.org/org/documents/edl-v10.php
- 
-  Contributors:
-     IBM Corporation and others - initial implementation
--->
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>eclipse.platform.releng</groupId>
-    <artifactId>eclipse.platform.releng.java14patch415</artifactId>
-    <version>4.16.0-SNAPSHOT</version>
-  </parent>
-  <groupId>org.eclipse.pde.feature</groupId>
-  <artifactId>org.eclipse.pde.java14patch</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
-  <packaging>eclipse-feature</packaging>
-
-
-  <build>
-
-    <plugins>
-
-
-      <plugin>
-        <groupId>org.eclipse.tycho.extras</groupId>
-        <artifactId>tycho-source-feature-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <id>source-feature</id>
-            <goals>
-              <goal>source-feature</goal>
-            </goals>
-            <configuration>
-              <excludes>
-                  <plugin id="org.eclipse.pde"/>
-                  <plugin id="org.eclipse.pde.doc.user"/>
-              </excludes>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-p2-plugin</artifactId>
-        <version>${tycho.version}</version>
-        <executions>
-          <execution>
-            <id>attached-p2-metadata</id>
-            <phase>package</phase>
-            <goals>
-              <goal>p2-metadata</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.java14patch/sourceTemplateFeature/feature.properties b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.java14patch/sourceTemplateFeature/feature.properties
deleted file mode 100644
index f22eb75..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.java14patch/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-###############################################################################
-# Copyright (c) 2020 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-# 
-# Contributors:
-#     IBM Corporation and others - initial API and implementation
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Eclipse PDE Source Patch with Java 14 support for 2020-03 development stream
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "description" property - description of the feature
-description=Eclipse Java 14 support for 2020-03 development stream.\n
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2000, 2020 IBM Corporation and others.\n\
-\n\
-This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License 2.0\n\
-which accompanies this distribution, and is available at\n\
-https://www.eclipse.org/legal/epl-2.0/\n\
-\n\
-SPDX-License-Identifier: EPL-2.0\n\
-\n\
-Contributors:\n\
-    IBM Corporation and others - initial API and implementation\n
-################ end of copyright property ####################################
\ No newline at end of file
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.java14patch/sourceTemplateFeature/p2.inf b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.java14patch/sourceTemplateFeature/p2.inf
deleted file mode 100644
index d419171..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/org.eclipse.pde.java14patch/sourceTemplateFeature/p2.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-properties.0.name = org.eclipse.equinox.p2.type.patch
-properties.0.value = true
\ No newline at end of file
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/pom.xml b/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/pom.xml
deleted file mode 100644
index d8c8019..0000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/java14patch415/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright (c) 2020 Eclipse Foundation and others.
-  All rights reserved. This program and the accompanying materials
-  are made available under the terms of the Eclipse Distribution License v1.0
-  which accompanies this distribution, and is available at
-  https://www.eclipse.org/org/documents/edl-v10.php
-
-  Contributors:
-  IBM Corporation and others - initial implementation
--->
-<project
-  xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.eclipse</groupId>
-    <artifactId>eclipse-platform-parent</artifactId>
-    <version>4.16.0-SNAPSHOT</version>
-    <relativePath>../../eclipse-platform-parent</relativePath>
-  </parent>
-
-  <groupId>eclipse.platform.releng</groupId>
-  <artifactId>eclipse.platform.releng.java14patch415</artifactId>
-  <version>4.16.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <properties>
-    <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator</tycho.scmUrl>
-  </properties>
-
-  <modules>
-    <module>../../eclipse-platform-parent</module>
-    <module>../../eclipse.platform.releng.prereqs.sdk</module>
-    <module>org.eclipse.jdt.dummy</module>
-    <module>org.eclipse.jdt-feature-dummy</module>
-    <module>org.eclipse.pde.dummy</module>
-    <module>org.eclipse.pde-feature-dummy</module>
-    <module>../../eclipse.jdt.core/org.eclipse.jdt.compiler.tool</module>
-    <module>../../eclipse.jdt.core/org.eclipse.jdt.core</module>
-    <module>../../eclipse.jdt.debug/org.eclipse.jdt.launching</module>
-    <module>../../eclipse.jdt.ui/org.eclipse.jdt.core.manipulation</module>
-    <module>../../eclipse.jdt.ui/org.eclipse.jdt.junit.core</module>
-    <module>../../eclipse.jdt.ui/org.eclipse.jdt.ui</module>
-    <module>../../eclipse.pde.ui/apitools/org.eclipse.pde.api.tools</module>
-    <module>../../eclipse.pde.build/org.eclipse.pde.build</module>
-    <module>org.eclipse.jdt.java14patch</module>
-    <module>org.eclipse.pde.java14patch</module>
-    <module>eclipse.releng.repository.java14patch</module>
-  </modules>
-</project>
diff --git a/production/.project b/production/.project
deleted file mode 100644
index 039af2c..0000000
--- a/production/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>aggregator-production</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/production/bashUtilities.shsource b/production/bashUtilities.shsource
deleted file mode 100644
index 3a3114e..0000000
--- a/production/bashUtilities.shsource
+++ /dev/null
@@ -1,242 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-
-# General purpose utilities that are only related to bash (not
-# the build, per se.
-
-# A general purpose utility to check number of arguments match
-# what was expected. Its purpose is to help bullet-proof these scripts
-# when future changes made.
-# Example: (such as in first line of a function)
-#   checkNArgs $# 3
-# NOTE: can not be called, until buildDirectory has been defined.
-checkNArgs ()
-{
-  actual=$1
-  expected=$2
-  if [[ -z "$actual" || -z "$expected" ]]
-  then
-    BUILD_FAILED="${buildDirectory}/buildFailed-program-error"
-    printf "\n\tPROGRAM ERROR: number of arguments, $actual, or number expected, $expected, was not provided as arguments.\n\n" >${BUILD_FAILED}
-    printf "             Called from ${FUNCNAME[1]}, called from line number ${BASH_LINENO[1]} in ${BASH_SOURCE[2]}.\n\n" >>${BUILD_FAILED}
-    return 9
-  fi
-  # possible is used when there are optional arguments, corresponds to "max possible", then "expected" means "min possible"
-  possible=$3
-  #echo "     DEBUG checkNArgs funcName[1]: ${FUNCNAME[1]}" >> ${TRACE_OUTPUT}
-  #echo "     DEBUG checkNArgs bashSource[2]:   ${BASH_SOURCE[2]}" >> ${TRACE_OUTPUT}
-  #echo "     DEBUG checkNArgs bashLineNo[1]:   ${BASH_LINENO[1]}" >> ${TRACE_OUTPUT}
-  if [[ -n "${possible}" ]]
-  then
-    # if 3 total arguments, make sure first is between 2 and 3rd args (inclusive)
-    #echo DEBUG: actual:   $actual
-    #echo DEBUG: min expected: $expected
-    #echo DEBUG: max possible: $possible
-    #arg1=$(( $expected <= $actual ))
-    #arg2=$(( $actual <= $possible ))
-    #echo "DEBUG: expected <= actual $arg1"
-    #echo "DEBUG: actual <= possible $arg2"
-    if  (( $expected <= $actual )) && (( $actual <= $possible ))
-    then
-      #echo DEBUG: return 0
-      return 0
-    else
-      BUILD_FAILED="${buildDirectory}/buildFailed-program-error"
-      printf "\n\tPROGRAM ERROR: number of arguments, $actual, was not betwen expected, $expected, and possible, $possible.\n" >${BUILD_FAILED}
-      printf "             Called from ${FUNCNAME[1]}, called from line number ${BASH_LINENO[1]} in ${BASH_SOURCE[2]}.\n\n" >>${BUILD_FAILED}
-      #echo DEBUG: return 1
-      return 1
-    fi
-  elif [[ $actual != $expected ]]
-  then
-    # depends on buildDirectory being exported
-    BUILD_FAILED="${buildDirectory}/buildFailed-program-error"
-    printf "\n\tPROGRAM ERROR: expected $expected arguments but was passed $actual.\n" >${BUILD_FAILED}
-    printf "             Called from ${FUNCNAME[1]}, called from line number ${BASH_LINENO[1]} in ${BASH_SOURCE[2]}.\n\n" >>${BUILD_FAILED}
-    return 1
-  else
-    return 0
-  fi
-}
-
-# general purpose utility for "hard exit" if return code not zero.
-# especially useful to call/check after basic things that should normally
-# easily succeeed.
-# usage:
-#   checkForErrorExit $? "Failed to copy file (for example)"
-checkForErrorExit ()
-{
-  # arg 1 must be return code, $?
-  # arg 2 (remaining line) can be message to print before exiting do to non-zero exit code
-  exitCode=$1
-  shift
-  message="$*"
-  if [[ -z "${exitCode}" ]]
-  then
-    echo "PROGRAM ERROR: checkForErrorExit called with no arguments"
-    exit 1
-  fi
-
-  if [[ -z "${message}" ]]
-  then
-    echo "WARNING: checkForErrorExit called without message"
-    message="(Calling program provided no message)"
-  fi
-
-  # first make sure exit code is well formed
-  if [[ "${exitCode}" =~ [0] ]]
-  then
-    #echo "exitcode was zero"
-    exitrc=0
-  else
-    if [[ "${exitCode}" =~ ^-?[0-9]+$ ]]
-    then
-      #echo "exitcode was indeed a legal, non-zero numeric return code"
-      exitrc=$exitCode
-    else
-      #echo "exitode was not numeric, so will force to 1"
-      exitrc=1
-    fi
-  fi
-
-  if [[ $exitrc != 0 ]]
-  then
-    echo
-    echo "   ERROR. exit code: ${exitrc}"
-    echo "   ERROR. message: ${message}"
-    echo
-    exit $exitrc
-  fi
-}
-
-# A general purpose utility to check if variable is
-# undefinded or empty string and exit if so,
-# printing a useful diagnosic trace if variable was empty.
-# NOTE: only the variable NAME should be passed as argument,
-# note its value. Such as
-#   assertNotEmpty BUILD_ID
-# not
-#   assertNotEmpty $BUILD_ID
-assertNotEmpty ()
-{
-  VAR_NAME=$1
-
-  #echo "DEBUG: VAR_NAME: $VAR_NAME" >&2
-  #echo "DEBUG: \$VAR_NAME: ${!VAR_NAME}" >&2
-  if [[ -z "${!VAR_NAME}" ]]
-  then
-    printf "\n\tPROGRAM ERROR: %s\n" "${VAR_NAME} was unexpectedly empty or undefined."
-    printf "\t%s\n\n" "in ${FUNCNAME[1]}, called from line number ${BASH_LINENO[0]} in ${BASH_SOURCE[1]}."
-    exit 1
-  else
-    printf "\n\t%s:\t%s\n" "${VAR_NAME}" "${!VAR_NAME}"
-  fi
-
-}
-
-
-function show_time () {
-num=$1
-min=0
-hour=0
-day=0
-if((num>59));then
-  ((sec=num%60))
-  ((num=num/60))
-  if((num>59));then
-    ((min=num%60))
-    ((num=num/60))
-    if((num>23));then
-      ((hour=num%24))
-      ((day=num/24))
-    else
-      ((hour=num))
-    fi
-  else
-    ((min=num))
-  fi
-else
-  ((sec=num))
-fi
-
-if [[ $day > 0 ]]
-then
-  echo "$day d  $hour h  $min m  $sec s"
-elif [[ $hour > 0 ]]
-then
-  echo "$hour h  $min m  $sec s"
-elif [[ $min > 0 ]]
-then
-  echo "$min m  $sec s"
-else
-  echo "$sec s"
-fi
-}
-
-# This funtion needs three arguments, in order.
-#   StartTime (in epoch seconds)
-#   EndTime (in epock seconds)
-#   Message. Optional quoted string that is printed with elapsed time. If not provided, "Elapsed Time" is used.
-#
-elapsedTime ()
-{
-  start=$1
-  end=$2
-  message=$3
-  # TODO: could improve error checking, by making sure times are "all digits"
-  if [[ -z "$start" ]]
-  then
-    "[ERROR] Start time must be provided to ${0##*/}"
-    exit 1
-  fi
-  if [[ -z "$end" ]]
-  then
-    "[ERROR] End time must be provided to ${0##*/}"
-    exit 1
-  fi
-  if [[ -z "$message" ]]
-  then
-    message="Elapsed Time"
-  fi
-  elapsedSeconds=$(( ${end} - ${start} ))
-  elapsedTime=$( show_time $elapsedSeconds )
-  echo -e "\n\t${message}: $elapsedTime"
-  if [[ -n "${timeFile}" ]]
-  then
-    # elapsed time is for human readers. elapsedSeconds is recorded too in case we ever do more 
-    # statistics or graphs with the data. 
-    echo -e "\n\t${message}: $elapsedTime\n\t${message}: RawSeconds: ${elapsedSeconds}" >> "${timeFile}"
-  else
-    echo -e "\n\t[WARNING] timeFile variable was not defined in ${0##*/}"
-  fi
-}
-
-testElapsedTime ()
-{
-  #RAW_DATE_START="$(date -u +%s )"
-  RAW_DATE_START="$(date +%s )"
-
-  echo -e "\n\tRAW Date Start: ${RAW_DATE_START} \n"
-  echo -e "\tStart Time: $( date  +%Y%m%d%H%M%S -d @${RAW_DATE_START} )"
-
-  sleep 6
-
-  RAW_DATE_END="$(date +%s )"
-
-  echo -e "\n\tRAW Date End: ${RAW_DATE_END} \n"
-  echo -e "\tEnd Time: $( date  +%Y%m%d%H%M%S -d @${RAW_DATE_END} )"
-
-  elapsedTime $RAW_DATE_START $RAW_DATE_END "Testing Elapsed Time"
-}
diff --git a/production/bootstrapVariables.shsource b/production/bootstrapVariables.shsource
deleted file mode 100644
index d3148b8..0000000
--- a/production/bootstrapVariables.shsource
+++ /dev/null
@@ -1,188 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-
-
-# boot strap basic variable values, to drive Eclipse Platform builds.
-
-# We set RAWDATE first thing, just to make it more accurate of the "start of the build".
-# We have found on Hudson (but never by cron jobs) that by the time the build starts, it is often already 1 minute 
-# past the time we scheduled. This may eventually be fixed (or improved) in Hudson (see bug 496403). 
-# Initially we tried heuristic of deducting 60 seconds (bug 496345) but occasionally Hudson would start the job in, say 51 seconds, making
-# our build ID a minute less that it should be. Then we tried 30 seconds (bug 500233), but given a look at the long term history
-# of Hudson "start" times, it seems 30 seconds may fail at times too. 
-# So modified to truncate "epoch seconds" to the nearest 5 minutes since in our production builds we always schedule them 
-# to start at "even" times, such as "on the hour", occasionally "on the half hour", and rarely on "quarter hours" and maybe once at 10 after. :) 
-# So as long as schedule as it currently is, it seems truncating to nearest 5 minutes will always work. We have seen Hudson "delay times" range from 
-# about 20 seconds to at most about 2 minutes, but never any near 5 minutes so that shouldn't be a concern, 
-# unless Hudson delays start to get really long (over 5 minutes) for some reason.
-if [[ -z "${RAWDATE}" ]]
-then
-  RAWDATE=$( date +%s )
-  remainder=$(( RAWDATE % 300 ))
-  RAWDATE=$((RAWDATE - remainder))
-  export RAWDATE
-  echo -e "\n\t[DEBUG] RAWDATE in ${0##*/} was empty (as expected) so setting to \"now minus $remainder\" (truncating to nearest 5 minutes): ${RAWDATE}\n"
-else 
-  echo -e "\n\t[DEBUG] RAWDATE in ${0##*/} was already set. RAWDATE: ${RAWDATE}\n"
-fi
-if [[ -z "${SCRIPT_PATH}" ]]
-then
-   echo -e "\n\t[ERROR] SCRIPT_PATH is not defined as expected in ${0##*/}"
-   exit 1
-else 
-   echo -e "\n\t[INFO] SCRIPT_PATH defined as ${SCRIPT_PATH}"
-fi
-source "${SCRIPT_PATH}/bashUtilities.shsource"
-
-# USAGE: fn-git-cache BUILD_ROOT
-#   ROOT: /shared/eclipse/builds/${major}${type}
-fn-git-cache ()
-{
-  # we (now) leave branch our of git-cache path, or else "topic branches", such as
-  # 'david_williams/II20130409-0900' complicates directory structure
-  checkNArgs $# 1
-  if [[ $? != 0 ]]; then return 1; fi
-  ROOT="$1"; shift
-  echo $ROOT/gitCache
-}
-# USAGE: fn-git-dir GIT_CACHE URL
-#   GIT_CACHE: /shared/eclipse/builds/R4_2_maintenance/gitCache
-#   URL: file:///gitroot/platform/eclipse.platform.releng.aggregator.git
-fn-git-dir ()
-{
-  checkNArgs $# 2
-  if [[ $? != 0 ]]; then return 1; fi
-  GIT_CACHE="$1"; shift
-  URL="$1"; shift
-  echo $GIT_CACHE/$( basename "$URL" .git )
-}
-
-
-# USAGE: fn-build-id BUILD_TYPE
-#   BUILD_TYPE: I, M, N, X, Y, P, U
-
-fn-build-id ()
-{
-  checkNArgs $# 1
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILD_TYPE="$1"; shift
-  TIMESTAMP=$( date +%Y%m%d-%H%M --date='@'$RAWDATE )
-  echo ${BUILD_TYPE}${TIMESTAMP}
-}
-
-
-# USAGE: fn-build-dir ROOT BUILD_ID STREAM
-#   ROOT: /shared/eclipse/builds
-#   BUILD_ID: M20121119-1900
-#   STREAM: 4.3.0
-fn-build-dir ()
-{
-  checkNArgs $# 3
-  if [[ $? != 0 ]]; then return 1; fi
-  ROOT="$1"; shift
-  BUILD_ID="$1"; shift
-  STREAM="$1"; shift
-  eclipseStreamMajor=${STREAM:0:1}
-  dropDirSegment=siteDir/eclipse/downloads/drops
-  if (( $eclipseStreamMajor > 3 ))
-  then
-    dropDirSegment=siteDir/eclipse/downloads/drops4
-  fi
-  echo $ROOT/$dropDirSegment/$BUILD_ID
-}
-
-
-  # if not defined "externally", then something is wrong 
-  # with our assumptions and we should simply fail here. 
-  # If the definition ever needs to be put back here, then 
-  # see bootstrap.shsource for how REPO_AND_ACESS is defined. 
-  assertNotEmpty REPO_AND_ACCESS
-
-  if [[ -z "${AGGREGATOR_REPO}" ]]
-  then
-    export AGGREGATOR_REPO=${REPO_AND_ACCESS}/platform/eclipse.platform.releng.aggregator.git
-  fi
-
-  assertNotEmpty BUILD_ROOT
-  assertNotEmpty AGGREGATOR_REPO
-  assertNotEmpty BUILD_TYPE
-  assertNotEmpty STREAM
-
-  if [[ -z "${gitCache}" ]]
-  then
-    gitCache=$( fn-git-cache "${BUILD_ROOT}" )
-    assertNotEmpty gitCache
-    export gitCache
-  else
-    echo "gitCache was already defined as $gitCache"
-  fi
-
-  if [[ -z "${aggDir}" ]]
-  then
-    aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
-    assertNotEmpty aggDir
-    export aggDir
-  else
-    echo "aggDir was already defined as $aggDir"
-  fi
-
-# NOTE: if BUILD_ID is already set, we need to make sure it 
-# is one of "our" BUILD_IDs,  
-# since if we try to run on Hudson, it gets's Hudson's 
-# version of BUILD_D which is like "2016-03-13_17-12-03"
-# Therefore, we not only check "if set", we also check 
-# it's format to be sure it matches the pattern we use.
-# We do not expect S or R in this context
-# if we ever do, it is a 3 part id, not 2 part.
-# Either of the two "digits" forms should work.
-#buildIdPattern="^[MNIPYU][0-9]{8}-[0-9]{4}$"
-buildIdPattern="^[MNIPYU][[:digit:]]{8}-[[:digit:]]{4}$"
-
-  if [[ -z "${BUILD_ID}" || ! "${BUILD_ID}" =~ $buildIdPattern ]]
-  then
-    BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
-    assertNotEmpty BUILD_ID
-    export BUILD_ID
-    echo "BUILD_ID was defined as $BUILD_ID"
-  else
-   echo "BUILD_ID was already defined as $BUILD_ID"
-  fi
-
-  if [[ -z "${buildDirectory}" ]]
-  then
-    buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" )
-    assertNotEmpty buildDirectory
-    export buildDirectory
-    # this should be when we first create buildDirectory
-    echo "Making buildDirectory: ${buildDirectory}"
-    # Testing confirmed that umask was correct initially.
-    #echo "initial umask in bootstrapVariables.shsource: $(umask)"
-    #umask 0002
-    #echo "umask after setting in bootstrapVariables.shsource: $(umask)"
-    # it appears GID bit is not always set correctly. 
-    # Appears related to "depth" of directories made. 
-    # If we "cd" to parent directory, then it works. 
-    # even using --mode u=rwx,g=rwxs,o=rx did not make it correctly.
-    # See https://bugs.eclipse.org/bugs/show_bug.cgi?id=492493
-    #mkdir -p --verbose --mode u=rwx,g=rwxs,o=rx  "${buildDirectory}"
-    mkdir -p --verbose $BUILD_ROOT/siteDir/eclipse/downloads/drops4
-    pushd $BUILD_ROOT/siteDir/eclipse/downloads/drops4
-    mkdir --verbose $BUILD_ID
-    popd
-  else
-    echo "buildDirectory was already defined as $buildDirectory"
-  fi
-
-
diff --git a/production/build-functions-test.sh b/production/build-functions-test.sh
deleted file mode 100755
index 5e50904..0000000
--- a/production/build-functions-test.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-
-source build_eclipse_org.shsource
-source build-functions.shsource
-export buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" )
-mkdir -p $buildDirectory
-echo buildDirectory: $buildDirectory
-
-test=1
-checkNArgs 3 3
-if [[ $? == 0 ]]; then echo "test $test passed"; else echo "test $test failed"; fi
-
-test=2
-checkNArgs 2 3
-if [[ $? != 0 ]]; then echo "test $test passed"; else echo "test $test failed"; fi
-
-test=3
-checkNArgs 3 1 3
-if [[ $? == 0 ]]; then echo "test $test passed"; else echo "test $test failed"; fi
-
-test=4
-checkNArgs 2 1 3
-if [[ $? == 0 ]]; then echo "test $test passed"; else echo "test $test failed"; fi
-
-test=5
-checkNArgs 3 1 2
-if [[ $? != 0 ]]; then echo "test $test passed"; else echo "test $test failed"; fi
diff --git a/production/build-functions.shsource b/production/build-functions.shsource
deleted file mode 100755
index 8872b8b..0000000
--- a/production/build-functions.shsource
+++ /dev/null
@@ -1,1464 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2019, 2020 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-
-# General purpose utilities related to git and similar,
-# to be sourced where needed
-
-# this localBuildProperties.shsource file is to ease local builds to override some variables.
-# It should not be used for production builds.
-source localBuildProperties.shsource 2>/dev/null
-ARCHIVE_HOST=${ARCHIVE_HOST:-archive.eclipse.org}
-DOWNLOAD_HOST=${DOWNLOAD_HOST:-download.eclipse.org}
-
-if [[ -z "${SCRIPT_PATH}" ]]
-then
-  echo -e "\n\t[ERROR] SCRIPT_PATH is not defined as expected in ${0##*/}"
-  exit 1
-else
-  echo -e "\n\t[INFO] SCRIPT_PATH defined as ${SCRIPT_PATH}"
-fi
-source ${SCRIPT_PATH}/bashUtilities.shsource
-source ${SCRIPT_PATH}/bootstrapVariables.shsource
-
-# USAGE: fn-git-clone URL [BRANCH [TARGET_DIR] ]
-#   URL: file:///gitroot/platform/eclipse.platform.releng.aggregator.git
-#   BRANCH: R4_2_maintenance
-#   TARGET_DIR: e.p.releng.aggregator
-fn-git-clone ()
-{
-  URL="$1"; shift
-  if [ $# -gt 0 ]; then
-    BRANCH_CMD="-b $1"; shift
-  fi
-  if [ $# -gt 0 ]; then
-    TARGET_DIR="$1"; shift
-  fi
-  # We specify --shared so that the
-  # directory has group write permissions, as well as g+sx,
-  # which is mostly done for easier "cleanup" of directories, etc.,
-  # by anyone in "eclipse.platform.releng" group, not just genie.releng
-  # owner id itself.
-  echo git clone --recursive $BRANCH_CMD $URL $TARGET_DIR
-  git clone --recursive $BRANCH_CMD $URL $TARGET_DIR
-}
-
-# USAGE: fn-git-checkout BRANCH | TAG
-#   BRANCH: R4_2_maintenance
-fn-git-checkout ()
-{
-  BRANCH="$1"; shift
-  # always fetch before checkout, to be sure new
-  # branches are in local repo (in case we are switching
-  # to a new branch).
-  echo git fetch current repo before checkout
-  git fetch
-  RC=$?
-  if [[ $RC != 0 ]]
-  then
-    echo "[ERROR] RC from git fetch: $RC"
-  else
-    echo git checkout "$BRANCH" --force
-    git checkout "$BRANCH" --force
-    RC=$?
-    if [[ $RC != 0 ]]
-    then
-      echo "[ERROR] RC from git checkout: $RC"
-    fi
-  fi
-  return $RC
-}
-
-# USAGE: fn-git-pull
-fn-git-pull ()
-{
-  echo git pull
-  git pull
-}
-
-# USAGE: fn-git-submodule-update
-fn-git-submodule-update ()
-{
-  echo "git submodule init"
-  git submodule init
-  echo "git submodule update --recursive"
-  git submodule update --recursive
-}
-
-# USAGE: fn-git-update-submodules
-fn-git-update-submodules ()
-{
-  echo git submodule update --init
-  git submodule update --init
-}
-
-# USAGE: fn-git-clean
-fn-git-clean ()
-{
-  # See bug 400657
-  echo git clean -f -d -x
-  git clean -f -d -x
-  RC=$?
-  if [[ $RC != 0 ]]
-  then
-    echo "[ERROR] RC from git clean: $RC"
-    return $RC
-  else
-    # after initial clean, we'll also use git stash to clean up any temp commits
-    # and modified tracked files, which will also call clean under the covers, I believe,
-    # so may eventually want to do this first? (But, that may not allow the -x type cleanup).
-    git stash
-    RC=$?
-    if [[ $RC != 0 ]]
-    then
-      echo "[ERROR] RC from git stash: $RC"
-      return $RC
-    else
-      # we don't really want to save this stash in build directory
-      git stash clear
-      RC=$?
-      if [[ $RC != 0 ]]
-      then
-        echo "[ERROR] RC from git stash clear: $RC"
-        return $RC
-      fi
-    fi
-  fi
-  return 0
-}
-
-# USAGE: fn-git-reset
-fn-git-reset ()
-{
-  echo git reset --hard  $@
-  git reset --hard  $@
-  RC=$?
-  if [[ $RC != 0 ]]
-  then
-    echo "[ERROR] RC from git reset: $RC"
-  fi
-  return $RC
-}
-
-# USAGE: fn-git-clean-submodules
-fn-git-clean-submodules ()
-{
-  # See bug 400657
-  echo git submodule foreach git clean -f -d -x
-  git submodule foreach git clean -f -d -x
-  RC=$?
-  if [[ $RC != 0 ]]
-  then
-    echo "[ERROR] RC from submodule foreach git clean: $RC"
-    return $RC
-  else
-    # after initial clean, we'll also use git stash to clean up any temp commits
-    # and modified tracked files, which will also call clean under the covers, I believe,
-    # so may eventually want to do this first? (But, that may not allow the -x type cleanup).
-    git submodule foreach git stash
-    RC=$?
-    if [[ $RC != 0 ]]
-    then
-      echo "[ERROR] RC from git submodule stash: $RC"
-      return $RC
-    else
-      # we don't really want to save this stash in build directory
-      git submodule foreach git stash clear
-      RC=$?
-      if [[ $RC != 0 ]]
-      then
-        echo "[ERROR] RC from git submodule stash clear: $RC"
-        return $RC
-      fi
-    fi
-  fi
-  return 0
-}
-
-# USAGE: fn-git-reset-submodules
-fn-git-reset-submodules ()
-{
-  echo git submodule foreach git reset --hard HEAD
-  git submodule foreach git reset --hard HEAD
-  RC=$?
-  if [[ $RC != 0 ]]
-  then
-    echo "[ERROR] RC from submodule foreach git reset: $RC"
-  fi
-  return $RC
-}
-
-# USAGE: fn-local-repo URL
-#   URL: git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
-fn-local-repo ()
-{
-  checkNArgs $# 1
-  if [[ $? != 0 ]]; then return 1; fi
-  # we assume REPO_AND_ACCESS is exported from calling scripts
-  URL="$1"; shift
-  TO_REPLACE='git://git.eclipse.org/gitroot'
-  if [[ -n "${REPO_AND_ACCESS}" && "${REPO_AND_ACCESS}" != "${TO_REPLACE}" ]]
-  then
-    echo $URL | sed "s!${TO_REPLACE}!${REPO_AND_ACCESS}!g"
-  else
-    echo $URL
-  fi
-}
-
-# USAGE: fn-git-clone-aggregator GIT_CACHE URL BRANCH
-#   GIT_CACHE: /shared/eclipse/builds/R4_2_maintenance/gitCache
-#   URL: file:///gitroot/platform/eclipse.platform.releng.aggregator.git
-#   BRANCH: R4_2_maintenance
-fn-git-clone-aggregator ()
-{
-  checkNArgs $# 3
-  if [[ $? != 0 ]]; then return 1; fi
-  GIT_CACHE="$1"; shift
-  URL="$1"; shift
-  BRANCH="$1"; shift
-  if [ ! -e "$GIT_CACHE" ]; then
-    mkdir -p "$GIT_CACHE"
-  fi
-  pushd "$GIT_CACHE"
-  fn-git-clone "$URL" "$BRANCH"
-  popd
-  pushd  $(fn-git-dir "$GIT_CACHE" "$URL" )
-  fn-git-submodule-update
-  popd
-}
-
-# USAGE: fn-git-clean-aggregator AGGREGATOR_DIR BRANCH
-#   AGGREGATOR_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   BRANCH: R4_2_maintenance
-fn-git-clean-aggregator ()
-{
-  checkNArgs $# 2
-  if [[ $? != 0 ]]; then return 1; fi
-  AGGREGATOR_DIR="$1"; shift
-  BRANCH="$1"; shift
-  pushd "$AGGREGATOR_DIR"
-  fn-complete-status "Repo state status before any cleaning."
-  fn-git-clean
-  RC=$?
-  if [[ $RC == 0 ]]
-  then
-    fn-git-clean-submodules
-    RC=$?
-    if [[ $RC == 0 ]]
-    then
-      fn-complete-status "Repo state status after cleaning but before reset."
-      fn-git-reset-submodules
-      RC=$?
-      if [[ $RC == 0 ]]
-      then
-        fn-complete-status "Repo state status after submodules reset but before checkout."
-        fn-git-checkout "$BRANCH"
-        RC=$?
-        if [[ $RC == 0 ]]
-        then
-          fn-complete-status "Repo state status after checkout but final reset."
-          fn-git-reset origin/$BRANCH
-          RC=$?
-          fn-complete-status "Repo state status after all cleanup in clean-aggregator."
-        fi
-      fi
-    fi
-  fi
-  popd
-  return $RC
-}
-
-# USAGE: fn-git-clean-aggregator AGGREGATOR_DIR BRANCH
-#   AGGREGATOR_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   BRANCH: R4_2_maintenance
-fn-git-clean-aggregator2 ()
-{
-  checkNArgs $# 2
-  if [[ $? != 0 ]]; then return 1; fi
-  AGGREGATOR_DIR="$1"; shift
-  BRANCH="$1"; shift
-  pushd "$AGGREGATOR_DIR"
-  fn-complete-status "Repo state status before any cleaning."
-  fn-git-clean
-  RC=$?
-  if [[ $RC == 0 ]]
-  then
-    fn-git-clean-submodules
-    RC=$?
-    if [[ $RC == 0 ]]
-    then
-      fn-complete-status "Repo state status after clean but before checkout."
-      fn-git-checkout "$BRANCH"
-      RC=$?
-      if [[ $RC == 0 ]]
-      then
-        fn-complete-status "Repo state status after checkout but before reset."
-        fn-git-reset origin/$BRANCH
-        RC=$?
-        if [[ $RC == 0 ]]
-        then
-          fn-complete-status "Repo state status after reset but before forced update."
-          fn-git-update-submodules
-          RC=$?
-          fn-complete-status "Repo state status after all cleanup and init in clean-aggregator."
-        fi
-      fi
-    fi
-  fi
-  popd
-  return $RC
-}
-
-# USAGE: fn-basebuilder-dir ROOT BUILD_ID STREAM
-#   ROOT: /shared/eclipse/builds
-#   BUILD_ID: M20121116-1100
-#   STREAM: 4.2.2
-fn-basebuilder-dir ()
-{
-  checkNArgs $# 3
-  if [[ $? != 0 ]]; then return 1; fi
-  ROOT="$1"; shift
-  BUILD_ID="$1"; shift
-  STREAM="$1"; shift
-  buildDirectory=$( fn-build-dir "$ROOT" "$BUILD_ID" "$STREAM" )
-  echo $buildDirectory/org.eclipse.releng.basebuilder
-}
-
-
-# USAGE: fn-maven-build-aggregator BUILD_ID REPO_DIR LOCAL_REPO DEBUG QUIET SIGNING MAVEN_BREE
-#   BUILD_ID: I20121116-0700
-#   REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   LOCAL_REPO: /shared/eclipse/builds/R4_2_maintenance/localMavenRepo
-#   VERBOSE: true
-#   SIGNING: true
-# TODO: depends on BUILD_TYPE being exported/global
-fn-maven-build-aggregator ()
-{
-  checkNArgs $# 7
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILD_ID="$1"; shift
-  REPO_DIR="$1"; shift
-  LOCAL_REPO="$1"; shift
-  DEBUG=$1; shift
-  QUIET=$1; shift
-  SIGNING=$1; shift
-  MAVEN_BREE=$1; shift
-
-  # For now, we always specify --update-snapshots. We may eventually want
-  # to fine tune that to use it only when we do not "clean workspace" before
-  # a build. i.e. only specify for nightlies? See bug 480817.
-
-  MARGS="-DbuildId=$BUILD_ID --update-snapshots"
-  if $DEBUG; then
-    MARGS="$MARGS -X -e"
-  fi
-  if $QUIET; then
-    MARGS="$MARGS -q"
-  fi
-  if $SIGNING; then
-    MARGS="$MARGS -Peclipse-sign"
-  fi
-  if [[ -n "${PATCH_BUILD}" ]]; then
-    MARGS="$MARGS -P${PATCH_BUILD}"
-  fi
-
-  MARGS="$MARGS ${MAVEN_BREE}"
-
-  export MAVEN_TMP_DIR=${MAVEN_TMP_DIR:-${TMP_DIR}}
-  mkdir -p ${MAVEN_TMP_DIR}
-
-  # Here we count on $BUILD_TYPE being exported. TODO: make parameter later?
-  if [[ -n "$BUILD_TYPE" && "$BUILD_TYPE" == "N" ]]
-  then
-    FORCEQUALIFIERARG="-DforceContextQualifier=${BUILD_ID}"
-    # always fail-fast for now. Otherwise too hard to debug.
-    #FAIL_OPTION=${FAIL_OPTION:-"--fail-never"}
-    FAIL_OPTION=${FAIL_OPTION:-"--fail-fast"}
-    #CODE_WARNINGS="-Dcode.ignoredWarnings=-warn:-deprecation"
-    # For now treat N- and I-builds the same for bug 483395 comment 21.
-    CODE_WARNINGS=
-  else
-    # just for safety, make sure unset
-    FORCEQUALIFIERARG=
-    FAIL_OPTION=${FAIL_OPTION:-"--fail-fast"}
-    # if not N-build, allow parent pom defaults. We unset for safety.
-    CODE_WARNINGS=
-  fi
-
-  echo "DEBUG: Variables in $0"
-  echo "DEBUG: BUILD_ID: $BUILD_ID"
-  echo "DEBUG: REPO_DIR: $REPO_DIR"
-  echo "DEBUG: LOCAL_REPO: $LOCAL_REPO"
-  echo "DEBUG: DEBUG: $DEBUG"
-  echo "DEBUG: QUIET: $QUIET"
-  echo ""
-  echo "DEBUG: CBI_JDT_REPO_URL: $CBI_JDT_REPO_URL"
-  echo "DEBUG: CBI_JDT_VERSION: $CBI_JDT_VERSION"
-  echo ""
-  echo "DEBUG: SIGNING: $SIGNING"
-  echo "DEBUG: MAVEN_BREE: $MAVEN_BREE"
-  echo "DEBUG: MARGS: $MARGS"
-  echo "DEBUG: FORCEQUALIFIERARG: $FORCEQUALIFIERARG"
-  echo "DEBUG: CODE_WARNINGS: ${CODE_WARNINGS}"
-
-  # --fail-at-end gives chance for bundles to compile, even after
-  # a compile error. Might have to specify --fail-never to see them all? See
-  # http://www.sonatype.com/books/mvnref-book/reference/running-sect-options.html#running-sect-failure-option
-  # during debugging, sometimes helpful to change to --fail-fast
-  pushd "$REPO_DIR"
-  # lock-snapshots, if not obvious, should only be run occasionally, once ready to "stabilize"
-  # mvn versions:lock-snapshots -Dmaven.repo.local=$LOCAL_REPO -Dincludes=org.eclipse.tycho*  >${logsDirectory}/lock-snapshots.txt
-  # mvn versions:display-plugin-updates -Dmaven.repo.local=$LOCAL_REPO > ${logsDirectory}/display-plugin-updates.txt
-  # 'dependency updates' not useful for Tycho, since its "dependencies" are via p2.
-  # mvn versions:display-dependency-updates -Dmaven.repo.local=$LOCAL_REPO > ${logsDirectory}/display-dependency-updates.txt
-  # mvn versions:display-property-updates -Dmaven.repo.local=$LOCAL_REPO > ${logsDirectory}/display-property-updates.txt
-  # Note: we pass in bogus eclipse-p2-repo.url value (XXXXX), to help ensure no regressions of
-  # bug 471835 (See bug 478483)
-  # Note: reactorBuildTimestampProperty was added as a work around for bug 486698.
-  # It should be removed once bug 486783 is fixed. I created bug 489510 as a reminder to remove the workaround.
-    mvn $MARGS ${FAIL_OPTION} ${MAVEN_SETTINGS} -V  ${ALT_POM_FILE} \
-      clean verify \
-      -DskipTests=true \
-      -Dmaven.repo.local=$LOCAL_REPO  $CBI_JDT_REPO_URL_ARG $CBI_JDT_VERSION_ARG \
-      -Dtycho.debug.artifactcomparator -Djava.io.tmpdir=${MAVEN_TMP_DIR}\
-      -Dcbi.jarsigner.continueOnFail=true -Djgit.dirtyWorkingTree=error \
-      -DaggregatorBuild=true \
-      -DbuildTimestamp="${TIMESTAMP}" -DbuildType="${BUILD_TYPE}"  -DbuildId="${BUILD_ID}" -Declipse-p2-repo.url="NOT_FOR_PRODUCTION_USE" ${FORCEQUALIFIERARG} ${CODE_WARNINGS} ${JAVA_DOC_TOOL}
-  rc=$?
-  popd
-  return $rc
-}
-
-# USAGE: fn-submodule-checkout BUILD_ID REPO_DIR REPOSITORIES_TXT
-#   BUILD_ID: M20121116-1100
-#   REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   SCRIPT: /shared/eclipse/builds/scripts/git-submodule-checkout.sh
-#   REPOSITORIES_TXT: /shared/eclipse/builds/streams/repositories.txt
-fn-submodule-checkout ()
-{
-  checkNArgs $# 4
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILD_ID="$1"; shift
-  REPO_DIR="$1"; shift
-  SCRIPT="$1"; shift
-  REPOSITORIES_TXT="$1"; shift
-  pushd "$REPO_DIR"
-  git submodule foreach "/bin/bash $SCRIPT $REPOSITORIES_TXT \$name"
-  uninit=$( git submodule | grep "^-" | cut -f2 -d" " | sort -u )
-  if [ ! -z "$uninit" ]; then
-    echo Some modules are not initialized: $uninit
-    return
-  fi
-  conflict=$( git submodule | grep "^U" | cut -f2 -d" " | sort -u )
-  if [ ! -z "$conflict" ]; then
-    echo Some modules have conflicts: $conflict
-    return
-  fi
-  adds=$( git submodule | grep "^+" | cut -f2 -d" " )
-  if [ -z "$adds" ]; then
-    echo No updates for the submodules
-    return
-  fi
-  popd
-}
-
-# USAGE: fn-add-submodule-updates REPO_DIR
-#   REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-fn-add-submodule-updates ()
-{
-  checkNArgs $# 1
-  if [[ $? != 0 ]]; then return 1; fi
-  REPO_DIR="$1"; shift
-  pushd "$REPO_DIR"
-  adds=$( git submodule | grep "^+" | cut -f2 -d" " )
-  if [ -z "$adds" ]; then
-    echo No updates for the submodules
-    return
-  fi
-  echo git add $adds
-  git add $adds
-  popd
-}
-
-# USAGE: fn-tag-build-inputs BUILD_ID REPO_DIR REPOSITORIES_TXT
-#   BUILD_ID: M20121116-1100
-#   REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   REPOSITORIES_TXT: /shared/eclipse/builds/streams/repositories.txt
-# NOTE: the use of || : at the end of git submodules foreach commands. 
-# See git submodules --help for more info ,or 
-# http://stackoverflow.com/questions/19728933/continue-looping-over-submodules-with-the-git-submodule-foreach-command-after
-fn-tag-build-inputs ()
-{
-  checkNArgs $# 3
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILD_ID="$1"; shift
-  REPO_DIR="$1"; shift
-  REPOSITORIES_TXT="$1"; shift
-  pushd "$REPO_DIR"
-
-  # == Step 1 of git logging.
-  # TODO: This may not work right if "streams/repositories.txt" contains tags.
-  GITLOG_FILENAME=gitLog.html
-  GITLOG_FILE=${buildDirectory}/${GITLOG_FILENAME}
-  echo "Creating ${GITLOG_FILENAME}"
-  # we set REPORTDATE first thing, to get some idea of "time elapsed" since start of build.
-  # While we still have "tagging" to do, we have by now checked out everything and cleaned up
-  # the working tree. (So any commits after this time, would definitely not be "included" in build.
-  REPORTDATE=$( date +%s )
-  # we make in same format as "build id" for easy comparison.
-  REPORTTIMESTAMP=$( date +%Y%m%d-%H%M --date='@'$REPORTDATE )
-  # before tagging anything with current build id,
-  # get the most recent tag that matches the build type
-  # I am assuming BUILD_TYPE has been exported by some calling method,
-  # so we have access to it without re-computing, and without passing
-  # as an argument.
-  # I am fairly sure this find tags in "local repo", so would work for Nightlies, as well as
-  # working before we pushed current tag. If found to be empty (no changes) we could skip the build.
-
-  # I've learned N-builds are "special", since we do not push those tags.
-  # For I and M builds, though, we do want the "remote" (permanent) tag, to avoid
-  # picking up tags of cancelled jobs.
-  if [[ "${BUILD_TYPE}" == "N" ]]
-  then
-    monthInSeconds=$(( 3600 * 24 * 30 ))
-    rightnow=$(date +%s)
-    oneMonthAgo=$(( rightnow - monthInSeconds))
-    commitish=$(git rev-list --tags="${BUILD_TYPE}*" --max-age=${oneMonthAgo} --max-count=1 )
-    lastTag=$(git describe --tags --abbrev=0 ${commitish})
-    if [[ ! ${lastTag} =~ ^([${BUILD_TYPE}]).*$ ]]
-    then
-      # Unset if was not an 'N' build (even with all the constraints specified, Git
-      # will "find" an I-tag, if no N-tag satisfies the constraints.
-      lastTag=""
-    else
-      echo "DEBUG: lastTag matched ^([${BUILD_TYPE}]).*$"
-    fi
-  else
-    lastTag=$(git describe --tags --match "${BUILD_TYPE}*" --abbrev=0)
-  fi
-
-  # == Here is where we do the actual tagging
-  git submodule foreach "if grep \"^\${name}:\" $REPOSITORIES_TXT >/dev/null; then git tag $BUILD_ID; $GIT_PUSH --verbose origin $BUILD_ID; else echo Skipping \$name; fi || :"
-  git tag $BUILD_ID
-
-  # == Step 2 of Git logging.
-  if [[ -n "${lastTag}" ]]
-  then
-    TMP_GIT_LOG=${TMP_DIR}/gitlog.txt
-    echo -e "<h2>Git log from ${lastTag} (previous) to ${BUILD_ID} (current)</h2>" > ${GITLOG_FILE}
-    echo -e "<h2>The tagging, and this report, were done at about $REPORTTIMESTAMP</h2>" >> ${GITLOG_FILE}
-    git log ${lastTag}..${BUILD_ID} --date=short --format=format:"<tr><td class=\"datecell\">%cd</td><td class=\"commitcell\"><a href=\"https://git.eclipse.org/c/platform/eclipse.platform.releng.aggregator.git/commit/?id=%H\">%s</a></td><td class=\"authorcell\">%aN</td></tr>"> ${TMP_GIT_LOG}
-    FILESIZE1=$(stat -c%s ${TMP_GIT_LOG})
-    if [ $FILESIZE1 -ne 0 ]
-    then
-        echo "<table width=\"80%\"><tbody> <tr><th class=\"cell\" colspan=\"3\">Repository: eclipse.platform.releng.aggregator</th></tr>" >> ${GITLOG_FILE}
-        echo "<tr> <th class=\"datecell\">Date</th> <th class=\"commitcell\">Commit message</th> <th class=\"authorcell\">Author</th> </tr>" >> ${GITLOG_FILE}
-        cat ${TMP_GIT_LOG} >> ${GITLOG_FILE}
-        echo  "</tbody></table><br><br>">> ${GITLOG_FILE}
-        echo  >> ${GITLOG_FILE}
-    fi
-    git submodule --quiet foreach "comp=\$(echo \$path|cut -d. -f2);git log ${lastTag}..${BUILD_ID} --date=short --format=format:\"<tr><td class=\\\"datecell\\\">%cd</td><td class=\\\"commitcell\\\"><a href=\\\"https://git.eclipse.org/c/\$comp/\$path.git/commit/?id=%H\\\">%s</a></td><td class=\\\"authorcell\\\">%aN</td></tr>\">${TMP_GIT_LOG};FILESIZE=\$(stat -c%s ${TMP_GIT_LOG});if [ \$FILESIZE -ne 0 ]; then echo \"<table width=\\\"80%\\\"><tbody> <tr><th class=\\\"cell\\\" colspan=\\\"3\\\">Repository: \$path</th></tr>\";echo \"<tr> <th class=\\\"datecell\\\">Date</th> <th class=\\\"commitcell\\\">Commit message</th> <th class=\\\"authorcell\\\">Author</th> </tr>\";cat ${TMP_GIT_LOG};echo \"</tbody></table><br><br>\";echo;fi" >> ${GITLOG_FILE}
-  else
-    echo -e "\n\tGit log not generated because a reasonable previous tag could not be found." > ${GITLOG_FILE}
-  fi
-  # == end of Git logging
-
-  # have final push of for aggregator at end, since in future we may not build if we find "no changes"
-  $GIT_PUSH --verbose origin $BUILD_ID
-  popd
-}
-
-# USAGE: fn-pom-version-updater REPO_DIR LOCAL_REPO DEBUG QUIET
-#   REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   LOCAL_REPO: /shared/eclipse/builds/R4_2_maintenance/localMavenRepo
-# TODO: depends on TMP_DIR being exported/global
-fn-pom-version-updater ()
-{
-
-  checkNArgs $# 4
-  if [[ $? != 0 ]]; then return 1; fi
-  REPO_DIR="$1"; shift
-  LOCAL_REPO="$1"; shift
-  DEBUG=$1; shift
-  QUIET=$1; shift
-
-  MARGS=" --update-snapshots"
-  if $DEBUG; then
-    MARGS="$MARGS -X -e"
-  fi
-  if $QUIET; then
-    MARGS="$MARGS -q"
-  fi
-  if [[ -n "${PATCH_BUILD}" ]]; then
-    MARGS="$MARGS -P${PATCH_BUILD}"
-  fi
-  echo "DEBUG: Variables in $0"
-  echo "DEBUG: PATCH_BUILD: $PATCH_BUILD"
-  echo "DEBUG: REPO_DIR: $REPO_DIR"
-  echo "DEBUG: LOCAL_REPO: $LOCAL_REPO"
-  echo "DEBUG: DEBUG: $DEBUG"
-  echo "DEBUG: QUIET: $QUIET"
-  echo "DEBUG: MARGS: $MARGS"
-
-  export MAVEN_TMP_DIR=${MAVEN_TMP_DIR:-${TMP_DIR}}
-  mkdir -p ${MAVEN_TMP_DIR}
-
-  # fail fast if not set up correctly
-  rc=$(fn-check-dir-exists TMP_DIR)
-  checkForErrorExit "$rc" "$rc"
-
-  rc=$(fn-check-dir-exists MAVEN_TMP_DIR)
-  checkForErrorExit "$rc" "$rc"
-
-  report=${TMP_DIR}/pom_${BUILD_ID}.txt
-  pushd "$REPO_DIR"
-    mvn ${MAVEN_SETTINGS} $MARGS  ${ALT_POM_FILE} \
-      org.eclipse.tycho:tycho-versions-plugin:1.7.0:update-pom \
-      -Dmaven.repo.local=$LOCAL_REPO -Djava.io.tmpdir=${MAVEN_TMP_DIR}\
-      -DaggregatorBuild=true \
-      -DbuildTimestamp="${TIMESTAMP}" -DbuildType="${BUILD_TYPE}" -DbuildId="${BUILD_ID}" -Declipse-p2-repo.url="NOT_FOR_PRODUCTION_USE"
-  RC=$?
-  if [[ $RC != 0 ]]
-  then
-    echo "ERROR: tycho-versions-plugin:update-pom returned non-zero return code: $RC" >&2
-  else
-    changes=$( git status --short -uno | cut -c4- )
-    if [ -z "$changes" ]; then
-      echo "INFO: No changes in pom versions" >&2
-      RC=0
-    else
-      echo "INFO: Changes in pom versions: $changes" >&2
-      RC=0
-    fi
-  fi
-  popd
-  return $RC
-}
-
-
-# USAGE: fn-gather-repo BUILD_ID REPO_DIR BUILD_DIR
-#   BUILD_ID: I20121116-0700
-#   REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
-fn-gather-repo ()
-{
-  checkNArgs $# 3
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILD_ID="$1"; shift
-  REPO_DIR="$1"; shift
-  BUILD_DIR="$1"; shift
-  if [[ -n "${PATCH_BUILD}" ]]
-  then
-    PATCH_BUILD_GENERIC=java14patch
-    TARGET_PATH=eclipse.platform.releng.tychoeclipsebuilder/${PATCH_BUILD}/eclipse.releng.repository.${PATCH_BUILD_GENERIC}/target/repository
-    REPO_DIR_REPOSITORY=$REPO_DIR/${TARGET_PATH}
-  else
-    TARGET_PATH=eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository
-    REPO_DIR_REPOSITORY=$REPO_DIR/$TAGET_PATH
-  fi
-  
-  if [[ -d "$REPO_DIR_REPOSITORY" ]]
-  then
-    pushd "$REPO_DIR"
-    cp -r ${TARGET_PATH} $BUILD_DIR
-    popd
-  else
-    echo "   ERROR: $REPO_DIR_REPOSITORY did not exist in fn-gather-repo"
-  fi
-}
-
-fn-notarize-macbuild ()
-{
-	set -x
-	BUILD_DIR_TEMP="$1"; shift
-	DMG="$1"; shift
-	
-	pushd $BUILD_DIR_TEMP
-		
-	PRIMARY_BUNDLE_ID="$(echo ${DMG} | sed  's/-macosx-cocoa-x86_64.dmg//g')"
-	
-	RESPONSE=$(curl -s -X POST -F file=@${DMG} -F 'options={"primaryBundleId": "'${PRIMARY_BUNDLE_ID}'", "staple": true};type=application/json' http://172.30.206.146:8383/macos-notarization-service/notarize)
-	  
-	UUID=$(echo ${RESPONSE} | /shared/common/jq/1.6/jq -r '.uuid')
-	
-	STATUS=$(echo ${RESPONSE} | /shared/common/jq/1.6/jq -r '.notarizationStatus.status')
-	
-	while [[ ${STATUS} == 'IN_PROGRESS' ]]; do
-	  sleep 1m
-	  RESPONSE=$(curl -s http://172.30.206.146:8383/macos-notarization-service/${UUID}/status)
-	  STATUS=$(echo ${RESPONSE} | /shared/common/jq/1.6/jq -r '.notarizationStatus.status')
-	done
-	
-	if [[ ${STATUS} != 'COMPLETE' ]]; then
-	  echo "Notarization failed: ${RESPONSE}"
-	  exit 1
-	fi
-	
-	rm "${DMG}"
-	
-	curl -JO http://172.30.206.146:8383/macos-notarization-service/${UUID}/download
-	popd
-	set +x
-}
-
-# USAGE: fn-gather-sdk BUILD_ID REPO_DIR BUILD_DIR
-#   BUILD_ID: I20121116-0700
-#   REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
-fn-gather-sdk ()
-{
-  checkNArgs $# 3
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILD_ID="$1"; shift
-  REPO_DIR="$1"; shift
-  BUILD_DIR="$1"; shift
-  TARGET_PRODUCTS="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/sdk/target/products
-  buildType=$(echo $BUILD_ID|cut -b1)
-  if [[ -d "$TARGET_PRODUCTS" ]]
-  then
-    pushd "$TARGET_PRODUCTS"
-    cp org.eclipse.sdk.ide-linux.gtk.ppc64le.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-linux-gtk-ppc64le.tar.gz
-    cp org.eclipse.sdk.ide-linux.gtk.x86_64.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-linux-gtk-x86_64.tar.gz
-    cp org.eclipse.sdk.ide-macosx.cocoa.x86_64.tar.gz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz
-    cp org.eclipse.sdk.ide-macosx.cocoa.x86_64.dmg "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.dmg
-    cp org.eclipse.sdk.ide-win32.win32.x86_64.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-win32-x86_64.zip
-    popd
-    fn-notarize-macbuild "$BUILD_DIR" eclipse-SDK-${BUILD_ID}-macosx-cocoa-x86_64.dmg
-  else
-    echo "   ERROR: $TARGET_PRODUCTS did not exist in fn-gather-sdks"
-  fi
-  TARBALL_DIR="$REPO_DIR"/eclipse-platform-sources/target/
-  if [[ -d "$TARBALL_DIR" ]]
-  then
-    pushd "$TARBALL_DIR"
-    cp eclipse-platform-sources-${BUILD_ID}.tar.xz "$BUILD_DIR"/eclipse-platform-sources-${BUILD_ID}.tar.xz
-    popd
-  else
-    echo "   ERROR: $TARBALL_DIR did not exist in fn-gather-sdks"
-  fi
-}
-
-# USAGE: fn-gather-platform BUILD_ID REPO_DIR BUILD_DIR
-#   BUILD_ID: I20121116-0700
-#   REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
-fn-gather-platform ()
-{
-  checkNArgs $# 3
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILD_ID="$1"; shift
-  REPO_DIR="$1"; shift
-  BUILD_DIR="$1"; shift
-  TARGET_PRODUCTS="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/platform/target/products
-  buildType=$(echo $BUILD_ID|cut -b1)
-  if [[ -d "$TARGET_PRODUCTS" ]]
-  then
-    pushd "$TARGET_PRODUCTS"
-    cp org.eclipse.platform.ide-linux.gtk.ppc64le.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk-ppc64le.tar.gz
-    cp org.eclipse.platform.ide-linux.gtk.x86_64.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-linux-gtk-x86_64.tar.gz
-    cp org.eclipse.platform.ide-macosx.cocoa.x86_64.tar.gz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz
-    cp org.eclipse.platform.ide-macosx.cocoa.x86_64.dmg "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.dmg
-    cp org.eclipse.platform.ide-win32.win32.x86_64.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-win32-x86_64.zip
-    popd
-    fn-notarize-macbuild "$BUILD_DIR" eclipse-platform-${BUILD_ID}-macosx-cocoa-x86_64.dmg
-  else
-    echo "   ERROR: $TARGET_PRODUCTS did not exist in fn-gather-platform"
-  fi
-}
-
-# USAGE: fn-gather-swt-zips BUILD_ID REPO_DIR BUILD_DIR
-#   BUILD_ID: I20121116-0700
-#   REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
-fn-gather-swt-zips ()
-{
-  checkNArgs $# 3
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILD_ID="$1"; shift
-  REPO_DIR="$1"; shift
-  BUILD_DIR="$1"; shift
-  # TODO: this directory sanity check does not accomplish much, since binaries/bundles always
-  # exists. Results in a 'not found' msg. Doubt there is any simple solution.
-  SWT_BUNDLES_DIR="$REPO_DIR"/eclipse.platform.swt.binaries/bundles
-  if [[ -d "$SWT_BUNDLES_DIR" ]]
-  then
-    pushd "$SWT_BUNDLES_DIR"
-    cp  */target/*.zip "$BUILD_DIR"
-    popd
-  else
-    echo "   ERROR: $SWT_BUNDLES_DIR did not exist in fn-gather-swt-zips"
-  fi
-}
-
-# USAGE: fn-gather-test-zips BUILD_ID REPO_DIR BUILD_DIR
-#   BUILD_ID: I20121116-0700
-#   REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
-fn-gather-test-zips ()
-{
-  checkNArgs $# 3
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILD_ID="$1"; shift
-  REPO_DIR="$1"; shift
-  BUILD_DIR="$1"; shift
-  TEST_ZIP_DIR="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/target
-  if [[ -d "$TEST_ZIP_DIR" ]]
-  then
-    pushd "$TEST_ZIP_DIR"
-    cp eclipse-junit-tests-bundle.zip "$BUILD_DIR"/eclipse-Automated-Tests-${BUILD_ID}.zip
-    TEST_FRAMEWORK_DIR=$TEST_ZIP_DIR/eclipse-test-framework
-    if [[ -d "$TEST_FRAMEWORK_DIR" ]]
-    then
-      pushd "$TEST_FRAMEWORK_DIR"
-      zip -r "$BUILD_DIR"/eclipse-test-framework-${BUILD_ID}.zip *
-      popd
-    else
-      echo "   ERROR: $TEST_FRAMEWORK_DIR did not exist in fn-gather-test-zips."
-    fi
-    popd
-  else
-    echo "   ERROR: $TEST_ZIP_DIR did not exist in fn-gather-test-zips."
-  fi
-}
-
-
-# USAGE: fn-gather-ecj-jars BUILD_ID REPO_DIR BUILD_DIR
-#   BUILD_ID: I20121116-0700
-#   REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
-fn-gather-ecj-jars ()
-{
-  checkNArgs $# 3
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILD_ID="$1"; shift
-  REPO_DIR="$1"; shift
-  BUILD_DIR="$1"; shift
-  ECJ_JAR_DIR="$REPO_DIR"/eclipse.jdt.core/org.eclipse.jdt.core/target
-  if [[ -d "$ECJ_JAR_DIR" ]]
-  then
-    pushd "$ECJ_JAR_DIR"
-    # The blob wildcard ('*') is to match "any version number", e.g. 3.9.0, 3.9.1, etc.
-    cp org.eclipse.jdt.core-*-SNAPSHOT-batch-compiler.jar "$BUILD_DIR"/ecj-${BUILD_ID}.jar
-    cp org.eclipse.jdt.core-*-SNAPSHOT-batch-compiler-src.jar "$BUILD_DIR"/ecjsrc-${BUILD_ID}.jar
-    popd
-  else
-    echo "   ERROR: $ECJ_JAR_DIR did not exist in fn-gather-ecj-jars."
-    #TODO eventually, fail the build here? If they do not exist, something must be pretty wrong?
-  fi
-}
-
-
-
-# USAGE: fn-slice-repos BUILD_ID REPO_DIR BUILD_DIR BASEBUILDER_LAUNCHER
-#   BUILD_ID: I20121116-0700
-#   ANT_SCRIPT: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
-#   BASEBUILDER_LAUNCHER: /shared/eclipse/builds/R4_2_maintenance/org.eclipse.releng.basebuilder_R3_7/plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar
-fn-slice-repos ()
-{
-  checkNArgs $# 4
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILD_ID="$1"; shift
-  REPO_DIR="$1"; shift
-  BUILD_DIR="$1"; shift
-  BASEBUILDER_LAUNCHER="$1"; shift
-  ANT_SCRIPT="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/repos/buildAll.xml
-  REPO_DIR_DIR="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository
-  if [[ -d "$REPO_DIR_DIR" ]]
-  then
-    pushd "$REPO_DIR"
-    java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \
-      -data ${BUILD_DIR}/workspace-buildrepos \
-      -application org.eclipse.ant.core.antRunner \
-      -buildfile "$ANT_SCRIPT" \
-      -Declipse.build.configs="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder \
-      -DbuildId="$BUILD_ID" \
-      -DbuildRepo="$REPO_DIR_DIR" \
-      -DpostingDirectory=$(dirname "$BUILD_DIR") \
-      -DequinoxPostingDirectory="$BUILD_ROOT/siteDir/equinox/drops" \
-      -DbuildLabel="$BUILD_ID" \
-      -Djava.io.tmpdir=$TMP_DIR \
-      -DbuildDirectory="$BUILD_DIR"
-    RC=$?
-    popd
-    if [[ $RC != 0 ]]
-    then
-      BUILD_FAILED="${buildDirectory}/buildFailed-slice-repo-error"
-      echo "   ERROR: Java antrunner call with $ANT_SCRIPT returned non-zero return code, $RC, in fn-slice-repo" >>${BUILD_FAILED}
-      return $RC
-    fi
-  else
-    BUILD_FAILED="${buildDirectory}/buildFailed-slice-repo-error"
-    echo "   ERROR: $REPO_DIR_DIR did not exist in fn-slice-repo. Probably due to an earlier error?" >>${BUILD_FAILED}
-    return 1
-  fi
-}
-
-
-# USAGE: fn-gather-repo-zips BUILD_ID REPO_DIR BUILD_DIR
-#   BUILD_ID: I20121116-0700
-#   REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
-fn-gather-repo-zips ()
-{
-  checkNArgs $# 3
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILD_ID="$1"; shift
-  REPO_DIR="$1"; shift
-  BUILD_DIR="$1"; shift
-  if [[ -d "$REPO_DIR" ]]
-  then
-    pushd "$REPO_DIR"/eclipse.platform.repository/target/repos
-    for r in org.eclipse.*; do
-      pushd $r
-      zip -r "$BUILD_DIR"/${r}-${BUILD_ID}.zip *
-      popd
-    done
-    popd
-  else
-    echo "   ERROR: $REPO_DIR did not exist in fn-gather-repo-zips"
-  fi
-}
-
-# TODO: could probably remove this function. It has been replaced
-# by fn-gather-23-compile-log as long as we are on Tycho 23 or above.
-# USAGE: fn-gather-compile-logs BUILD_ID REPO_DIR BUILD_DIR
-#   BUILD_ID: I20121116-0700
-#   REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
-fn-gather-compile-logs ()
-{
-  checkNArgs $# 3
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILD_ID="$1"; shift
-  REPO_DIR="$1"; shift
-  BUILD_DIR="$1"; shift
-  if [[ -d "$REPO_DIR" ]]
-  then
-    mkdir -p "$BUILD_DIR"/compilelogs/plugins
-    pushd "$REPO_DIR"
-    for dot in $( find * -name "@dot.xml" ); do
-      targetDir=$( dirname "$dot" )
-      echo "Processing $dot in $targetDir"
-      if [ ! -r "$targetDir"/MANIFEST.MF ]; then
-        echo "**Failed to process $dot in $targetDir. Likely compile error. Will try source MANIFEST.MF in directory containing target."
-        targetDir=$( dirname "${targetDir}" )
-        if [ ! -r "$targetDir"/META-INF/MANIFEST.MF ]
-        then
-          echo "**Failed to process $dot in $targetDir."
-        else
-          BUNDLE_ID=$( grep Bundle-SymbolicName "$targetDir"/META-INF/MANIFEST.MF | cut -f2 -d" " |  cut -f1 -d\; | tr -d '\f\r\n\t' )
-          BUNDLE_VERSION=$(  grep Bundle-Version "$targetDir"/META-INF/MANIFEST.MF | cut -f2 -d" " | tr -d '\f\r\n\t' )
-          mkdir "$BUILD_DIR"/compilelogs/plugins/${BUNDLE_ID}_${BUNDLE_VERSION}
-          cp "$dot" "$BUILD_DIR"/compilelogs/plugins/${BUNDLE_ID}_${BUNDLE_VERSION}
-        fi
-      else
-        BUNDLE_ID=$( grep Bundle-SymbolicName "$targetDir"/MANIFEST.MF | cut -f2 -d" " |  cut -f1 -d\; | tr -d '\f\r\n\t' )
-        BUNDLE_VERSION=$(  grep Bundle-Version "$targetDir"/MANIFEST.MF | cut -f2 -d" " | tr -d '\f\r\n\t' )
-        mkdir "$BUILD_DIR"/compilelogs/plugins/${BUNDLE_ID}_${BUNDLE_VERSION}
-        cp "$dot" "$BUILD_DIR"/compilelogs/plugins/${BUNDLE_ID}_${BUNDLE_VERSION}
-      fi
-    done
-    popd
-  else
-    echo "[ERROR] $REPO_DIR did not exist in fn-gather-compile-logs"
-  fi
-}
-
-# USAGE: fn-gather-23-compile-logs BUILD_ID REPO_DIR BUILD_DIR
-# This method for use when using Tycho 0.23.0 or greater, due to
-# fix for multi-jar bundles.
-#   BUILD_ID: I20121116-0700
-#   REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
-fn-gather-23-compile-logs ()
-{
-  checkNArgs $# 3
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILD_ID="$1"; shift
-  REPO_DIR="$1"; shift
-  BUILD_DIR="$1"; shift
-  if [[ -d "$REPO_DIR" ]]
-  then
-    COLLECTED_LOGS_DIR="${BUILD_DIR}/compilelogs/plugins"
-    mkdir -p "${COLLECTED_LOGS_DIR}"
-    pushd "$REPO_DIR"
-    # The directory 'compilelogs' is used when we generate the logs. See parent pom for compilerArgs.
-    for log in $( find "${REPO_DIR}" -name "compilelogs" -type d ); do
-      targetDir=$( dirname "$log" )
-      # Remember to remove INFO echo, after confirmed working
-      echo -e "\t[INFO] Processing \n\t$log\n\tin\n\t$targetDir"
-      if [ ! -r "$targetDir"/MANIFEST.MF ]; then
-        echo -e "\n\t** Failed to process\n\t$log in \n\t$targetDir. \n\tLikely compile error? Will backup to source MANIFEST.MF in directory containing target."
-        targetDir=$( dirname "${targetDir}" )
-        if [ ! -r "$targetDir"/META-INF/MANIFEST.MF ]
-        then
-          echo "**Failed to process $log in $targetDir."
-        else
-          BUNDLE_ID=$( grep Bundle-SymbolicName "$targetDir"/META-INF/MANIFEST.MF | cut -f2 -d" " |  cut -f1 -d\; | tr -d '\f\r\n\t' )
-          BUNDLE_VERSION=$(  grep Bundle-Version "$targetDir"/META-INF/MANIFEST.MF | cut -f2 -d" " | tr -d '\f\r\n\t' )
-          mkdir -p "${COLLECTED_LOGS_DIR}/${BUNDLE_ID}_${BUNDLE_VERSION}"
-          rsync -vr "${log}/" "${COLLECTED_LOGS_DIR}/${BUNDLE_ID}_${BUNDLE_VERSION}/"
-        fi
-      else
-        BUNDLE_ID=$( grep Bundle-SymbolicName "$targetDir"/MANIFEST.MF | cut -f2 -d" " |  cut -f1 -d\; | tr -d '\f\r\n\t' )
-        BUNDLE_VERSION=$(  grep Bundle-Version "$targetDir"/MANIFEST.MF | cut -f2 -d" " | tr -d '\f\r\n\t' )
-        # directory may not be "new", since we now collect @dot.xml, plus nested jar compile logs, of the form <jarName>.jar.xml
-        # as well as handy for "re-running"
-        mkdir -p "${COLLECTED_LOGS_DIR}/${BUNDLE_ID}_${BUNDLE_VERSION}"
-        # All logs should be directly under $log, but ... will specify -r in case not.
-        # Remember to remove 'v' after confirmed working
-        rsync -vr "${log}/" "${COLLECTED_LOGS_DIR}/${BUNDLE_ID}_${BUNDLE_VERSION}/"
-      fi
-    done
-    popd
-  else
-    echo "[ERROR] $REPO_DIR did not exist in fn-gather-23-compile-logs"
-  fi
-}
-#   fn-gather-buildnotes
-#   BUILD_ID: I20121116-0700
-#   REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
-function fn-gather-buildnotes
-{
-  checkNArgs $# 3
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILD_ID="$1"; shift
-  REPO_DIR="$1"; shift
-  BUILD_DIR="$1"; shift
-  echo "collecting buildnotes"
-  if [[ -d "$REPO_DIR" ]]
-  then
-    pushd "$REPO_DIR"
-    buildnotesDir="${BUILD_DIR}/buildnotes"
-    mkdir -p ${buildnotesDir}
-    find . -name "buildnotes_*.html" -exec rsync '{}' ${buildnotesDir}  \;
-    popd
-  else
-    echo "   ERROR: $REPO_DIR did not exist in fn-gather-buildnotes"
-    return 1
-  fi
-}
-#   fn-gather-artifactcomparisons
-#   BUILD_ID: I20121116-0700
-#   REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
-# TODO: this may take a while, for something that usually won't be found.
-# could skip for N-builds. Plus, could check if size of log was greater than minimum.
-# see syncDropLocation for current home of that "check".
-function fn-gather-artifactcomparisons
-{
-  checkNArgs $# 3
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILD_ID="$1"; shift
-  REPO_DIR="$1"; shift
-  BUILD_DIR="$1"; shift
-  echo "collecting artifactcomparisons"
-  if [[ -d "$REPO_DIR" ]]
-  then
-    pushd "$REPO_DIR"
-    mkdir -p "${BUILD_DIR}/buildlogs/comparatorlogs"
-    find . -regex ".*target/artifactcomparison" -type d -exec zip -r  "${BUILD_DIR}/buildlogs/comparatorlogs/artifactcomparisons.zip" '{}' \;
-    popd
-  else
-    echo "   ERROR: $REPO_DIR did not exist in fn-gather-artifactcomparisons"
-    return 1
-  fi
-}
-
-
-
-# USAGE: fn-gather-main-index BUILD_ID REPO_DIR BUILD_DIR STREAM BUILD_TYPE BUILD_PRETTY_DATE
-#   BUILD_ID: I20121116-0700
-#   REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
-#   STREAM: 4.2.2
-#   BUILD_TYPE: M, I, N, X, Y, P, U
-#   BUILD_PRETTY_DATE: Thu Nov 20 17:47:35 EST 2012
-fn-gather-main-index ()
-{
-  checkNArgs $# 6
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILD_ID="$1"; shift
-  REPO_DIR="$1"; shift
-  BUILD_DIR="$1"; shift
-  STREAM="$1"; shift
-  BUILD_TYPE="$1"; shift
-  BUILD_PRETTY_DATE="$1"; shift
-  pushd "$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/eclipse/templateFiles
-
-  # Simplified by creating PHP variables in buildproperties.php
-  cp "index.template_${PATCH_OR_BRANCH_LABEL}.php" "$BUILD_DIR"/index.php
-
-  popd
-}
-
-# USAGE: fn-parse-compile-logs BUILD_ID ANT_SCRIPT BUILD_DIR BASEBUILDER_LAUNCHER
-#   BUILD_ID: I20121116-0700
-#   ANT_SCRIPT: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
-#   BASEBUILDER_LAUNCHER: /shared/eclipse/builds/R4_2_maintenance/org.eclipse.releng.basebuilder_R3_7/plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar
-fn-parse-compile-logs ()
-{
-  checkNArgs $# 4
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILD_ID="$1"; shift
-  ANT_SCRIPT="$1"; shift
-  BUILD_DIR="$1"; shift
-  BASEBUILDER_LAUNCHER="$1"; shift
-  EBuilderDir="${BUILD_DIR}/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder"
-  pushd "$BUILD_DIR"
-  java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \
-    -data ${BUILD_DIR}/workspace-verifyCompile \
-    -application org.eclipse.ant.core.antRunner \
-    -buildfile "$ANT_SCRIPT" \
-    -DpostingDirectory=$(dirname $BUILD_DIR) \
-    -DbuildDirectory="$BUILD_DIR" \
-    -DEBuilderDir="${EBuilderDir}" \
-    -DbuildId="$BUILD_ID" \
-    -DbuildLabel="$BUILD_ID" \
-    -Djava.io.tmpdir=$TMP_DIR \
-    verifyCompile
-  popd
-}
-
-# USAGE: fn-summarize-comparator-logs BUILD_ID ANT_SCRIPT BUILD_DIR BASEBUILDER_LAUNCHER
-#   BUILD_ID: I20121116-0700
-#   ANT_SCRIPT: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
-#   BASEBUILDER_LAUNCHER: /shared/eclipse/builds/R4_2_maintenance/org.eclipse.releng.basebuilder_R3_7/plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar
-#   TODO: I think this could be pure ant task
-fn-summarize-comparator-logs ()
-{
-  checkNArgs $# 4
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILD_ID="$1"; shift
-  ANT_SCRIPT="$1"; shift
-  BUILD_DIR="$1"; shift
-  BASEBUILDER_LAUNCHER="$1"; shift
-  EBuilderDir="${BUILD_DIR}/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder"
-  pushd "$BUILD_DIR"
-  java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \
-    -data ${BUILD_DIR}/workspace-comparatorLogs \
-    -application org.eclipse.ant.core.antRunner \
-    -buildfile "$ANT_SCRIPT" \
-    -DbuildDirectory="$BUILD_DIR" \
-    -DEBuilderDir="${EBuilderDir}" \
-    -DbuildId="$BUILD_ID" \
-    -DbuildLabel="$BUILD_ID" \
-    -Djava.io.tmpdir=$TMP_DIR \
-    compare
-  popd
-}
-# USAGE: fn-summarize-apitooling BUILD_ID ANT_SCRIPT BUILD_DIR BASEBUILDER_LAUNCHER
-#   BUILD_ID: I20121116-0700
-#   ANT_SCRIPT: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
-#   BASEBUILDER_LAUNCHER: /shared/eclipse/builds/R4_2_maintenance/org.eclipse.releng.basebuilder_R3_7/plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar
-#   TODO: could avoid some of the hard coding of "previous version" and URL
-fn-summarize-apitooling ()
-{
-  checkNArgs $# 4
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILD_ID="$1"; shift
-  ANT_SCRIPT="$1"; shift
-  BUILD_DIR="$1"; shift
-  BASEBUILDER_LAUNCHER="$1"; shift
-  EBuilderDir=$BUILD_DIR/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder
-  pushd "$BUILD_DIR"
-  # Make sure FREEZE_PARAMS is defined, but empty space, if not using freeze reports.
-  FREEZE_PARAMS=" "
-  # When no "freeze" in effect for a release comment these out. Uncomment after M6, changing to appropriate versions.
-  #FREEZE_PARAMS="-DfreezeBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/S-4.15RC1-202002261800/eclipse-SDK-4.15RC1-win32-x86_64.zip \
-  #  -DfreezeName=Eclipse-SDK-4.15RC1 \
-  #  -DfreezeFilename=eclipse-SDK-4.15RC1-win32-x86_64.zip "
-  # this API_PREV_REF_LABEL variable should be changed any time the version used
-  # by previousBaseURL changes. Its purpose is just to localize changes to this one
-  # place, and not have to make further, hard-coded changes to php files.
-  # Similar for freeze label.
-  # NOTE: the *reference* for API changes should be the "previous release", even if it is a "service release".
-  API_PREV_REF_LABEL=4.15
-  fn-write-property API_PREV_REF_LABEL
-  #API_FREEZE_REF_LABEL=4.15RC1
-  API_FREEZE_REF_LABEL=" "
-  fn-write-property API_FREEZE_REF_LABEL
-  java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \
-    -data ${BUILD_DIR}/workspace-apitoolingsLogs \
-    -application org.eclipse.ant.core.antRunner \
-    -buildfile "$ANT_SCRIPT" \
-    -DbuildDirectory="$BUILD_DIR" \
-    -DEBuilderDir=$EBuilderDir \
-    -DbuildId="$BUILD_ID" \
-    -DbuildLabel="$BUILD_ID" \
-    -DbuildWorkingArea="${BUILD_HOME}/4${BUILD_TYPE}/gitCache/eclipse.platform.releng.aggregator" \
-    -DpreviousBaseURL=https://${DOWNLOAD_HOST}/eclipse/downloads/drops4/R-4.15-202003050155/eclipse-SDK-4.15-win32-x86_64.zip \
-    -DpreviousBaselineName=Eclipse-SDK-4.15 \
-    -DpreviousBaselineFilename=eclipse-SDK-4.15-win32-x86_64.zip \
-    -Djava.io.tmpdir=$TMP_DIR \
-    ${FREEZE_PARAMS} \
-    apiToolsReports
-  popd
-}
-
-# USAGE: fn-publish-eclipse BUILD_TYPE BUILD_STREAM BUILD_ID REPO_DIR BUILD_DIR BASEBUILDER_LAUNCHER
-#   BUILD_TYPE: I
-#   BUILD_STREAM: 4.2.2
-#   BUILD_ID: I20121116-0700
-#   REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
-#   BASEBUILDER_LAUNCHER: /shared/eclipse/builds/R4_2_maintenance/org.eclipse.releng.basebuilder_R3_7/plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar
-fn-publish-eclipse ()
-{
-  checkNArgs $# 6
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILD_TYPE="$1"; shift
-  BUILD_STREAM="$1"; shift
-  BUILD_ID="$1"; shift
-  AGGR_DIR="$1"; shift
-  BUILD_DIR="$1"; shift
-  BASEBUILDER_LAUNCHER="$1"; shift
-  EBuilderDir="$BUILD_DIR"/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder
-  pushd "$BUILD_DIR"
-  java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \
-    -data ${BUILD_DIR}/workspace-publish \
-    -application org.eclipse.ant.core.antRunner \
-    -v \
-    -buildfile "$EBuilderDir"/eclipse/helper.xml \
-    -DbuildId="$BUILD_ID" \
-    -DbuildRepo="$AGGR_DIR"/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository \
-    -DpostingDirectory="$BUILD_ROOT/siteDir/eclipse/downloads/drops4" \
-    -DequinoxPostingDirectory="$BUILD_ROOT/siteDir/equinox/drops" \
-    -DpublishingContent="$EBuilderDir"/eclipse/publishingFiles \
-    -DdropTemplateFileName="${EBuilderDir}/eclipse/publishingFiles/templateFiles/index.template_${PATCH_OR_BRANCH_LABEL}.php" \
-    -DindexFileName="index.php" \
-    -DbuildLabel="$BUILD_DIR_SEG" \
-    -DEBuilderDir="$EBuilderDir" \
-    -DAGGR_DIR="$AGGR_DIR" \
-    -DeclipseStream=$BUILD_STREAM \
-    -DbuildType="$BUILD_TYPE" \
-    -Dbase.builder=$(dirname $(dirname "$BASEBUILDER_LAUNCHER" ) ) \
-    -DbuildDirectory="$BUILD_DIR" \
-    -Djava.io.tmpdir=$TMP_DIR \
-    publish
-  # hide experimental builds, for now
-  if [[ $BUILD_TYPE =~ [PX] ]]
-  then
-    touch buildHidden
-  fi
-  
-  if [[ "$invisibleBuild" == "true" ]]
-  then
-    touch buildHidden
-  fi
-  popd
-}
-
-# USAGE: fn-checkout-basebuilder BUILDER_DIR
-#   BUILDER_DIR: /shared/eclipse/builds/R4_2_maintenance/org.eclipse.releng.basebuilder_R3_7
-fn-checkout-basebuilder ()
-{
-  checkNArgs $# 1
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILDER_DIR="$1"; shift
-  if [ -e "$BUILDER_DIR" ]; then
-    echo "A basic builder directory already existed, so not re-fetched."
-    echo "   Directory found at $BUILDER_DIR."
-    return 0
-  fi
-  echo "A basic builder did not exist, so will fetch platform and tools."
-  DROP_DIR=$( dirname "$BUILDER_DIR" )
-  # Are these as expected? TODO: change comments.
-  echo "Drop directory: $DROP_DIR"
-  echo "BUILDER_DIR: $BUILDER_DIR"
-  EBuilderDir=$DROP_DIR/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder
-  if [[ ! -d "${EBuilderDir}" ]]
-  then
-    echo "EBuilderDir did not exist, so will fetch that first"
-    ${SCRIPT_PATH}/getEBuilderForDropDir.sh $DROP_DIR $EBUILDER_HASH
-  else
-    echo "EBuilderDir already existed, so no need to fetch that"
-  fi
-  ant -f $EBuilderDir/eclipse/getBaseBuilderAndTools.xml -DWORKSPACE=$DROP_DIR
-}
-
-# USAGE: fn-basebuilder-launcher BUILDER_DIR
-#   BUILDER_DIR: /shared/eclipse/builds/R4_2_maintenance/org.eclipse.releng.basebuilder_R3_7
-fn-basebuilder-launcher ()
-{
-  checkNArgs $# 1
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILDER_DIR="$1"; shift
-  find "$BUILDER_DIR" -name "org.eclipse.equinox.launcher_*.jar" | tail -1
-}
-
-# USAGE: fn-pom-version-report BUILD_ID REPO_DIR BUILD_DIR LOCAL_REPO
-#   BUILD_ID: I20121116-0700
-#   REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
-fn-pom-version-report ()
-{
-  checkNArgs $# 3
-  if [[ $? != 0 ]]; then return 1; fi
-  BUILD_ID="$1"; shift
-  REPO_DIR="$1"; shift
-  BUILD_DIR="$1"; shift
-  pushd "$REPO_DIR"
-  mkdir -p "$BUILD_DIR"/pom_updates
-  git submodule foreach "if (git status -s -uno | grep pom.xml >/dev/null ); then git diff >$BUILD_DIR/pom_updates/\$name.diff; fi "
-  pushd "$BUILD_DIR"/pom_updates
-  nDiffs=$( ls -1 $BUILD_DIR/pom_updates/*.diff | wc -l )
-  # do not create index.html if no diffs to display, as our PHP DL page knows
-  # not to display link if index.html is not present.
-  if (( $nDiffs > 0 ))
-  then
-    POM_UPDATES=""
-    echo "<html>"  >index.html
-    echo "<head>"  >>index.html
-    echo "<title>POM version report for $BUILD_ID</title>"  >>index.html
-    echo "</head>"  >>index.html
-    echo "<body>"  >>index.html
-    echo "<h1>POM version report for $BUILD_ID</h1>"  >>index.html
-    echo "<p>These repositories need patches to bring their pom.xml files up to the correct version.</p>"  >>index.html
-    echo "<ul>"  >>index.html
-
-    for f in *.diff; do
-      FNAME=$( basename $f .diff )
-      echo "<li><a href=\"$f\">$FNAME</a></li>" >> index.html
-      POM_UPDATES="${POM_UPDATES}<li><a href='$f'>$FNAME</a></li>"
-    done
-    echo "</ul>" >> index.html
-    echo "</html>" >> index.html
-    # we write to property files, for later use in email message
-    fn-write-property POM_UPDATES
-  fi
-  popd
-  popd
-}
-
-# USAGE: fn-check-dir-exists DIR_VAR_NAME
-#   DIR_VAR_NAME: JAVA_HOME (not, $JAVA_HOME, for better error messages)
-#   callers should check for non-zero returned value, which itself is suitable for message,
-#   but must be quoted. Such as
-#        rc=${fn-check-dir-exists JAVA_HOME)
-#        checkForErrorExit "$rc" "$rc"
-fn-check-dir-exists ()
-{
-  checkNArgs $# 1
-  if [[ $? != 0 ]]; then return 1; fi
-  DIR_VAR_NAME=$1
-  if [[ -z "${!DIR_VAR_NAME}" ]]
-  then
-    echo "DIR_VAR_NAME, ${DIR_VAR_NAME}, must be defined before running this script."
-  else
-    if [[ ! -d  "${!DIR_VAR_NAME}" ]]
-    then
-      echo "The directory DIR_VAR_NAME, ${DIR_VAR_NAME} (\"${!DIR_VAR_NAME}\"), must exist before running this script."
-    else
-      echo 0
-    fi
-  fi
-}
-
-# USAGE: fn-write-property VAR_NAME
-#   VAR_NAME: Variable name to write as "variable=value" form
-# This script assumes the following variables have been defined and are pointing
-# to an appropriate file (see master-build.sh):
-# BUILD_ENV_FILE=${buildDirectory}/buildproperties.shsource
-# BUILD_ENV_FILE_PHP=${buildDirectory}/buildproperties.php
-# BUILD_ENV_FILE_PROP=${buildDirectory}/buildproperties.properties
-
-# Note we always append to file, assuming if doesn't exist yet and will be
-# created, and for each build, it won't exist, so will be written fresh for
-# each build.
-
-# TODO: Could add some sanity checking of if variable name appropriate
-# for various language (e.g. I forget all the rules, but bash variables
-# can not start with numerial, PHP variables (or is it Ant) can't have hyphens
-# (or is it underscore :), etc. But may need to add some mangling, or warning?
-# Similarly, not sure at the moment of what to
-# write if value is null/empty. For now will leave empty string, but some might need blank?
-# Or literally nothing? Also, unsure of effects of full quoting or if always needed?
-
-fn-write-property ()
-{
-  checkNArgs $# 1
-  if [[ $? != 0 ]]; then return 1; fi
-  VAR_NAME=$1
-  if [[ -z "${VAR_NAME}" ]]
-  then
-    echo "VAR_NAME must be passed to this script, $0."
-    return 1
-  fi
-
-  # bash scripts (export may be overkill ... but, just in case needed)
-  echo "export ${VAR_NAME}=\"${!VAR_NAME//\"/\\\"}\"" >> $BUILD_ENV_FILE
-  # PHP, suitable for direct "include"
-  echo "\$${VAR_NAME} = \"${!VAR_NAME//\"/\\\"}\";" >> $BUILD_ENV_FILE_PHP
-  # standard properties file
-  echo "${VAR_NAME} = \"${!VAR_NAME//\"/\\\"}\"" >> $BUILD_ENV_FILE_PROP
-
-}
-
-# USAGE: fn-write-property-init
-# Must be called (exactly) once before writing properties.
-fn-write-property-init ()
-{
-  checkNArgs $# 0
-  if [[ $? != 0 ]]; then return 1; fi
-  # nothing really required for bash shsource, but we'll put in some niceties
-  echo "#!/usr/bin/env bash" > $BUILD_ENV_FILE
-  echo "# properties written for $BUILD_ID" >> $BUILD_ENV_FILE
-  # PHP, suitable for direct "include": needs to start and end with <?php ...
-  echo "<?php " > $BUILD_ENV_FILE_PHP
-  echo "// properties written for $BUILD_ID " >> $BUILD_ENV_FILE_PHP
-  # standard properties file: nothing special required
-  echo "! properties written for $BUILD_ID" > $BUILD_ENV_FILE_PROP
-
-}
-
-# USAGE: fn-write-property-close
-# Must be called (exactly) once when completely finished writing properties.
-fn-write-property-close ()
-{
-  checkNArgs $# 0
-  if [[ $? != 0 ]]; then return 1; fi
-  # nothing really required for bash shsource, but we'll put in some niceties
-  echo "# finished properties for $BUILD_ID" >> $BUILD_ENV_FILE
-  # PHP, suitable for direct "include": needs to start and end with <?php ...
-  # Note: technically best not to use closing ?> for an 'include'
-  echo "// finished properties for $BUILD_ID " >> $BUILD_ENV_FILE_PHP
-
-  # standard properties file: nothing special required
-  echo "! finshed properties for $BUILD_ID" >> $BUILD_ENV_FILE_PROP
-
-}
-
-# USAGE: fn-complete-status "message"
-# Assumed called while in aggregator directory, so get's its git status,
-# then iterates through each submodule for status.
-# This is/was intend to debug why "cleanup" does not always clean up/reset everything,
-# so if too verbose, can remove in future.
-# Message is a quoted string that can be printed out before each status, for
-# improved logging.
-fn-complete-status ()
-{
-  checkNArgs $# 1
-  if [[ $? != 0 ]]; then return 1; fi
-  MESSAGE=$1
-  printf "\n\t%s\n\n" "${MESSAGE}"
-  git status
-  git submodule foreach git status
-}
-
diff --git a/production/buildScriptsUnitTests/.gitignore b/production/buildScriptsUnitTests/.gitignore
deleted file mode 100644
index 2ffbf6f..0000000
--- a/production/buildScriptsUnitTests/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/buildproperties.php
-/buildproperties.properties
-/buildproperties.shsource
diff --git a/production/buildScriptsUnitTests/description.txt b/production/buildScriptsUnitTests/description.txt
deleted file mode 100644
index f912964..0000000
--- a/production/buildScriptsUnitTests/description.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-These tests are not ran automatically (yet), but handy
-place to store the small tests that can be ran from
-command line to make sure "build functions" work as
-expected.
diff --git a/production/buildScriptsUnitTests/testAssertNotEmpty1.sh b/production/buildScriptsUnitTests/testAssertNotEmpty1.sh
deleted file mode 100755
index bba956c..0000000
--- a/production/buildScriptsUnitTests/testAssertNotEmpty1.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-source bashUtilities.shsource
-
-T1=
-assertNotEmpty T1
-
-echo "Should NOT see this line"
diff --git a/production/buildScriptsUnitTests/testAssertNotEmpty2.sh b/production/buildScriptsUnitTests/testAssertNotEmpty2.sh
deleted file mode 100755
index 917e14a..0000000
--- a/production/buildScriptsUnitTests/testAssertNotEmpty2.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-source bashUtilities.shsource
-
-T1="some value"
-assertNotEmpty T1
-
-echo "Should see this line"
-
-function testDiagMsg
-{
-  assertNotEmpty T2
-  echo "Should NOT see this line"
-}
-
-testDiagMsg
-
diff --git a/production/buildScriptsUnitTests/testQuoteEscape.sh b/production/buildScriptsUnitTests/testQuoteEscape.sh
deleted file mode 100755
index 52ac4b9..0000000
--- a/production/buildScriptsUnitTests/testQuoteEscape.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-SCRIPT_PATH=$PWD
-export BUILD_ENV_FILE=buildproperties.shsource
-export BUILD_ENV_FILE_PHP=buildproperties.php
-export BUILD_ENV_FILE_PROP=buildproperties.properties
-
-source /home/davidw/gitLuna/eclipse.platform.releng.aggregator/production/build-functions.shsource
-source /home/davidw/gitLuna/eclipse.platform.releng.aggregator/production/bashUtilities.shsource
-fn-write-property-init
-
-export JAVA_DOC_PROXIES=${JAVA_DOC_PROXIES:-"-J-Dhttps.proxyHost=proxy.eclipse.org -J-Dhttps.proxyPort=9898 -J-Dhttps.nonProxyHosts=\"172.30.206.*\""}
-
-echo "JAVA_DOC_PROXIES: $JAVA_DOC_PROXIES"
-
-fn-write-property JAVA_DOC_PROXIES
-
-fn-write-property-close
diff --git a/production/buildScriptsUnitTests/timeTruncatedToFiveMinutes.sh b/production/buildScriptsUnitTests/timeTruncatedToFiveMinutes.sh
deleted file mode 100755
index 05092b7..0000000
--- a/production/buildScriptsUnitTests/timeTruncatedToFiveMinutes.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env bash
-
-# small test utility to verify that "time truncation" works as expected. 
-# Such as, confirms there is no "off by one" errors at our choosen interval of 5 minutes. 
-
-# Have not tried running over "midnight", but should not impact results. 
-# Have also not tested if "system time" changes in the middle of things. That might impact accuracy, 
-# but should still be aligned on interval since we only "get" the time in one statement. 
-
-# run for one hour. Can vary as desired, but does interact with the "sleep interval". 
-max_loops=$(( 3600 * 1))
-count=0
-# debug=true produces more detailed ouput
-#debug=true
-
-while [[ $count -lt $max_loops ]]
-do
-  # use a "empty statement" (:), to do increment only, without result being interpreted as a command. 
-  : $(( count++))
-
-  # %s is seconds since epoch. That is, seconds since 1970-01-01 00:00:00 UTC
-  RAWDATE=$( date +%s )
-
-  # Find "remainder" after dividing by 5 minutes (300 seconds)
-
-  # Doesn't seem to matter, for bash aritmetic, if variables in equation have '$' or not.
-  # Confirmed in http://wiki.bash-hackers.org/scripting/newbie_traps
-  # And, better, in the official Bash Reference Manual:
-  # https://www.gnu.org/software/bash/manual/html_node/Shell-Arithmetic.html#Shell-Arithmetic
-  remainder=$(( RAWDATE % 300 )) 
-  RAWDATE_TRUNC=$(( RAWDATE - remainder ))
-  TIMESTAMP_SECONDS=$( date +%Y%m%d-%H%M%S --date='@'$RAWDATE )
-  TIMESTAMP_MIN=$( date +%Y%m%d-%H%M --date='@'$RAWDATE )
-  TIMESTAMP=$( date +%Y%m%d-%H%M --date='@'$RAWDATE_TRUNC )
-
-  # print results only on "5 minute" intervals. 
-  # This can be modify in many ways depending on degree of output desired. 
-  if [[ $remainder == 0 ]]
-  then
-    printf "\n\t================"
-    #fi
-    if [[ "$debug" == "true" ]] 
-    then
-      printf "\n\t%-45s\t%15s" "[DEBUG] loop count:" "$count"
-      printf "\n\t%-45s\t%15s" "[DEBUG] Epoch seconds:" "$RAWDATE"
-      printf "\n\t%-45s\t%15s" "[DEBUG] Truncated epoch seconds:" "$RAWDATE_TRUNC"
-      printf "\n\t%-45s\t%15s" "[DEBUG] Remainder: " "$remainder"
-    fi
-    printf "\n\t%-45s" "Timestamps:"
-    printf "\n\t\t%-45s\t\t%s" "with seconds:" "$TIMESTAMP_SECONDS"
-    printf "\n\t\t%-45s\t\t%s" "to previous minute (as in current BUILD_ID):" "$TIMESTAMP_MIN"
-    printf "\n\t\t%-45s\t%s\n" "to previous 5 minutes (as proposed in bug 500233):" "$TIMESTAMP"
-  fi
-
-  # We sleep for exactly one second, currently, though another
-  # test routine could wait and start on an exact minute, and then sleep for one minute. 
-  sleep 1
-
-done
-
diff --git a/production/buildTycho.sh b/production/buildTycho.sh
deleted file mode 100755
index efe268b..0000000
--- a/production/buildTycho.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-
-# Small, temp utility to patch and build Tycho
-
-if [[ -z "${LOCAL_REPO}" ]]
-then
-  echo "LOCAL_REPO not defined as required"
-  exit 1
-fi
-# Similar for SCRIPT_PATH, relevant here only if local, isolated 
-# build, else, it is defined elsewhere. 
-export SCRIPT_PATH=${SCRIPT_PATH:-${PWD}}
-
-TYCHO_MVN_ARGS="-Dmaven.repo.local=$LOCAL_REPO -Dtycho.localArtifacts=ignore"
-echo -e "\n\tTYCHO_MVN_ARGS: ${TYCHO_MVN_ARGS}\n"
-
-if [[ -d org.eclipse.tycho ]]
-then
-  echo "Removing existing directory: org.eclipse.tycho"
-  rm -fr org.eclipse.tycho
-fi
-git clone git://git.eclipse.org/gitroot/tycho/org.eclipse.tycho.git --quiet
-echo "Tycho Patch"
-pushd org.eclipse.tycho
-git am --ignore-space-change <${SCRIPT_PATH}/patches/0927-Pascal-s-commit-not-mine-for-bug-461872-.-created-th.patch
-rc=$?
-if [ $rc != 0 ]
-then
-  echo "Tycho Patch did not apply? git am return code: $rc"
-  popd
-  exit $rc
-fi
-
-mvn -X -e clean install ${TYCHO_MVN_ARGS}
-rc=$?
-popd
-if [ $rc == 0 ]
-then
-  if [[ -d org.eclipse.tycho.extras ]]
-  then
-    echo "Removing existing directory: org.eclipse.tycho.extras"
-    rm -fr org.eclipse.tycho.extras
-  fi
-  git clone git://git.eclipse.org/gitroot/tycho/org.eclipse.tycho.extras.git --quiet
-  pushd org.eclipse.tycho.extras
-  mvn -X -e clean install ${TYCHO_MVN_ARGS}
-  rc=$?
-  if [ $rc != 0 ]
-  then
-    echo -e "\n\t[ERROR] Tycho Extras build failed. mvn returned $rc\n"
-    exit $rc
-  fi
-else
-  echo -e "\n\t[ERROR] Tycho Build failed. mvn returned $rc\n"
-  exit $rc
-fi
-popd
diff --git a/production/build_eclipse_org.shsource b/production/build_eclipse_org.shsource
deleted file mode 100644
index 13c29a5..0000000
--- a/production/build_eclipse_org.shsource
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2019 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-
-# default definitions for this branch
-
-# this localBuildProperties.shsource file is to ease local builds to override some variables.
-# It should not be used for production builds.
-source localBuildProperties.shsource 2>/dev/null
-export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
-
-export BRANCH=${BRANCH:-master}
-export STREAM=${STREAM:-4.16.0}
-export BUILD_TYPE=${BUILD_TYPE:-I}
-
-# If not set be caller, make sure its an empty string
-# as the variable is sometimes used to "complete" a name,
-# such as "repositories_${PATCH_BUILD}.txt"
-# (not sure this makes a difference in bash?
-# undefined is same as empty string?)
-export PATCH_BUILD=${PATCH_BUILD:-""}
-
-# PATCH_OR_BRANCH_LABEL is a very special purpose variable, used to identify 
-# files in the same branch (usually master) that are to be used, such as 
-# repositories_master.txt or index.template_${PATCH_OR_BRANCH}.php
-# If not set in bootstrap script, infer based on patch_build or branch
-if [[ -z ${PATCH_OR_BRANCH_LABEL} ]] 
-then
-  if [[ -z "${PATCH_BUILD}" ]] 
-  then 
-    export PATCH_OR_BRANCH_LABEL=${BRANCH}
-  else
-    export PATCH_OR_BRANCH_LABEL=${PATCH_BUILD}
-  fi
-fi
-# environment variable to control if jars use Java 8 with pack200 or not 
-# Should be temporary. See bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=463510
-# Not sure if this effect Maven/Tycho builds, or not. 
-#export JAR_PROCESSOR_JAVA=java8
-
-# special POM for patch builds, but by default use POM at root of $REPO_DIR
-# which is default behavior
-if [[ -n ${PATCH_BUILD} ]]
-then
-  export ALT_POM_FILE="-f eclipse.platform.releng.tychoeclipsebuilder/${PATCH_BUILD}/pom.xml"
-  echo "  DEBUG: ALT_POM_FILE: $ALT_POM_FILE"
-else
-  export ALT_POM_FILE=""
-  echo "  DEBUG: ALT_POM_FILE: None. Using normal default."
-fi
-
-
-eclipseStreamMajor=${STREAM:0:1}
-
-export BUILD_ROOT=${BUILD_ROOT:-${BUILD_HOME}/${eclipseStreamMajor}${BUILD_TYPE}}
-
-# Any invocation of Java, Ant, Maven, etc., should use this as default TMP direcotory,
-# instead of the default /tmp by using
-# -Djava.io.tmpdir=${TMP_DIR}
-export TMP_DIR=${TMP_DIR:-${BUILD_ROOT}/tmp}
-# Just in case it doesn't exist yet (it must exist first, or Java will fail)
-mkdir -p ${TMP_DIR}
-
-# these could be machine specific
-export JAVA_HOME=${JAVA_HOME:-/opt/public/common/java/openjdk/jdk-11_x64-latest}
-# required for when ant is used. Unclear how maven's "antrun" finds its version of Ant,
-# built in? Or system path?
-# But, without the ANT_OPTS, we do get messages about "to get repeatable builds, to ignore sysclasspath"
-export ANT_HOME=${ANT_HOME:-/shared/common/apache-ant-1.9.6}
-# we "add to" ANT_OPTS, since Hudson may define some required values
-export ANT_OPTS="${ANT_OPTS} -Dbuild.sysclasspath=ignore -Dincludeantruntime=false"
-# use separate temp dir for maven like RAMDISK
-export MAVEN_TMP_DIR=${MAVEN_TMP_DIR:-${TMP_DIR}}
-mkdir -p ${MAVEN_TMP_DIR}
-#
-# remember, MaxPermSize is specific to "Oracle VMs". It has to be removed (or over ridden)
-# for other VMs or the VM might fail to start due to unrecognized -XX option.
-# Normally should not use -Declipse.p2.mirrors=false, especially on a regular basis.
-# Lower mx since less needed with Tycho 0.23.1. But, still higher than our previous 4G, since we do use near 4G.
-export MAVEN_OPTS=${MAVEN_OPTS:--Xms2048m -Xmx5120m -Djava.io.tmpdir=${MAVEN_TMP_DIR} -Dtycho.localArtifacts=ignore ${MIRROR_SETTING}}
-
-export MAVEN_PATH=${MAVEN_PATH:-/shared/common/maven/apache-maven-3.5.4/bin}
-
-export PATH=$JAVA_HOME/bin:$MAVEN_PATH:$ANT_HOME/bin:$PATH
-
-# Only used to start antrunner for tests.
-# TODO: avoid this hard coding
-BASEBUILDER_TAG=4.15
-
-B_GIT_EMAIL=genie.releng@eclipse.org
-B_GIT_NAME="Releng HIPP"
-COMMITTER_ID=genie.releng
-
-# MVN_DEBUG=true means verbose; gives comparator info
-export MVN_DEBUG=${MVN_DEBUG:-true}
-export MVN_QUIET=${MVN_QUIET:-false}
-
-# Need bree-libs for production builds
-MAVEN_BREE=-Pbree-libs
-
-
-# local, non build.eclipse.org builds (or, test builds) may need to override, and turn off signing.
-# otherwise, we always sign if I or M builds, but not N builds
-#
-if [[ $BUILD_TYPE =~ [IMXYPU] ]]
-then
-  SIGNING=${SIGNING:-true}
-else
-  SIGNING=${SIGNING:-false}
-fi
-
-# custom, environment specific setting, required to generate java doc correctly for Java 8 additions,
-# in our production builds. This is anticipated to be temporary, until we find a better way
-# to do it.
-export JAVA_DOC_TOOL="-Declipse.javadoc=/opt/public/common/java/openjdk/jdk-11_x64-latest/bin/javadoc"
-
-#export USING_TYCHO_SNAPSHOT=false
-export PATCH_TYCHO=false
-export PATCH_SWT=false
diff --git a/production/check-swt-buildinput.sh b/production/check-swt-buildinput.sh
deleted file mode 100755
index 4985d1b..0000000
--- a/production/check-swt-buildinput.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-#*******************************************************************************
-# Copyright (c) 2017 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-# 
-# Contributors:
-#     Sravan Lakkimsetti - initial API and implementation
-#*******************************************************************************
-
-if [ $# -ne 1 ]; then
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-if [ ! -r "$1" ]; then
-  echo "$1" cannot be read
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-source "$1"
-
-pushd $BUILD_ROOT/gitCache/eclipse.platform.releng.aggregator/eclipse.platform.swt
-commit=$(git log --pretty=oneline -1|cut -d' ' -f2-)
-popd
-
-if [[ $commit == v[0-9][0-9][0-9][0-9]* ]]; then
-  echo "SWT build input successful"
-  exit 0
-else
-  echo "SWT build input failed"
-  exit 1
-fi
diff --git a/production/checkConfigIIUs.sh b/production/checkConfigIIUs.sh
deleted file mode 100755
index 4962891..0000000
--- a/production/checkConfigIIUs.sh
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-
-# Small utility to test "build area" that correct number of 
-# IUs ae created for "tooling-type" IUs and "config-IUs". 
-# TODO: should formalize in Java, and check repository directly? 
-# TODO: may need adjustment to better check "MacApp" layout? 
-# 3/21/2015 - did check to check for zero symbolic links (used to check 
-# for 6, but now we no longer create them. 
-
-BUILD_HOME="/shared/eclipse/builds"
-
-echo -e "\n\tBUILD_HOME: ${BUILD_HOME}\n"
-
-BUILD_MAJOR_VERSION=4
-BUILD_TYPE=$1
-if [[ -z "$BUILD_TYPE" ]]
-then
-    BUILD_TYPE="I"
-    echo -e "\tBUILD_TYPE not specified on command line, 'I' assumed.\n"
-fi
-NERRORS=0
-# products means, sdk.ide (aka SDK), rcp.id, rcp.sdk.id, platform.ide (aka platform binary), platform.sdk
-NPRODUCTS=5
-AGGR_DIR="${BUILD_HOME}/${BUILD_MAJOR_VERSION}${BUILD_TYPE}/gitCache/eclipse.platform.releng.aggregator"
-ECLIPSE_BUILD_DIR="${AGGR_DIR}/eclipse.platform.releng.tychoeclipsebuilder"
-
-declare -a PLATFORMS=( \
-cocoa.macosx.x86_64 \
-gtk.linux.ppc64le \
-gtk.linux.x86_64 \
-win32.win32.x86_64 \
-)
-NPLATFORMS=${#PLATFORMS[@]}
-
-echo "Build Type: $BUILD_TYPE"
-echo "N products: $NPRODUCTS"
-echo "N platforms: $NPLATFORMS"
-
-# echo "DEBUG: ${PLATFORMS[@]}"
-
-printf "\n\t%s" "Configuration Roots Test (one for each platform): "
-EXPECTED_CONFIG_ROOTS=$NPLATFORMS
-nConfigs=$( ls -l ${ECLIPSE_BUILD_DIR}/rcp.config/target/*configuration_root* | wc -l )
-
-if [[ ! $nConfigs == $EXPECTED_CONFIG_ROOTS ]]
-then 
-    printf "\n\tERROR: %s\n" "The number of 'configuration roots' did not equal expect number (expected $EXPECTED_CONFIG_ROOTS, found $nConfigs)"
-    # should "count errors" as we get other tests
-    : $((NERRORS++))
-else
-    printf "\t%s\n" "Ok."
-fi
-
-printf "\n\t%s" "Info.plist Tests: "
-EXPECTED_NUMBER=0
-# Expected files are Products (times 2, if 32 bit) Plus one for starter kit, plus 1 for delta pack (times 2, if 32 bit). 
-NBITARCHS=1
-if [[ ${BUILD_TYPE} == "M" ]]
-then
-    NBITARCHS=2
-fi
-EXPECTED_FILES=$(( ( $NPRODUCTS * $NBITARCHS ) + 1 + ( 1 * $NBITARCHS ) ))
-nInfoPlistFiles=$( find ${ECLIPSE_BUILD_DIR}/* -name "Info.plist" | wc -l )
-if [[ $nInfoPlistFiles -eq $EXPECTED_FILES ]]
-then 
-    nWrongIds=$( grep --include Info.plist -A 1 -r "<key>CFBundleIdentifier</key>" ${ECLIPSE_BUILD_DIR}/* | grep  org.eclipse.eclipse | wc -l )
-
-    if [[ $nWrongIds -gt $EXPECTED_NUMBER ]]
-    then 
-        printf "\n\tERROR: %s\n" "The number of 'org.eclipse.eclipse' IDs was greater than expected number (expected $EXPECTED_NUMBER, found $nWrongIds)"
-        # should "count errors" as we get other tests
-        : $((NERRORS++))
-    else
-        printf "\t%s\n" "Ok."
-    fi
-else
-    printf "\n\tERROR: %s\n" "The number of Info.plist files was not what was expected. (expected $EXPECTED_FILES, found $nInfoPlistFiles)"
-    : $((NERRORS++))
-fi
-printf "\t\tFor full list: %s\n" "grep --include Info.plist -A 1 -r \"<key>CFBundleIdentifier</key>\" *" 
-
-
-
-printf "\n\t%s" "Symbolic Link Test: "
-# expect 0, now with new Mac App layout
-EXPECTED_LINKS=0
-## M builds still have 32 bit Mac's
-#if [[ ${BUILD_TYPE} == "M" ]]
-#then
-#    EXPECTED_LINKS=$(( ${NPRODUCTS} * 2 ))
-#fi
-## add one, for the 'rt'. Always only 64 bit.
-#EXPECTED_LINKS=$(( $EXPECTED_LINKS + 1 ))
-
-nLinks=$( find ${ECLIPSE_BUILD_DIR}/ -lname "*eclipse" -or -lname "*rt" | wc -l ) 
-
-if [[ $nLinks != "$EXPECTED_LINKS" ]]
-then 
-    printf "\n\tERROR: %s\n" "The number of symbolic links was not as expected (expected $EXPECTED_LINKS, found $nLinks)"
-    # should "count errors" as we get other tests
-    : $((NERRORS++))
-else
-    printf "\t%s\n" "Ok. Found ${nLinks}."
-fi
-
-if [[ $NERRORS != 0 ]]
-then
-    printf "\n\t%s\n" "Exiting ${0##*/} with errors: $NERRORS"
-fi
-exit $NERRORS
-
diff --git a/production/createReports.sh b/production/createReports.sh
deleted file mode 100755
index 995c2ff..0000000
--- a/production/createReports.sh
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2019 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-
-# Assuming this is ran before "promote", so data is read and written to build machine,
-# and then will be promoted with rest of build.
-
-echo -e "\n\n${0##*/} starting"
-source localBuildProperties.shsource 2>/dev/null
-
-JAVA_11_HOME=/opt/public/common/java/openjdk/jdk-11_x64-latest
-export JAVA_HOME=${JAVA_11_HOME}
-
-# BUILD_ID is normally provided as an environment variable, but
-# can provide a default here (especially useful for local testing).
-# But best to leave commented out if not doing testing script since 
-# otherwise may miss finding script errors.
-#buildIdToTest=${BUILD_ID:-"I20160314-2000"}
-buildIdToTest=${BUILD_ID}
-
-
-echo -e "\tbuildIdToTest: ${BUILD_ID}"
-# default is "latest release" though that typically only applies to M-builds.
-# so does not do much good to specify it here.
-# TODO: we could have a "previous_release" sort of variable that 
-# would be defined in parent pom or build_eclipse_org.shsource so that
-# we do not need to change this source. 
-buildIdToCompare="4.15/R-4.15-202003050155"
-
-build_type=${buildIdToTest:0:1}
-echo -e "\tbuild_type: ${build_type}"
-build_dir_root="${BUILD_HOME}/4${build_type}/siteDir/eclipse/downloads/drops4"
-
-build_update_root="${BUILD_HOME}/4${build_type}/siteDir/updates"
-dl_dir_root="/home/data/httpd/download.eclipse.org/eclipse/downloads/drops4"
-repo_root="/home/data/httpd/download.eclipse.org/eclipse/updates"
-
-function latestSimpleRepo
-{
-  if [[ $# != 2 ]]
-  then
-    echo "\n\t[ERROR] Program error. ${0##*/} requires parent directory of simple repositories and name pattern of repo required, such as M20*."
-    exit 9
-  fi
-  parentDir=$1
-  namePattern=$2
-  latestDLrepo=$(find ${parentDir} -maxdepth 1 -name ${namePattern} -type d | sort | tail -1)
-  # we want to return only the "last part" of the directory name, since 
-  # rest of code is expecting that. Rest of code could be modified so it took
-  # "whole path", but that change should be done under separate bug, if/when desired.
-  latestDLrepoSegment=${latestDLrepo##*/}
-  # this echo is our "return" value, so can not echo anything else
-  echo ${latestDLrepoSegment}
-}
-
-if [[ ${build_type} == "I" ]]
-then
-  update_dir_segment="4.16-I-builds"
-  buildIdToCompare="4.15/R-4.15-202003050155"
-  echo -e "\tlatest_R_build: R-4.15-202003050155"
-elif [[ ${build_type} == "Y" ]]
-then
-  update_dir_segment="4.16-Y-builds"
-  # Note: we use same value for Y-builds as for I-builds, since conceptually
-  # they are the same, except that Y-builds use some code from BETA_JAVA12 branch.
-  latest_I_build=$(latestSimpleRepo "${repo_root}/4.16-I-builds" "I20*")
-  RC=$?
-  if [[ $RC != 0 ]]
-  then
-    exit $RC
-  fi
-  echo -e "\tlatest_I_build: $latest_I_build"
-  buildIdToCompare="4.16-I-builds/${latest_I_build}"
-else
-  echo -e "\nERROR: Unhandled build type: ${build_type} so update_dir_segment undefined: $update_dir_segment"
-  echo -e "\n\tand repo reports not produced."
-  #TODO: we *might* want to do an 'exit 1' here (or similar) but we may also simply have a releng tests
-  #      that "fails" if the reports do not exists.
-fi
-echo -e "\tbuildIdToCompare: ${buildIdToCompare}"
-if [[ -n "$update_dir_segment" ]]
-then
-  buildToTest="${build_update_root}/${update_dir_segment}/${buildIdToTest}"
-
-  buildToCompare="${repo_root}/${buildIdToCompare}"
-
-  app_area="${build_dir_root}/${buildIdToTest}"
-
-  output_dir="${build_dir_root}/${buildIdToTest}/buildlogs"
-  #remove and re-create in case 'reports' exists from a previous run (eventually will not be needed)
-  if [[ -e ${output_dir}/reporeports ]]
-  then
-    rm -rf ${output_dir}/reporeports
-  fi
-  # just in case does not exist yet
-  mkdir -p ${output_dir}
-
-  # This analyzersBuildId can (currently) be found by "drilling down" at 
-  # https://download.eclipse.org/cbi/updates/analyzers/4.10/
-  # analyzersBuildId=I20161201-1633
-  # We use analyzer from hipp this way we have one less version to track
-  tar_name=org.eclipse.cbi.p2repo.analyzers.product-linux.gtk.x86_64.tar.gz
-
-  report_app_area="${app_area}/reportApplication"
-
-  if [[ -z "${TMP_DIR}" ]]
-  then
-    echo -e "\n\tERROR: TMP_DIR surprisingly not defined.\n"
-    echo -e "\n\t\tThus stopping create report, but exiting with 0\n"
-    exit 0
-  fi
-  if [[ ! -d "${TMP_DIR}" ]]
-  then
-    echo -e "\n\tERROR: TMP_DIR surprisingly did not exist  at ${TMP_DIR}.\n"
-    echo -e "\n\t\tSo, creating ${TMP_DIR}\n"
-    mkdir -p ${TMP_DIR}
-  fi
-
-  # turned off proxy for now. Ideally would set proper environment variables!
-  # Let's fetch always. otherwise we'll miss any upgrades
-  wget --no-proxy --no-verbose --no-cache -O "${TMP_DIR}/${tar_name}" https://ci.eclipse.org/cbi/job/cbi.p2repo.analyzers_cleanAndDeploy/lastSuccessfulBuild/artifact/output/products/${tar_name} 2>&1
-  
-  # always extract anew each time.
-  if [[ -e ${report_app_area} ]]
-  then
-    rm -fr ${report_app_area}
-  fi
-  mkdir -p ${report_app_area}
-
-  echo -e "\n\tExtracting: ${TMP_DIR}/${tar_name}"
-
-  tar -xf "${TMP_DIR}/${tar_name}" -C ${report_app_area}
-
-  # first do the "old" (normal) case
-  ${report_app_area}/p2analyze/p2analyze -data ${output_dir}/workspace-report -vm ${JAVA_11_HOME}/bin -vmargs -Xmx1g \
-    -DreportRepoDir=${buildToTest} \
-    -DreportOutputDir=${output_dir} \
-    -DreferenceRepo=${buildToCompare}
-fi
diff --git a/production/description.txt b/production/description.txt
deleted file mode 100644
index 2b547ba..0000000
--- a/production/description.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-The scripts in this directory are intended for production builds on build.eclipse.org.
-
-None of them should be required for normal "maven builds".
-
-Most of them would not work well for local builds or "casual use" as they
-will tag repos, commit changes, and similar.
diff --git a/production/devutils/description.txt b/production/devutils/description.txt
deleted file mode 100644
index aa7dd8a..0000000
--- a/production/devutils/description.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-Files in this directory are not required for normal Maven/Tycho builds.
-
-They can be handy, though for release engineers or others that are developing the build itself.
\ No newline at end of file
diff --git a/production/devutils/submodule_pull.sh b/production/devutils/submodule_pull.sh
deleted file mode 100755
index 9a732d4..0000000
--- a/production/devutils/submodule_pull.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-# for this branch.
-# the branches of submodules should match what is in ../streams/repositories.txt
-# This script assumes aggregator project has been cloned,
-# and submodules initially 'updated', as per
-# https://wiki.eclipse.org/Platform-releng/Platform_Build#cloning_platform_source_tree
-#
-# intended to be (temporarily) 'moved up' several directories to get to correct location
-branch=master
-#branch=R4_5_maintenance
-echo rt.equinox.bundles ; cd ../rt.equinox.bundles ; git fetch; git checkout ${branch} ; git pull ;
-echo rt.equinox.framework ; cd ../rt.equinox.framework ; git fetch; git checkout ${branch} ; git pull ;
-echo rt.equinox.binaries ; cd ../rt.equinox.binaries ; git fetch; git checkout ${branch} ; git pull ;
-echo rt.equinox.p2 ; cd ../rt.equinox.p2 ; git fetch; git checkout ${branch} ; git pull ;
-echo eclipse.jdt.core.binaries ; cd ../eclipse.jdt.core.binaries ; git fetch; git checkout ${branch} ; git pull ;
-echo eclipse.jdt.core ; cd ../eclipse.jdt.core ; git fetch; git checkout ${branch} ; git pull ;
-echo eclipse.jdt.debug ; cd ../eclipse.jdt.debug ; git fetch; git checkout ${branch} ; git pull ;
-echo eclipse.jdt ; cd ../eclipse.jdt ; git fetch; git checkout ${branch} ; git pull ;
-echo eclipse.jdt.ui ; cd ../eclipse.jdt.ui ; git fetch; git checkout ${branch} ; git pull ;
-echo eclipse.pde ; cd ../eclipse.pde ; git fetch; git checkout ${branch} ; git pull ;
-echo eclipse.pde.build ; cd ../eclipse.pde.build ; git fetch; git checkout ${branch} ; git pull ;
-echo eclipse.pde.ui ; cd ../eclipse.pde.ui ; git fetch; git checkout ${branch} ; git pull ;
-echo eclipse.platform.debug ; cd ../eclipse.platform.debug ; git fetch; git checkout ${branch} ; git pull ;
-echo eclipse.platform.resources ; cd ../eclipse.platform.resources ; git fetch; git checkout ${branch} ; git pull ;
-echo eclipse.platform ; cd ../eclipse.platform ; git fetch; git checkout ${branch} ; git pull ;
-echo eclipse.platform.common ; cd ../eclipse.platform.common ; git fetch; git checkout ${branch} ; git pull ;
-echo eclipse.platform.releng ; cd ../eclipse.platform.releng ; git fetch; git checkout ${branch} ; git pull ;
-echo eclipse.platform.runtime ; cd ../eclipse.platform.runtime ; git fetch; git checkout ${branch} ; git pull ;
-echo eclipse.platform.team ; cd ../eclipse.platform.team ; git fetch; git checkout ${branch} ; git pull ;
-echo eclipse.platform.text ; cd ../eclipse.platform.text ; git fetch; git checkout ${branch} ; git pull ;
-echo eclipse.platform.ua ; cd ../eclipse.platform.ua ; git fetch; git checkout ${branch} ; git pull ;
-echo eclipse.platform.ui ; cd ../eclipse.platform.ui ; git fetch; git checkout ${branch} ; git pull ;
-echo eclipse.platform.ui.tools ; cd ../eclipse.platform.ui.tools ; git fetch; git checkout ${branch} ; git pull ;
-echo eclipse.platform.swt ; cd ../eclipse.platform.swt ; git fetch; git checkout ${branch} ; git pull ;
-echo eclipse.platform.swt.binaries ; cd ../eclipse.platform.swt.binaries ; git fetch; git checkout ${branch} ; git pull ;
diff --git a/production/dirtReport.sh b/production/dirtReport.sh
deleted file mode 100755
index 0e4256e..0000000
--- a/production/dirtReport.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-
-# Utility to log "dirt report"
-# The required variables are expected to be in "env_file", 
-# but of all those, 
-# we need 
-#    aggDir: top of working tree (absolute patch to aggregation module directory)
-#    BUILD_ID: needed to "pretty print" to top of report. 
-# output goes to "std out", and assume it is captured by calling program, as desired.
-
-if [ $# -ne 1 ]; then
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-if [ ! -r "$1" ]; then
-  echo "$1" cannot be read
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-source "$1"
-
-printf "\n\t%s\n\n" "Dirt Report for $BUILD_ID" 
-git -C "$aggDir" status --short --ignore-submodules
-git -C "$aggDir" submodule foreach git status --short --ignore-submodules
diff --git a/production/gather-parts.sh b/production/gather-parts.sh
deleted file mode 100755
index a33ef7c..0000000
--- a/production/gather-parts.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-#
-
-if [ $# -ne 1 ]; then
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-if [ ! -r "$1" ]; then
-  echo "$1" cannot be read
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-source "$1"
-
-export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
-
-source $SCRIPT_PATH/build-functions.shsource
-
-cd $BUILD_ROOT
-
-# derived values
-gitCache=$( fn-git-cache "$BUILD_ROOT" )
-aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
-
-if [ -z "$BUILD_ID" ]; then
-  BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
-fi
-
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM")
-basebuilderDir=$( fn-basebuilder-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" )
-
-# copy "mvn.properties" created/saved by parent pom to buildDirectory,
-# so can more easily be used by other scripts, reports, php page?
-# Note: likely need to "fixup" some variables to be usable by PHP.
-cp "${aggDir}/eclipse-platform-parent/target/mavenproperties.properties" "${buildDirectory}/mavenproperties.properties"
-
-$SCRIPT_PATH/getEBuilderForDropDir.sh $buildDirectory $EBUILDER_HASH
-
-fn-checkout-basebuilder "$basebuilderDir"
-
-launcherJar=$( fn-basebuilder-launcher "$basebuilderDir" )
-
-# if doing PATCH_BUILD we do not need these first 4
-if [[ -z "${PATCH_BUILD}" ]]
-then
-  fn-gather-sdk "$BUILD_ID" "$aggDir" "$buildDirectory"
-  fn-gather-platform "$BUILD_ID" "$aggDir" "$buildDirectory"
-  fn-gather-swt-zips "$BUILD_ID" "$aggDir" "$buildDirectory"
-  fn-gather-test-zips "$BUILD_ID" "$aggDir" "$buildDirectory"
-fi
-# but we do (always) need these, at least for JDT patch build
-fn-gather-repo "$BUILD_ID" "$aggDir" "$buildDirectory"
-fn-gather-ecj-jars "$BUILD_ID" "$aggDir" "$buildDirectory"
-
-fn-gather-buildnotes "$BUILD_ID" "$aggDir" "$buildDirectory"
-fn-gather-artifactcomparisons "$BUILD_ID" "$aggDir" "$buildDirectory"
-
-# if doing PATCH_BUILD we do not need to slice repos
-if [[ -z "${PATCH_BUILD}" ]]
-then
-  # Note, we check for error here, because of all these functions this is one
-  # that I've seen occur once.
-  fn-slice-repos "$BUILD_ID" "$aggDir" "$buildDirectory" "$launcherJar"
-  RC=$?
-  if [[ $RC != 0 ]]
-  then
-    BUILD_FAILED_OUTPUT="${buildDirectory}/buildFailed-gather-parts"
-    echo "   ERROR: a function from gather-parts.sh returned non-zero return code, $RC" >>${BUILD_FAILED_OUTPUT}
-    exit $RC
-  fi
-fi 
-
-exit 0
-
diff --git a/production/get-aggregator.sh b/production/get-aggregator.sh
deleted file mode 100755
index bd51117..0000000
--- a/production/get-aggregator.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-#
-
-if [ $# -ne 1 ]; then
-  echo USAGE: $0 env_file
-  touch "${buildDirectory}/buildFailed-get-aggregator"
-  exit 1
-fi
-
-if [ ! -r "$1" ]; then
-  echo "$1" cannot be read
-  echo USAGE: $0 env_file
-  touch "${buildDirectory}/buildFailed-get-aggregator"
-  exit 1
-fi
-
-source "$1"
-
-export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
-
-source $SCRIPT_PATH/build-functions.shsource
-
-cd $BUILD_ROOT
-
-# derived values
-gitCache=$( fn-git-cache "$BUILD_ROOT" )
-aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
-
-if [[ -r "$aggDir" ]]
-then
-  fn-git-clean-aggregator2 "$aggDir" "${BRANCH}"
-  RC=$?
-  if [[ $RC == 0 ]]
-  then
-    pushd "$aggDir"
-    fn-git-pull
-    RC=$?
-    if [[ $RC == 0 ]]
-    then
-      fn-git-submodule-update
-      RC=$?
-      popd
-    fi
-  fi
-else
-  fn-git-clone-aggregator "$gitCache" \
-    $(fn-local-repo "$AGGREGATOR_REPO") "${BRANCH}"
-  RC=$?
-fi
-
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" )
-
-if [[ $RC != 0 ]]
-then
-  # create as "indicator file" ... gets filled in more once there is a log to grep
-  touch  "${buildDirectory}/buildFailed-get-aggregator"
-  echo "ERROR: get-aggregator returned non-zero return code: $RC"
-  echo "       assuming 'master' for EBUILDER_HASH (for later use), since could not reliably get aggregator."
-  EBUILDER_HASH=master
-  fn-write-property EBUILDER_HASH
-  exit $RC
-fi
-
-
-pushd "$aggDir"
-# save current hash tag value for documenting build (e.g. to reproduce, run tests, etc.)
-EBUILDER_HASH=$( git show-ref --hash --verify refs/remotes/origin/${BRANCH} )
-checkForErrorExit $? "git show-ref --hash failed for refs/remotes/origin/${BRANCH}. Not valid ref?"
-# remember, literal name as argument ... its defrefernced in function
-fn-write-property EBUILDER_HASH
-# write to "relengdirectory.txt", as a double check on build input"
-# In particular, this "early one" is the "starting point".
-# By the time we do a build and commit submodules, there would
-# be a different one that is tagged with buildId. I'm thinking it is the latter that would be needed
-# to "reproduce a build" but this early one may be important to debug what went wrong with a build.
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" )
-
-echo "# Build ${BUILD_ID}, ${BUILD_PRETTY_DATE}" > ${logsDirectory}/relengdirectory.txt
-echo "# " >> ${logsDirectory}/relengdirectory.txt
-echo "# This is a listing of reverse lookup of commits and tags in a build."  >> ${logsDirectory}/relengdirectory.txt
-echo "# It is intended to serve as double check or source of debug information if something appears wrong with a build."  >> ${logsDirectory}/relengdirectory.txt
-echo "# "  >> ${logsDirectory}/relengdirectory.txt
-echo "# Starting point, directing build:" >> ${logsDirectory}/relengdirectory.txt
-echo "$AGGREGATOR_REPO $BRANCH $EBUILDER_HASH"  >> ${logsDirectory}/relengdirectory.txt
-echo "# " >> ${logsDirectory}/relengdirectory.txt
-popd
-
diff --git a/production/getEBuilderForDropDir.sh b/production/getEBuilderForDropDir.sh
deleted file mode 100755
index d8b29b4..0000000
--- a/production/getEBuilderForDropDir.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-
-# version in master
-
-# Utility script to get "ebuilder"
-printf "\n\tDEBUG: %s\n" "executing ${0}"
-printf "\t\t\t%s\n" "As called from ${FUNCNAME[1]}, called from line number ${BASH_LINENO[0]} in ${BASH_SOURCE[1]}."
-
-export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
-printf "\n\tINFO: %s\n" "SCRIPT_PATH: $SCRIPT_PATH"
-source $SCRIPT_PATH/build-functions.shsource
-
-BUILD_DIR=$1
-EBUILDER_HASH=$2
-
-
-if [[ -z "${BUILD_DIR}" ]]
-then
-  printf "\n\tWARNING: %s\n" "BUILD_DIR not defined, assuming $BUILD_DIR"
-  BUILD_DIR=${PWD}
-else
-  # normally will exist by now, but if not, we'll create it.
-  if [[ ! -d "${BUILD_DIR}" ]]
-  then
-    printf "\n\tWARNING: %s\n" "BUILD_DIR did not exist when expected. Creating $BUILD_DIR"
-    mkdir -p $BUILD_DIR
-  fi
-fi
-
-if [[ -z "${EBUILDER_HASH}" ]]
-then
-  echo "EBUILDER HASH, BRANCH, or TAG was not supplied, assuming 'master'"
-  EBUILDER_HASH=master
-fi
-
-EBUILDER=eclipse.platform.releng.aggregator
-# derived values
-gitCache=$( fn-git-cache "$BUILD_ROOT")
-aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
-
-RC=0
-
-# don't clone, if already exists.
-# TODO: could do more error checking, if hash is what we expect, 
-# if the zip file already exists. But 99.99% sure all is fine, 
-# if this directory already exists. Might be an issue in resuming 
-# a failed build, without cleaning everything first? (Which we currently 
-# do not do.) Even then, might be best to delete everything, including 
-# the zip, and re-clone. It is, after all, a detached head.
-if [[ ! -d ${BUILD_DIR}/${EBUILDER} ]]
-then
-  # Not sure 'REPO_AND_ACCESS' is defined in all possible scenarios, so we'll provide a default.
-  # It is in main scenarios, but not sure about things like "re-running unit tests at a later time".
-  # If directory doesn't exist yet, create it first, so we can assign proper access
-  # permissions for later "clean up" routines.
-  # Permissions not correct for this 'mkdir' so we will use same trick as in bootstrapVariables
-  # see https://bugs.eclipse.org/bugs/show_bug.cgi?id=492493
-  # mkdir -p "${BUILD_DIR}/${EBUILDER}"
-  # chmod -c g+ws "${BUILD_DIR}/${EBUILDER}"
-  # BUILD_DIR pretty much has to exist at this point, but in case not: 
-  mkdir -p "${BUILD_DIR}"
-  pushd "${BUILD_DIR}"
-  mkdir "${EBUILDER}"
-  popd
-  
-  # note the use of "reference" ... we typically only need a little bit of
-  # new stuff, that the gitCache version doesn't have already, if any.
-  echo "Doing git clone using:  --reference  \${aggDir} \${AGGREGATOR_REPO} \${BUILD_DIR}/\${EBUILDER}"
-  echo "which evaluates to git clone  --reference  ${aggDir} ${AGGREGATOR_REPO} ${BUILD_DIR}/${EBUILDER}"
-  git clone --reference  ${aggDir} ${AGGREGATOR_REPO} ${BUILD_DIR}/${EBUILDER}
-  RC=$?
-  if [[ $RC != 0 ]]
-  then
-    echo "[ERROR] Cloning EBUILDER returned non zero return code: $RC"
-    exit $RC
-  fi
-
-  echo "INFO: ebuilder directory cloned."
-  echo "INFO:    Location: ${BUILD_DIR}/${EBUILDER}"
-  echo "INFO:    checking out specific HASH (which will make it detached)."
-  pushd ${BUILD_DIR}/${EBUILDER}
-  git checkout $EBUILDER_HASH
-  RC=$?
-  if [[ $RC != 0 ]]
-  then
-    echo "[ERROR] Checking out EBUILDER for $EBUILDER_HASH returned non zero return code: $RC"
-    exit $RC
-  fi
-  popd
-
-  # prepare a (small) zip, for easy retrieval of "production" files, during unit tests on Hudson.
-  # This basic function used to be provided by CGit, but was turned off for "snapshots" of commits,
-  # and was a bit overkill for those doing their own "remote" test builds (or tests).
-  # This small zip is stored, unadvertised, on download site, and retrieved as part of the
-  # Hudson test "bootstrap". The "production" directory in general, though, is also
-  # used during the build itself.
-  # (hard to know "where" we are at ... so we'll make sure.
-  printf "\n\tDEBUG: %s\n" "About to create EBuilder zip: ${EBUILDER}-${EBUILDER_HASH}.zip"
-  pushd ${buildDirectory}
-  zip -r "${buildDirectory}/${EBUILDER}-${EBUILDER_HASH}.zip"  "${EBUILDER}/production/testScripts"
-  popd
-  exit $RC
-fi
diff --git a/production/git-doclog b/production/git-doclog
deleted file mode 100755
index 8fa9896..0000000
--- a/production/git-doclog
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-
-GITCOMMIT=$( git rev-parse HEAD )
-#GITDATE=$( git log -1 --format="%H%n%aD" --date=short )
-
-# we go to a lot of trouble here, just to get
-# short form, in prettiest way, using git commands
-# as much a possible, instead of heuristic parsing.
-git symbolic-ref --quiet HEAD >/dev/null
-if (( $? == 0 ))
-then
-    GITBRANCH=$( git rev-parse --abbrev-ref HEAD )
-else
-    GITBRANCH='[Not on a branch]'
-fi
-
-GITTAG=$( git describe --abbrev=0 --exact-match --contains --tags $GITCOMMIT )
-#echo "GITTAG: $GITTAG"
-SHORT_TAG=${GITTAG##*/}
-#echo "SHORT_TAG: $SHORT_TAG"
-
-#echo "pwd: ${PWD}"
-REPONAME=${PWD##*/}
-
-case "$REPONAME" in
-    eclipse.platform*)
-        REPOROOT="platform";;
-    eclipse.jdt*)
-        REPOROOT="jdt";;
-    eclipse.pde*)
-        REPOROOT="pde";;
-    rt.equinox*)
-        REPOROOT="equinox";;
-    *)
-        echo "WARNING: unrecognized reponame pattern for $REPONAME";;
-esac
-#echo "REPOROOT: $REPOROOT"
-#echo "reponame: ${REPONAME}"
-#echo "git_dir: $GIT_DIR"
-# git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc
-# git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
-REMOTETAG=$( git ls-remote --tags git://git.eclipse.org/gitroot/${REPOROOT}/${REPONAME}.git $SHORT_TAG )
-if [[ -z "${REMOTETAG}" ]]
-then
-    REMOTETAG='[No tag in remote (canonical) repository]'
-else
-    REMOTETAG=${REMOTETAG##*/}
-fi
-#echo "REMOTETAG: $REMOTETAG"
-printf "  %s \t%s \t%s \t%s \t%s \n" "$REPONAME $GITCOMMIT $GITBRANCH $SHORT_TAG $REMOTETAG"
diff --git a/production/git-submodule-checkout.sh b/production/git-submodule-checkout.sh
deleted file mode 100755
index 8374c6d..0000000
--- a/production/git-submodule-checkout.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-#
-
-# TODO: this script is called with repoScript=$( echo $SCRIPT_PATH/git-submodule-checkout.sh )
-# so any echo messages and exit codes are being "eaten" by the eval clause.
-# But, not sure it needs to be evaled for repoScript?
-# If needed, will need to write to "buildFailed_ type of file, then check for that file
-# after its called. But, for now, will write to TRACE_OUTPUT
-
-REPOSITORIES_TXT="$1"; shift
-name="$1"; shift
-
-VAL=$( grep "^${name}:" "$REPOSITORIES_TXT" | cut -f2 -d" ")
-
-# Here we count on $BUILD_TYPE being exported. TODO: make parameter later?
-if [[ -n "$BUILD_TYPE" && "$BUILD_TYPE" == "N" ]]
-then
-  if [[ "master" != $VAL ]]
-  then
-    echo "INFO: Branch forced to 'master', instead of '$VAL', since doing N-Build" >> ${TRACE_OUTPUT}
-    VAL="master"
-  fi
-fi
-
-
-if [ -z "$VAL" ]; then
-  echo "WARNING: No tag or branch specified for $name in repositories_${PATCH_OR_BRANCH_LABEL}.txt" >> ${TRACE_OUTPUT}
-  echo "   Has a submodule been added? Perhaps just commented out?" >> ${TRACE_OUTPUT}
-  echo "   Will use what ever was last added to aggregator"  >> ${TRACE_OUTPUT}
-  # is this ever an error?
-  exit
-fi
-
-# always fetch before checkout, to be sure new
-# branches are in local repo (in case we are switching
-# to a new branch or tag).
-git fetch
-RC=$?
-if [[ $RC != 0 ]]
-then
-  echo "ERROR: Return code of $RC during fetch of $name repository" >> ${TRACE_OUTPUT}
-  exit $RC
-fi
-
-if [ -z "$(git tag -l $VAL)" ]; then
-  echo Updating branch $VAL
-  git checkout $VAL
-  RC=$?
-  if [[ $RC != 0 ]]
-  then
-    echo "ERROR: Return code of $RC during checkout of $VAL for repository $name" >> ${TRACE_OUTPUT}
-    exit $RC
-  fi
-  git pull
-  RC=$?
-  if [[ $RC != 0 ]]
-  then
-    echo "ERROR: Return code of $RC during pull for repository $name" >> ${TRACE_OUTPUT}
-    exit $RC
-  fi
-else
-  echo Updating to tag $VAL
-  git checkout $VAL
-  RC=$?
-  if [[ $RC != 0 ]]
-  then
-    echo "ERROR: Return code of $RC during checkout of $VAL for repository $name" >> ${TRACE_OUTPUT}
-    exit $RC
-  fi
-fi
diff --git a/production/glossary.html b/production/glossary.html
deleted file mode 100644
index 222fa20..0000000
--- a/production/glossary.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta
-  http-equiv="Content-Type"
-  content="text/html; charset=UTF-8" />
-<title>Glossary of variables</title>
-</head>
-<body>
-<p>WORK IN (slow) PROGRESS </p>
-  <dl>
-    <dt>BUILD_HOME</dt>
-    <dd>The top most directory of all builds, regardless of stream or type.</dd>
-    <dt>BUILD_TYPE</dt>
-    <dd>
-      The "type" of build according to out conventions: IMNYYP. Note we do not "build" S builds or R builds. 
-      They are always the result of renaming. <sup><a href="#fn1" id="r1">[1]</a></sup>
-    </dd>
-  </dl>
-
-
-
-  <section>
-  <p id="fn1">
-    <a href="#r1">[1]</a>Renaming in our system always means to make a copy of the original, rename the copy, and mv the copy back to the original.
-  </section>
-</body>
-</html>
\ No newline at end of file
diff --git a/production/manually_test_createReports.sh b/production/manually_test_createReports.sh
deleted file mode 100755
index 6a43f87..0000000
--- a/production/manually_test_createReports.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-
-# This is a small utility to test "createReports.sh" since it depends on 
-# only a few variables (and many assumptions!) that it can be run 
-# standalone. 
-
-# typically only BUILD_ID needs to be changed for a new test. 
-export BUILD_ID=I20160816-1015
-
-export BUILD_HOME=/shared/eclipse/builds
-export TMP_DIR=/shared/eclipse/tmp
-# for testing, asssume createReports.sh is in same directory as 
-# manually_test_createReports.sh (Does not matter which directory 
-# they are in). 
-./createReports.sh
-RC=$?
-if [[ $RC != 0 ]] 
-then 
-    echo -e "\n\t[ERROR] createReports.sh returned non-zero error code: $RC"
-fi
-
-
diff --git a/production/master-build.sh b/production/master-build.sh
deleted file mode 100755
index 96e2c37..0000000
--- a/production/master-build.sh
+++ /dev/null
@@ -1,537 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2019 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-
-# this localBuildProperties.shsource file is to ease local builds to override some variables.
-# It should not be used for production builds.
-source localBuildProperties.shsource 2>/dev/null
-
-if [ $# -ne 1 ]; then
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-INITIAL_ENV_FILE=$1
-
-
-if [ ! -r "$INITIAL_ENV_FILE" ]; then
-  echo "$INITIAL_ENV_FILE" cannot be read
-  echo USAGE: $0 env_file
-  exit 1
-fi
-if [[ "${RUNNING_ON_HUDSON}" == "true" ]]
-then
-  export SCRIPT_PATH="${UTILITIES_HOME}"
-else
-  export SCRIPT_PATH="${BUILD_ROOT}/production"
-fi
-export PROMOTION_SCRIPT_PATH="$SCRIPT_PATH/sdk/promotion"
-
-source "${SCRIPT_PATH}/build-functions.shsource"
-
-source "${INITIAL_ENV_FILE}"
-
-source "${SCRIPT_PATH}/bashUtilities.shsource"
-source "${SCRIPT_PATH}/bootstrapVariables.shsource"
-
-
-assertNotEmpty gitCache
-assertNotEmpty aggDir
-assertNotEmpty BUILD_ID
-assertNotEmpty buildDirectory
-
-# Temporarily set on production build. See bug 492502. 
-# Remember, only this specific setting (line) is to be removed later. 
-# the construct in general can be used for local builds, and has been, for a while. 
-CUSTOM_SETTINGS_FILE=${CUSTOM_SETTINGS_FILE:-"/shared/eclipse/settings/settingsBuildMachine.xml"}
-if [[ -r "${CUSTOM_SETTINGS_FILE}" ]]
-then
-    export MAVEN_SETTINGS="--settings ${CUSTOM_SETTINGS_FILE}"
-fi
-
-# remember, local "test builds" that use this script must change
-# or override 'GIT_PUSH' to simply echo, not actually push. Only
-# genie.releng should 'push' these tags.
-#GIT_PUSH='echo git push'
-if [[ "${testbuildonly}" == "true" ]]
-then
-  GIT_PUSH='echo no git push since testbuildonly'
-fi
-
-if [[ "${BUILD_TYPE}" == "N" ]]
-then
-  GIT_PUSH='echo no git push done since Nightly'
-fi
-if [[ "${BUILD_TYPE}" == "X" ]]
-then
-  GIT_PUSH='echo no git push done since Experimental build'
-fi
-GIT_PUSH=${GIT_PUSH:-'git push'}
-
-
-cd $BUILD_ROOT
-
-buildrc=0
-
-# derived values
-
-# correct values for cbi-jdt-repo.url and cbi-jdt-version are
-# codified in the parent pom. These variables give an easy way
-# to test "experimental versions" in production-like build.
-
-if [[ -n $CBI_JDT_REPO_URL ]]
-then
-  export CBI_JDT_REPO_URL_ARG="-Dcbi-jdt-repo.url=$CBI_JDT_REPO_URL"
-fi
-if [[ -n $CBI_JDT_VERSION ]]
-then
-  export CBI_JDT_VERSION_ARG="-Dcbi-jdt-version=$CBI_JDT_VERSION"
-fi
-
-assertNotEmpty buildDirectory
-echo "buildDirectory: >${buildDirectory}<"
-
-export logsDirectory="${buildDirectory}/buildlogs"
-mkdir -p "${logsDirectory}"
-checkForErrorExit $? "Could not create buildlogs directory: ${logsDirectory}"
-
-export loadLog=${loadLog:-"${logsDirectory}/loadLog.txt"}
-# First step uses '>' to start fresh. Subsequent should use '>>'
-printf "%-35s %s\n" "Load at build start: " "$(uptime)" > ${loadLog}
-
-LOG=$buildDirectory/buildlogs/buildOutput.txt
-#exec >>$LOG 2>&1
-
-BUILD_PRETTY_DATE=$( date --date='@'$RAWDATE )
-TIMESTAMP=$( date +%Y%m%d-%H%M --date='@'$RAWDATE )
-
-# TRACE_OUTPUT is not normally used. But, it comes in handy for debugging
-# when output from some functions can not be written to stdout or stderr
-# (due to the nature of the function ... it's "output" being its returned value).
-# When needed for local debugging, usually more convenient to provide
-# a value relative to PWD in startup scripts.
-export TRACE_OUTPUT=${TRACE_OUTPUT:-$buildDirectory/buildlogs/trace_output.txt}
-echo $BUILD_PRETTY_DATE > ${TRACE_OUTPUT}
-
-assertNotEmpty buildDirectory
-# This file will hold "elapsed times" of various build steps
-export timeFile=${timeFile:-"${buildDirectory}/timesFile.txt"}
-
-# These files have variable/value pairs for this build, suitable for use in
-# shell scripts, PHP files, or as Ant (or Java) properties
-export BUILD_ENV_FILE=${buildDirectory}/buildproperties.shsource
-export BUILD_ENV_FILE_PHP=${buildDirectory}/buildproperties.php
-export BUILD_ENV_FILE_PROP=${buildDirectory}/buildproperties.properties
-
-# initially, for some reason, when "patching Tycho" I *had* to set
-# local repo to the .m2/repository. (bug 461718)
-export LOCAL_REPO="${BUILD_ROOT}/localMavenRepo"
-#export LOCAL_REPO="${HOME}/.m2/repository"
-
-# In production builds, we normally specify CLEAN_LOCAL,
-# and remove any existing LOCAL_REPO, and re-fetch.
-# But CLEAN_LOCAL can be overridden for remote builds, quick test builds,
-# etc.
-export CLEAN_LOCAL=${CLEAN_LOCAL:-true}
-# We "remove" by moving to backup, in case there's ever any reason to
-# compare "what's changed".
-if [[ -d ${LOCAL_REPO} && "${CLEAN_LOCAL}" == "true" ]]
-then
-  # remove existing backup, if it exists
-  # if build type is not N-build. Even for N-build, we clean if 
-  # the "day of the week" is Monday (day=1) so it is cleaned once 
-  # per week. We pick Monday since that is typically right before I-build, 
-  # so might avoid some surprises. 
-  if [[ "$BUILD_TYPE" =~ [MIXYPSU] || $(date +%u) == 1 ]]
-  then
-    rm -fr ${LOCAL_REPO}.bak 2>/dev/null
-    mv ${LOCAL_REPO} ${LOCAL_REPO}.bak
-  fi
-fi
-export STREAMS_PATH="${UTILITIES_HOME}/streams"
-
-BUILD_TYPE_NAME="Integration"
-if [ "$BUILD_TYPE" = M ]; then
-  BUILD_TYPE_NAME="Maintenance"
-elif [ "$BUILD_TYPE" = N ]; then
-  BUILD_TYPE_NAME="Nightly (HEAD)"
-elif [ "$BUILD_TYPE" = X ]; then
-  BUILD_TYPE_NAME="Experimental Branch"
-elif [ "$BUILD_TYPE" = Y ]; then
-  BUILD_TYPE_NAME="BETA_JAVA9 Branch"
-elif [ "$BUILD_TYPE" = U ]; then
-  BUILD_TYPE_NAME="BETA_JUNIT5 Branch"
-elif [ "$BUILD_TYPE" = P ]; then
-  BUILD_TYPE_NAME="Patch"
-elif [ "$BUILD_TYPE" = S ]; then
-  BUILD_TYPE_NAME="Stable (Milestone)"
-fi
-
-# we need this value for later, post build processing, so want it saved to variables file.
-# We can either compute here,
-# or just make sure it matches that is in parent pom for various streams (e.g. 4.3 vs 4.4)
-# and build types, (e.g. M vs. I). For N builds, we still use "I".
-# 5/31013. We no longer do the post build comparator, but leaving it, just
-# in case we want an occasionally double check ... but, should never be routine.
-#comparatorRepository=https://download.eclipse.org/eclipse/updates/4.4-I-builds
-comparatorRepository=NOT_CURRENTLY_USED
-
-GET_AGGREGATOR_BUILD_LOG="${logsDirectory}/mb010_get-aggregator_output.txt"
-TAG_BUILD_INPUT_LOG="${logsDirectory}/mb030_tag_build_input_output.txt"
-POM_VERSION_UPDATE_BUILD_LOG="${logsDirectory}/mb050_pom-version-updater_output.txt"
-RUN_MAVEN_BUILD_LOG="${logsDirectory}/mb060_run-maven-build_output.txt"
-GATHER_PARTS_BUILD_LOG="${logsDirectory}/mb070_gather-parts_output.txt"
-
-# These "build_dir" variables are needed for checksum URLs, in especially
-# after promotion to milestone or release. (see bug 435671)
-export BUILD_DIR_SEG=$BUILD_ID
-export EQ_BUILD_DIR_SEG=$BUILD_ID
-export TESTED_BUILD_TYPE=$BUILD_TYPE
-# These variables, from original env file, are re-written to BUILD_ENV_FILE,
-# with values for this build (some of them computed) partially for documentation, and
-# partially so this build can be re-ran or re-started using it, instead of
-# original env file, which would compute different values (in some cases).
-# The function also writes into appropriate PHP files and Properties files.
-# Init once, here at beginning, but don't close until much later since other functions
-# may write variables at various points
-fn-write-property-init
-fn-write-property PATH
-fn-write-property INITIAL_ENV_FILE
-fn-write-property BUILD_ROOT
-fn-write-property BRANCH
-fn-write-property STREAM
-fn-write-property STREAMMajor
-fn-write-property STREAMMinor
-fn-write-property STREAMService
-fn-write-property aggDir
-fn-write-property BUILD_ID
-fn-write-property BUILD_TYPE
-fn-write-property TESTED_BUILD_TYPE
-fn-write-property TIMESTAMP
-fn-write-property TMP_DIR
-fn-write-property JAVA_HOME
-fn-write-property MAVEN_OPTS
-fn-write-property MAVEN_PATH
-fn-write-property AGGREGATOR_REPO
-fn-write-property BASEBUILDER_TAG
-fn-write-property B_GIT_EMAIL
-fn-write-property B_GIT_NAME
-fn-write-property COMMITTER_ID
-fn-write-property MVN_DEBUG
-fn-write-property MVN_QUIET
-fn-write-property SIGNING
-fn-write-property REPO_AND_ACCESS
-fn-write-property MAVEN_BREE
-fn-write-property GIT_PUSH
-fn-write-property LOCAL_REPO
-fn-write-property SCRIPT_PATH
-fn-write-property STREAMS_PATH
-fn-write-property CBI_JDT_REPO_URL
-fn-write-property CBI_JDT_REPO_URL_ARG
-fn-write-property CBI_JDT_VERSION
-fn-write-property CBI_JDT_VERSION_ARG
-fn-write-property PATCH_BUILD
-fn-write-property ALT_POM_FILE
-fn-write-property JAVA_DOC_TOOL
-fn-write-property loadLog
-fn-write-property MAVEN_SETTINGS
-fn-write-property ANT_OPT
-fn-write-property JAVA_DOC_PROXIES
-# HTTPS_PROXY appears to be set by the infrastructure, 
-# the NO_PROXY and ALL_PROXY we set in boot strap file.
-fn-write-property HTTPS_PROXY
-# These definitions are primarily for Curl. (Wget and other programs use different env variables or parameters
-fn-write-property NO_PROXY
-fn-write-property ALL_PROXY
-
-
-# any value of interest/usefulness can be added to BUILD_ENV_FILE
-if [[ "${testbuildonly}" == "true" ]]
-then
-  fn-write-property testbuildonly
-fi
-
-# any value of interest/usefulness can be added to BUILD_ENV_FILE
-if [[ "${invisibleBuild}" == "true" ]]
-then
-  fn-write-property invisibleBuild
-fi
-
-# Temp variables
-#fn-write-property USING_TYCHO_SNAPSHOT
-fn-write-property PATCH_TYCHO
-fn-write-property PATCH_SWT
-#fn-write-property JAR_PROCESSOR_JAVA
-
-fn-write-property buildDirectory
-fn-write-property BUILD_ENV_FILE
-fn-write-property BUILD_ENV_FILE_PHP
-fn-write-property BUILD_ENV_FILE_PROP
-fn-write-property BUILD_DIR_SEG
-fn-write-property EQ_BUILD_DIR_SEG
-fn-write-property BUILD_PRETTY_DATE
-fn-write-property BUILD_TYPE_NAME
-fn-write-property TRACE_OUTPUT
-fn-write-property comparatorRepository
-fn-write-property logsDirectory
-fn-write-property BUILD_HOME
-
-BUILD_FAILED=""
-
-$SCRIPT_PATH/get-aggregator.sh $BUILD_ENV_FILE 2>&1 | tee ${GET_AGGREGATOR_BUILD_LOG}
-printf "%-35s %s\n" "Load after checkout: " "$(uptime)" >> ${loadLog}
-# if file exists, then get-aggregator failed
-if [[ -f "${buildDirectory}/buildFailed-get-aggregator" ]]
-then
-  buildrc=1
-  # Git sometimes fails (returns non-zero error codes) for "warnings".
-  # In most cases, but not all, these would be considered errors.
-  /bin/grep  "^warning: \|\[ERROR\]"  "${GET_AGGREGATOR_BUILD_LOG}" >> "${buildDirectory}/buildFailed-get-aggregator"
-  BUILD_FAILED="${BUILD_FAILED} \n${GET_AGGREGATOR_BUILD_LOG}"
-  fn-write-property BUILD_FAILED
-else
-  # if get-aggregator failed, there is no reason to try and update input or run build
-  $SCRIPT_PATH/update-build-input.sh $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/mb020_update-build-input_output.txt
-  checkForErrorExit $? "Error occurred while updating build input"
-
-
-  # We always make tag commits, if build successful or not, but don't push
-  # back to origin if doing N builds or test builds.
-  pushd "$aggDir"
-  git commit -m "Build input for build $BUILD_ID"
-  echo "RC from commit with $BUILD_ID: $?"
-  # exits with 1 here ... with warning, if commit already exists?
-  #checkForErrorExit $? "Error occurred during commit of build_id"
-
-  # GIT_PUSH just echos, for N builds and test builds
-  $GIT_PUSH origin HEAD
-  #checkForErrorExit $? "Error occurred during push of build_id commit"
-  popd
-
-  $SCRIPT_PATH/tag-build-input.sh $BUILD_ENV_FILE 2>&1 | tee $TAG_BUILD_INPUT_LOG
-  checkForErrorExit $? "Error occurred during tag of build input"
-  set -x
-  CHECK_SWT_INPUT=$logsDirectory/check-swt-buildinput_output.txt
-  $SCRIPT_PATH/check-swt-buildinput.sh $BUILD_ENV_FILE 2>&1 | tee $CHECK_SWT_INPUT
-  /bin/grep "SWT build input successful" $CHECK_SWT_INPUT 
-  if [ $? -ne 0 ]
-  then
-    buildrc=1
-    set +x
-    echo "BUILD FAILED. See ${CHECK_SWT_INPUT}." | tee "${buildDirectory}/buildFailed-swt-buildinput-error" 
-    BUILD_FAILED="${BUILD_FAILED} \n${CHECK_SWT_INPUT}"
-    fn-write-property BUILD_FAILED
-  else
-    # At this point, everything should be checked out, updated, and tagged
-    # (tagged unless N build or test build)
-    # So is a good point to capture listing of build input to directory.txt file.
-    # TODO: hard to find good/easy git commands that work for any repo,
-    # to query actual branches/commits/tags on remote, in a reliable way?
-    set +x
-    pushd "$aggDir"
-    # = = = = directtory.txt section
-    echo "# Build ${BUILD_ID}, ${BUILD_PRETTY_DATE}" > ${buildDirectory}/directory.txt
-
-    echo "# " >> ${buildDirectory}/directory.txt
-    echo "# This is simply a listing of repositories.txt. Remember that for N-builds, "  >> ${buildDirectory}/directory.txt
-    echo "# 'master' is always used, and N-builds are not tagged."  >> ${buildDirectory}/directory.txt
-    echo "# I and M builds are tagged with buildId: ${BUILD_ID} "  >> ${buildDirectory}/directory.txt
-    echo "# (when repository is a branch, which it typically is)."  >> ${buildDirectory}/directory.txt
-    echo "# " >> ${buildDirectory}/directory.txt
-
-    if [[ $BUILD_TYPE =~ [IMXYPU] ]]
-    then
-      AGGRCOMMIT=$( git rev-parse HEAD )
-      echo "eclipse.platform.releng.aggregator TAGGED: ${BUILD_ID}"  >> ${buildDirectory}/directory.txt
-      echo "       https://git.eclipse.org/c/platform/eclipse.platform.releng.aggregator.git/commit/?id=${AGGRCOMMIT}"  >> ${buildDirectory}/directory.txt
-    fi
-  
-    if [[ ! -e "$STREAMS_PATH/repositories_${PATCH_OR_BRANCH_LABEL}.txt" ]]
-    then 
-      echo -e "\n\t[ERROR] repositories file did not exist."
-      echo -e "\t[ERROR] expected file: repositories_${PATCH_OR_BRANCH_LABEL}.txt"
-      echo -e "\t[ERROR] to be in directory: $STREAMS_PATH\n"
-      exit 1
-    else 
-      echo -e "\n\t[INFO] Using repositories file: $STREAMS_PATH/repositories_${PATCH_OR_BRANCH_LABEL}.txt\n"
-    fi
-
-    echo "# " >> ${buildDirectory}/directory.txt
-    echo "# .../streams/repositories_${PATCH_OR_BRANCH_LABEL}.txt" >> ${buildDirectory}/directory.txt
-    echo "# " >> ${buildDirectory}/directory.txt
-    cat $STREAMS_PATH/repositories_${PATCH_OR_BRANCH_LABEL}.txt >> ${buildDirectory}/directory.txt
-    echo "# " >> ${buildDirectory}/directory.txt
-
-    echo -e "\n\n\n#git submodule status output:" >> ${buildDirectory}/directory.txt
-    git submodule status --recursive >> ${buildDirectory}/directory.txt
-    echo "# " >> ${buildDirectory}/directory.txt
-
-    # = = = = relengirectory.txt section
-    echo "# " >> ${logsDirectory}/relengdirectory.txt
-    echo "# Build Input: " >> ${logsDirectory}/relengdirectory.txt
-    $SCRIPT_PATH/git-doclog >> ${logsDirectory}/relengdirectory.txt
-    git submodule foreach --quiet $SCRIPT_PATH/git-doclog >> ${logsDirectory}/relengdirectory.txt
-    echo "# " >> ${logsDirectory}/relengdirectory.txt
-    popd
-
-    if [[ "true" == "${PATCH_TYCHO}" ]]
-    then
-      echo "About to patch Tycho. LOCAL_REPO: ${LOCAL_REPO}"
-      ${SCRIPT_PATH}/buildTycho.sh  2>&1 | tee ${logsDirectory}/tycho23.log.txt
-      rc=$?
-      echo "buildTycho returned $rc"
-      if [[ $rc != 0 ]]
-      then
-        echo "[ERROR] buildTycho.sh returned error code: $rc"
-        exit $rc
-      fi
-    fi
-
-    if [[ "true" == "${PATCH_SWT}" ]]
-    then
-      echo "About to patchSWT"
-      ${SCRIPT_PATH}/patchSWT.sh
-      rc=$?
-      echo "patchSWT returned $rc"
-      if [[ $rc != 0 ]]
-        then
-        echo "[ERROR] patchSWT returned error code: $rc"
-        exit $rc
-      fi
-    fi
-
-    CURL_EXE=$(which curl)
-    RC=$?
-    if [[ ! $RC == 0 ]]
-    then
-	    echo "curl not available please try again with curl installed"
-    fi
-    
-    parameterString="buildId=${BUILD_ID}"
-    ${CURL_EXE} "https://ci.eclipse.org/releng/view/Builds/job/create_source_bundle/buildWithParameters?token=SourceTar&$parameterString"
-
-    #pushd "$aggDir"
-    #mvn clean verify -DbuildId=$BUILD_ID -f eclipse-platform-sources/pom.xml
-    #popd
-  
-    #if [[ "true" == "${USING_TYCHO_SNAPSHOT}" || "true" == "${PATCH_TYCHO}" ]]
-    #then
-    #  echo "[WARNING] Did not run pom-version-updater due to other variable settings"
-    #else
-    $SCRIPT_PATH/pom-version-updater.sh $BUILD_ENV_FILE 2>&1 | tee ${POM_VERSION_UPDATE_BUILD_LOG}
-    printf "%-35s %s\n" "Load after run-version-updater: " "$(uptime)" >> ${loadLog}
-    #fi
-    # if file exists, pom update failed
-    if [[ -f "${buildDirectory}/buildFailed-pom-version-updater" ]]
-    then
-      buildrc=1
-      /bin/grep "\[ERROR\]" "${POM_VERSION_UPDATE_BUILD_LOG}" >> "${buildDirectory}/buildFailed-pom-version-updater"
-      echo "BUILD FAILED. See ${POM_VERSION_UPDATE_BUILD_LOG}."
-      BUILD_FAILED="${BUILD_FAILED} \n${POM_VERSION_UPDATE_BUILD_LOG}"
-      fn-write-property BUILD_FAILED
-    else
-      # if updater failed, something fairly large is wrong, so no need to compile,
-      # else, we compile - build here.
-      $SCRIPT_PATH/run-maven-build.sh $BUILD_ENV_FILE 2>&1 | tee ${RUN_MAVEN_BUILD_LOG}
-      printf "%-35s %s\n" "Load after run-maven-build: " "$(uptime)" >> ${loadLog}
-      # if file exists, then run maven build failed.
-      if [[ -f "${buildDirectory}/buildFailed-run-maven-build" ]]
-      then
-        buildrc=1
-        /bin/grep "\[ERROR\]" "${RUN_MAVEN_BUILD_LOG}" >> "${buildDirectory}/buildFailed-run-maven-build"
-        BUILD_FAILED="${BUILD_FAILED} \n${RUN_MAVEN_BUILD_LOG}"
-        fn-write-property BUILD_FAILED
-        # TODO: eventually put in more logic to "track" the failure, so
-        # proper actions and e-mails can be sent. For example, we'd still want to
-        # publish what we have, but not start the tests.
-        echo "BUILD FAILED. See ${RUN_MAVEN_BUILD_LOG}."
-      else
-        # if build run maven build failed, no need to gather parts
-        $SCRIPT_PATH/gather-parts.sh $BUILD_ENV_FILE 2>&1 | tee ${GATHER_PARTS_BUILD_LOG}
-        printf "%-35s %s\n" "Load after gather-parts: " "$(uptime)" >> ${loadLog}
-        if [[ -f "${buildDirectory}/buildFailed-gather-parts" ]]
-        then
-          buildrc=1
-          /bin/grep -i "ERROR" "${GATHER_PARTS_BUILD_LOG}" >> "${buildDirectory}/buildFailed-gather-parts"
-          BUILD_FAILED="${BUILD_FAILED} \n${GATHER_PARTS_BUILD_LOG}"
-          fn-write-property BUILD_FAILED
-          echo "BUILD FAILED. See ${GATHER_PARTS_BUILD_LOG}."
-        fi
-      fi
-    fi
-  fi  
-fi
-
-# check for dirt in working tree. 
-$SCRIPT_PATH/dirtReport.sh $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/dirtReport.txt
-checkForErrorExit $? "Error occurred during dirt report"
-sync
-sync
-sync
-
-$SCRIPT_PATH/publish-eclipse.sh $BUILD_ENV_FILE >$logsDirectory/mb080_publish-eclipse_output.txt
-checkForErrorExit $? "Error occurred during publish-eclipse"
-printf "%-35s %s\n" "Load after publish-eclipse: " "$(uptime)" >> ${loadLog}
-
-# We don't publish repo if there was a build failure, it likely doesn't exist.
-if [[ -z "${BUILD_FAILED}" ]]
-then
-  $SCRIPT_PATH/publish-repo.sh $BUILD_ENV_FILE >$logsDirectory/mb083_publish-repo_output.txt
-  checkForErrorExit $? "Error occurred during publish-repo"
-else
-  echo "No repo published, since BUILD_FAILED"
-fi
-
-#For now, only "publish equinox and promote" if N, I or M build, skip if P, X, or Y
-
-# TODO: probably never need to promote equinox, for patch build?
-# TODO: Unclear how/when to send mailing list notification for patch builds.
-
-if [[ $BUILD_TYPE =~  [NIM] ]]
-then
-
-  # We don't promote equinox if there was a build failure, and we should not even try to
-  # create the site locally, because it depends heavily on having a valid repository to
-  # work from.
-  if [[ -z "${BUILD_FAILED}" ]]
-  then
-    $SCRIPT_PATH/publish-equinox.sh $BUILD_ENV_FILE >$logsDirectory/mb085_publish-equinox_output.txt
-    checkForErrorExit $? "Error occurred during publish-equinox"
-    printf "%-35s %s\n" "Load after publish-equinox: " "$(uptime)" >> ${loadLog}
-  fi
-fi
-
-if [[ -z "${BUILD_FAILED}" ]]
-then
-   # create repo reports. Depends on exported 'BUILD_ID'. 
-   $SCRIPT_PATH/createReports.sh
-   #For now, do not fail if create reports fails, since 
-   # Since it did once while moving to triggering builds from Hudson (bug 487044).
-   #checkForErrorExit $? "Error occurred during createReports.sh"
-fi 
-
-# if all ended well, put "promotion scripts" in known locations
-$SCRIPT_PATH/promote-build.sh $BUILD_ENV_FILE 2>&1 | tee $logsDirectory/mb090_promote-build_output.txt
-checkForErrorExit $? "Error occurred during promote-build"
-
-fn-write-property-close
-
-# dump ALL environment variables in case its helpful in documenting or
-# debugging build results or differences between runs, especially on different machines
-env 1>$logsDirectory/mb100_all-env-variables_output.txt
-
-printf "%-35s %s\n" "Load at build end: " "$(uptime)" >> ${loadLog}
-
-echo "Exiting build with RC code of $buildrc"
-exit $buildrc
diff --git a/production/parse-logs.sh b/production/parse-logs.sh
deleted file mode 100755
index 572f5fa..0000000
--- a/production/parse-logs.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-#
-
-if [ $# -ne 1 ]; then
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-if [ ! -r "$1" ]; then
-  echo "$1" cannot be read
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-source "$1"
-
-export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
-
-source $SCRIPT_PATH/build-functions.shsource
-
-
-
-
-cd $BUILD_ROOT
-
-# derived values
-gitCache=$( fn-git-cache "$BUILD_ROOT" )
-aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
-
-if [ -z "$BUILD_ID" ]; then
-  BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
-fi
-
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "${STREAM}" )
-basebuilderDir=$( fn-basebuilder-dir "$BUILD_ROOT" "$BUILD_ID" "${STREAM}" )
-
-$SCRIPT_PATH/getEBuilderForDropDir.sh $buildDirectory $EBUILDER_HASH
-
-fn-checkout-basebuilder "$basebuilderDir"
-
-launcherJar=$( fn-basebuilder-launcher "$basebuilderDir" )
-
-EBuilderDir="$buildDirectory"/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder
-
-fn-parse-compile-logs "$BUILD_ID" \
-  "${EBuilderDir}/eclipse/buildScripts/eclipse_convert.xml" \
-  "$buildDirectory" "$launcherJar"
diff --git a/production/parse-opts.sh b/production/parse-opts.sh
deleted file mode 100755
index 27b24f5..0000000
--- a/production/parse-opts.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-#
-
-export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
-
-set -- $( getopt -l buildArea:,stream:,branch: -o "" --  "$@" )
-
-
-while [ $# -gt 0 ]; do
-  case "$1" in
-    "--buildArea")
-      buildArea="$2"; shift;;
-    "--stream")
-      stream="$2"; shift;;
-    "--branch")
-      branch="$2"; shift;;
-  esac
-  shift
-done
-
-buildArea_branch=$buildArea/$branch
-gitCache=$buildArea_branch/gitCache
-
-
-if [ -r $gitCache/eclipse.platform.releng.aggregator ]; then
-  pushd $gitCache/eclipse.platform.releng.aggregator
-else
-fi
diff --git a/production/pom-version-updater.sh b/production/pom-version-updater.sh
deleted file mode 100755
index 1a43378..0000000
--- a/production/pom-version-updater.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-#
-
-if [ $# -ne 1 ]; then
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-if [ ! -r "$1" ]; then
-  echo "$1" cannot be read
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-source "$1"
-
-export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
-
-source $SCRIPT_PATH/build-functions.shsource
-
-cd $BUILD_ROOT
-
-# derived values
-gitCache=$( fn-git-cache "$BUILD_ROOT" )
-aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" )
-
-if [ -z "$BUILD_ID" ]; then
-  BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
-fi
-
-fn-pom-version-updater "$aggDir" "$LOCAL_REPO" $MVN_DEBUG $MVN_QUIET
-RC=$?
-if [[ $RC != 0 ]]
-then
-  buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" )
-  # create as "indicator file" ... gets filled in more once there is a log to grep
-  touch  "${buildDirectory}/buildFailed-pom-version-updater"
-  echo "ERROR: fn-pom-version-updater returned non-zero return code: $RC"
-  exit $RC1
-fi
-fn-pom-version-report "$BUILD_ID" "$aggDir"  "$buildDirectory"
-
diff --git a/production/promote-build.sh b/production/promote-build.sh
deleted file mode 100755
index 4e587c2..0000000
--- a/production/promote-build.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-
-# Utility to promote the build and trigger the unit tests on Hudson.
-
-function usage ()
-{
-  printf "\n\n\t%s\n" "promote-build.sh env_file"
-}
-
-source "$1" 2>/dev/null
-# To allow this cron job to work from hudson, or traditional crontab
-if [[ -z "${WORKSPACE}" ]]
-then
-  export UTILITIES_HOME=/shared/eclipse
-else
-  export UTILITIES_HOME=${WORKSPACE}/utilities/production
-fi
-
-#TODO: Should we make use of "UTILITIES_HOME" here?
-if [[ -z ${SCRIPT_PATH} ]]
-then
-  SCRIPT_PATH=${PWD}
-fi
-echo -e "\n\t[DEBUG] SCRIPT_PATH in promote-build.sh: $SCRIPT_PATH"
-source $SCRIPT_PATH/build-functions.shsource
-
-if [[ -z ${STREAM} || -z ${BUILD_ID} ]]
-then
-  echo "ERROR: This script requires STREAM and BUILD_ID"
-  exit 1
-fi
-
-if [[ "${testbuildonly}" == "true" ]]
-then
-  echo "Did not promote build since testbuildonly is true."
-  exit 0
-fi
-
-# if EBUILDER_HASH is not defined, assume master, so order of following parameters are maintained.
-if [[ -z "${EBUILDER_HASH}" ]]
-then
-  EBUILDER_HASH=master
-fi
-
-# Here is command for promotion:
-
-${UTILITIES_HOME}/sdk/promotion/syncDropLocation.sh $STREAM $BUILD_ID $EBUILDER_HASH $BUILD_ENV_FILE
-
-# we do not promote equinox, if BUILD_FAILED since no need.
-# we also do not promote if Patch build or Y-build or experimental (since, to date, those are not "for" equinox). 
-if [[ -z "${BUILD_FAILED}" &&  $BUILD_TYPE =~ [IMN] ]]
-then
-
-  equinoxPostingDirectory="$BUILD_ROOT/siteDir/equinox/drops"
-  eqFromDir=${equinoxPostingDirectory}/${BUILD_ID}
-  eqToDir="/home/data/httpd/download.eclipse.org/equinox/drops/"
-
-  # Note: for proper mirroring at Eclipse, we probably do not want or need to
-  # maintain "times" on build machine, but let them take times at time of copying.
-  # If it turns out to be important to maintain times (such as ran more than once,
-  # to pick up a "more" output, such as test results, then add -t to rsync
-  # Similarly, if download server is set up right, it will end up with the
-  # correct permissions, but if not, we may need to set some permissions first,
-  # then use -p on rsync
-
-  # Here is promotion command
-  rsync --times --omit-dir-times --recursive "${eqFromDir}" "${eqToDir}"
-
-else
-  echo "Did not promote equinox since BUILD_FAILED"
-fi
-
-echo "normal exit from promote phase of $(basename $0)"
-
-exit 0
-
diff --git a/production/publish-eclipse.sh b/production/publish-eclipse.sh
deleted file mode 100755
index 8abbcca..0000000
--- a/production/publish-eclipse.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-#
-
-if [ $# -ne 1 ]; then
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-if [ ! -r "$1" ]; then
-  echo "$1" cannot be read
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-source "$1"
-
-export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
-
-cd $BUILD_ROOT
-
-source $SCRIPT_PATH/build-functions.shsource
-
-
-# derived values
-gitCache=$( fn-git-cache "$BUILD_ROOT")
-aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
-
-if [ -z "$BUILD_ID" ]; then
-  BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
-fi
-
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" )
-basebuilderDir=$( fn-basebuilder-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" )
-
-printf "\n\tINFO: %s\n" "calling getEBuilderForDropDir.sh from publish-eclipse.sh"
-$SCRIPT_PATH/getEBuilderForDropDir.sh $buildDirectory $EBUILDER_HASH
-
-fn-checkout-basebuilder "$basebuilderDir"
-
-launcherJar=$( fn-basebuilder-launcher "$basebuilderDir" )
-
-EBuilderDir="$buildDirectory"/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder
-
-# Temporary fork/condition
-# if [[ "true" == "${USING_TYCHO_SNAPSHOT}" ]]
-# then
-  fn-gather-23-compile-logs "$BUILD_ID" "$aggDir" "$buildDirectory"
-#else
-#  fn-gather-compile-logs "$BUILD_ID" "$aggDir" "$buildDirectory"
-# fi
-echo -e "\n\n[DEBUG] == critical values in publish-eclipse.sh == "
-echo -e "\n[DEBUG] buildDirectory in publish-eclipse.sh: $buildDirectory"
-echo -e "\n[DEBUG] BUILD_ID in publish-eclipse.sh: $BUILD_ID"
-fn-parse-compile-logs "$BUILD_ID" \
-  "${EBuilderDir}/eclipse/helper.xml" \
-  "$buildDirectory" "$launcherJar"
-
-fn-summarize-comparator-logs "$BUILD_ID" \
-  "${EBuilderDir}/eclipse/buildScripts/eclipse_compare.xml" \
-  "$buildDirectory" "$launcherJar"
-
-# As far as I know, "API Tooling" is not very useful for a patch feature, or X or Y build.
-if  [[ ! $BUILD_TYPE =~ [PX] ]]
-then
-   fn-summarize-apitooling "$BUILD_ID" \
-     "${EBuilderDir}/eclipse/buildScripts/api-tools-builder.xml" \
-     "$buildDirectory" "$launcherJar"
-fi
-fn-publish-eclipse "$BUILD_TYPE" "$STREAM" "$BUILD_ID" "$aggDir" "$buildDirectory" "$launcherJar"
diff --git a/production/publish-equinox.sh b/production/publish-equinox.sh
deleted file mode 100755
index 6e859e4..0000000
--- a/production/publish-equinox.sh
+++ /dev/null
@@ -1,204 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2019 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-#
-# this localBuildProperties.shsource file is to ease local builds to override some variables.
-# It should not be used for production builds.
-source localBuildProperties.shsource 2>/dev/null
-
-export BUILD_HOME=${BUILD_HOME:-/shared/eclipse/builds}
-
-if [ $# -ne 1 ]; then
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-if [ ! -r "$1" ]; then
-  echo "$1" cannot be read
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-source "$1"
-
-export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
-
-source $SCRIPT_PATH/build-functions.shsource
-
-# USAGE: fn-eq-build-dir ROOT BUILD_ID STREAM
-#   ROOT: /shared/eclipse/builds
-#   BUILD_ID: M20121119-1900
-#   STREAM: 4.3.0
-fn-eq-build-dir ()
-{
-  ROOT="$1"; shift
-  BUILD_ID="$1"; shift
-  STREAM="$1"; shift
-  eclipseStreamMajor=${STREAM:0:1}
-  buildType=${BUILD_ID:0:1}
-  dropDirSegment=${eclipseStreamMajor}${buildType}/siteDir/equinox/drops3
-  if (( $eclipseStreamMajor > 3 ))
-  then
-    dropDirSegment=${eclipseStreamMajor}${buildType}/siteDir/equinox/drops
-  fi
-  echo $ROOT/$dropDirSegment/$BUILD_ID
-}
-
-# USAGE: fn-eq-gather-starterkit BUILD_ID REPO_DIR BUILD_DIR
-#   BUILD_ID: I20121116-0700
-#   REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
-fn-eq-gather-starterkit ()
-{
-  if [[ $# != 3 ]]
-  then
-    echo "PROGRAM ERROR: this function, fn-eq-gather-starterkit, requires 3 arguments"
-    return 1
-  fi
-  BUILD_ID="$1"; shift
-  REPO_DIR="$1"; shift
-  DROP_DIR="$1"; shift
-  TARGET_PRODUCTS="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/equinox.starterkit.product/target/products
-  echo "Starting fn-eq-gather-starterkit"
-  echo "BUILD_ID: $BUILD_ID"
-  echo "REPO_DIR: $REPO_DIR"
-  echo "DROP_DIR: $DROP_DIR"
-  if [[ ! -d $DROP_DIR ]]
-  then
-    echo "Making DROP_DIR at $DROP_DIR"
-    mkdir -p $DROP_DIR
-  fi
-  if [[ -d "$TARGET_PRODUCTS" ]]
-  then
-    pushd "$TARGET_PRODUCTS"
-
-    cp -v org.eclipse.rt.osgistarterkit.product-linux.gtk.x86_64.tar.gz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-linux-gtk-x86_64.tar.gz
-
-    cp -v org.eclipse.rt.osgistarterkit.product-macosx.cocoa.x86_64.tar.gz "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-macosx-cocoa-x86_64.tar.gz
-    cp -v org.eclipse.rt.osgistarterkit.product-macosx.cocoa.x86_64.dmg "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-macosx-cocoa-x86_64.dmg
-
-    cp -v org.eclipse.rt.osgistarterkit.product-win32.win32.x86_64.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86_64.zip
-
-    popd
-    fn-notarize-macbuild "$DROP_DIR" EclipseRT-OSGi-StarterKit-${BUILD_ID}-macosx-cocoa-x86_64.dmg
-  else
-    echo "   ERROR: $TARGET_PRODUCTS did not exist in fn-eq-gather-starterkit"
-    return 1
-  fi
-  echo "Ending fn-eq-gather-starterkit"
-  return 0
-}
-
-
-
-# USAGE: fn-publish-equinox BUILD_TYPE BUILD_STREAM BUILD_ID REPO_DIR BUILD_DIR BASEBUILDER_LAUNCHER
-#   BUILD_TYPE: I
-#   BUILD_STREAM: 4.2.2
-#   BUILD_ID: I20121116-0700
-#   REPO_DIR: /shared/eclipse/builds/R4_2_maintenance/gitCache/eclipse.platform.releng.aggregator
-#   BUILD_DIR: /shared/eclipse/builds/R4_2_maintenance/dirs/M20121120-1747
-#   BASEBUILDER_LAUNCHER: /shared/eclipse/builds/R4_2_maintenance/org.eclipse.releng.basebuilder_R3_7/plugins/org.eclipse.equinox.launcher_1.2.0.v20110502.jar
-fn-publish-equinox ()
-{
-  BUILD_TYPE="$1"; shift
-  BUILD_STREAM="$1"; shift
-  BUILD_ID="$1"; shift
-  REPO_DIR="$1"; shift
-  BUILD_DIR="$1"; shift
-  BASEBUILDER_LAUNCHER="$1"; shift
-  BUILD_MACHINE_ROOT=${BUILD_HOME}
-  BUILD_MACHINE_DROP_DIR=$(fn-eq-build-dir "$BUILD_MACHINE_ROOT" "$BUILD_ID" "$BUILD_STREAM")
-  BUILD_MACHINE_DROP_DIR_PARENT=$(dirname $BUILD_MACHINE_DROP_DIR)
-  EBuilderDir="$BUILD_DIR"/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder
-  fn-eq-gather-starterkit $BUILD_ID $REPO_DIR $BUILD_MACHINE_DROP_DIR
-
-  TARGET_PRODUCTS="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/equinox-sdk/target
-  if [[ -d "$TARGET_PRODUCTS" ]]
-  then
-    pushd "$TARGET_PRODUCTS"
-    # The glob '*' here, is to match (and hence remove) "version number" in built version, such as 3.10.0, 4.4.0, etc.
-    # And leave only BUILD_ID.
-    cp -v equinox-sdk-*-SNAPSHOT.zip "${BUILD_MACHINE_DROP_DIR}/equinox-SDK-${BUILD_ID}.zip"
-    RC=$?
-    if [[ $RC != 0 ]]
-    then
-      TODO: change 'cp' above to rsync .. it gives better error messages and logging?
-      echo "ERROR: cp command could not copy equinox-sdk-*-SNAPSHOT.zip. RC: $RC"
-    fi
-    # following used to be done in "build-configs", based on "master-equinox" feature,
-    # but that has now "gone away".
-    pushd "${BUILD_MACHINE_DROP_DIR}"
-    unzip -o -j equinox-SDK-${BUILD_ID}.zip plugins/*.jar -x plugins/*.source_*
-    popd
-  else
-    echo "   ERROR: $TARGET_PRODUCTS did not exist in fn-gather-sdks"
-  fi
-  popd
-
-  pushd "$BUILD_DIR"
-  java -Djava.io.tmpdir=$TMP_DIR -jar "$BASEBUILDER_LAUNCHER" \
-    -data ${BUILD_DIR}/workspace-publishEquinox \
-    -application org.eclipse.ant.core.antRunner \
-    -v \
-    -buildfile "$EBuilderDir"/equinox/helper.xml \
-    -Dequinox.build.configs="$EBuilderDir"/equinox/buildConfigs \
-    -DbuildId="$BUILD_ID" \
-    -DbuildRepo="$REPO_DIR"/eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/repository \
-    -DpostingDirectory=$BUILD_DIR \
-    -DequinoxPostingDirectory=$BUILD_MACHINE_DROP_DIR_PARENT \
-    -DeqpublishingContent="$EBuilderDir"/equinox/publishingFiles \
-    -DdropTemplateFileName="$EBuilderDir/eclipse/publishingFiles/templateFiles/index.template_${PATCH_OR_BRANCH_LABEL}.php" \
-    -DindexFileName="index.php" \
-    -DbuildDir="$EQ_BUILD_DIR_SEG" \
-    -DEBuilderDir="$EBuilderDir" \
-    -DeclipseStream=$BUILD_STREAM \
-    -DbuildType="$BUILD_TYPE" \
-    -Dbase.builder=$(dirname $(dirname "$BASEBUILDER_LAUNCHER" ) ) \
-    -DbuildDirectory=$BUILD_MACHINE_DROP_DIR_PARENT \
-    -Djava.io.tmpdir=$TMP_DIR \
-    publish
-
-  if [[ "$invisibleBuild" == "true" ]]
-  then
-    touch buildHidden
-  fi
-  popd
-}
-
-cd $BUILD_ROOT
-
-# derived values
-gitCache=$( fn-git-cache "$BUILD_ROOT")
-aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
-
-if [ -z "$BUILD_ID" ]; then
-  BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
-fi
-
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" )
-basebuilderDir=$( fn-basebuilder-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" )
-
-$SCRIPT_PATH/getEBuilderForDropDir.sh $buildDirectory $EBUILDER_HASH
-
-fn-checkout-basebuilder "$basebuilderDir"
-
-launcherJar=$( fn-basebuilder-launcher "$basebuilderDir" )
-
-fn-publish-equinox "$BUILD_TYPE" "$STREAM" "$BUILD_ID" "$aggDir" "$buildDirectory" "$launcherJar"
-RC=$?
-if [[ $RC != 0 ]]
-then
-  echo "ERROR: Somethign went wrong publishing Equinox. RC: $RC"
-  exit $RC
-fi
diff --git a/production/publish-repo.sh b/production/publish-repo.sh
deleted file mode 100755
index d63cb8b..0000000
--- a/production/publish-repo.sh
+++ /dev/null
@@ -1,295 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-#
-
-if [ $# -ne 1 ]; then
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-if [ ! -r "$1" ]; then
-  echo "$1" cannot be read
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-source "$1"
-
-export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
-
-source $SCRIPT_PATH/build-functions.shsource
-
-# derived values
-gitCache=$( fn-git-cache "$BUILD_ROOT")
-aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
-
-if [ -z "$BUILD_ID" ]; then
-  BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
-fi
-
-buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" )
-basebuilderDir=$( fn-basebuilder-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" )
-
-$SCRIPT_PATH/getEBuilderForDropDir.sh $buildDirectory $EBUILDER_HASH
-
-fn-checkout-basebuilder "$basebuilderDir"
-
-launcherJar=$( fn-basebuilder-launcher "$basebuilderDir" )
-
-EBuilderDir="${buildDirectory}/eclipse.platform.releng.aggregator/eclipse.platform.releng.tychoeclipsebuilder"
-
-# compute update site parent directory on build server
-function updateSiteParent()
-{
-  checkNArgs $# 3
-  ROOT="$1"; shift
-  BUILD_ID="$1"; shift
-  STREAM="$1"; shift
-
-  buildType=${BUILD_ID:0:1}
-
-
-  # contrary to intuition (and previous behavior, bash 3.1) do NOT use quotes around right side of expression.
-  if [[ "${STREAM}" =~ ^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)$ ]]
-  then
-    eclipseStreamMajor=${BASH_REMATCH[1]}
-    eclipseStreamMinor=${BASH_REMATCH[2]}
-    eclipseStreamService=${BASH_REMATCH[3]}
-  else
-    echo "STREAM, $STREAM, must contain major, minor, and service versions, such as 4.3.0" >${TRACE_OUTPUT}
-    return 1
-  fi
-
-  siteDir=${ROOT}/siteDir
-  updatesSuffix="builds"
-  siteDirParent=$siteDir/updates/${eclipseStreamMajor}.${eclipseStreamMinor}-${buildType}-${updatesSuffix}
-  mkdir -p ${siteDirParent}
-  RC=$?
-  if [[ $RC != 0 ]]
-  then
-    echo "ERROR: could not create update site parent on build machine. RC: $RC" >${TRACE_OUTPUT}
-    echo "       obtained error trying to create ${updateSiteParent}" >${TRACE_OUTPUT}
-    return 1
-  fi
-
-  echo $siteDirParent
-}
-
-
-# compute update site on build server
-function updateSiteOnBuildMachine()
-{
-  checkNArgs $# 3
-  ROOT="$1"; shift
-  BUILD_ID="$1"; shift
-  STREAM="$1"; shift
-
-  buildType=${BUILD_ID:0:1}
-
-
-  # contrary to intuition (and previous behavior, bash 3.1) do NOT use quotes around right side of expression.
-  if [[ "${STREAM}" =~ ^([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)$ ]]
-  then
-    eclipseStreamMajor=${BASH_REMATCH[1]}
-    eclipseStreamMinor=${BASH_REMATCH[2]}
-    eclipseStreamService=${BASH_REMATCH[3]}
-  else
-    echo "STREAM, $STREAM, must contain major, minor, and service versions, such as 4.3.0" >${TRACE_OUTPUT}
-    return 1
-  fi
-
-  siteDir=${ROOT}/siteDir
-  updatesSuffix="builds"
-  siteDirParentOnBuildMachine=$( updateSiteParent "$BUILD_ROOT" "$BUILD_ID" "$STREAM" )
-  siteDirOnBuildMachine=${siteDirParentOnBuildMachine}/${BUILD_ID}
-  mkdir -p ${siteDirOnBuildMachine}
-  RC=$?
-  if [[ $RC != 0 ]]
-  then
-    echo "ERROR: could not create update site on build machine. RC: $RC" >${TRACE_OUTPUT}
-    echo "       obtained error trying to create ${siteDirOnBuildMachine}" >${TRACE_OUTPUT}
-    return 1
-  fi
-
-  echo $siteDirOnBuildMachine
-}
-
-siteDirOnBuildMachine=$( updateSiteOnBuildMachine "$BUILD_ROOT" "$BUILD_ID" "$STREAM" )
-echo "siteDirOnBuildMachine: ${siteDirOnBuildMachine}"
-repositoryDir=${buildDirectory}/repository
-echo "repositoryDir: ${repositoryDir}"
-
-# leave both old and new methods for now, so true (1) ==> old straight copy.
-# change to false (0) to test new method.
-if (( 1 ))
-then
-  DO_NOT_MIRROR_IN_ASSEMBLY="-DdoNotMirror=true"
-  # for now, straight copy from what was produced to local build machine directory.
-  # This is partially done so that
-  #   rest of scripts stay common
-  #   but eventually, we might put in some mirror/comparator/remove tasks here.
-
-  # NOTE: we are using the "safe copy" we put in drop directory on build machine.
-
-  # make posiitive ${repositoryDir} is not empty, or we are basically copying
-  # all of root! (and, if repositoryDir is empty if we had a failed build!
-  # and should not be calling this method, anyway.)
-  if [[ -n "${repositoryDir}" && -d "${repositoryDir}" && -n "${siteDirOnBuildMachine}" && -d "${siteDirOnBuildMachine}" ]]
-  then
-    rsync --times --omit-dir-times --recursive "${repositoryDir}/" "${siteDirOnBuildMachine}/"
-    RC=$?
-    if [[ $RC != 0 ]]
-    then
-      echo "ERROR: rsync of repo returned error. RC: $RC"
-      echo "       obtained while copying"
-      echo "       from ${repositoryDir}"
-      echo "       to ${siteDirOnBuildMachine}"
-      exit $RC
-    fi
-
-  else
-    echo "ERROR: Some directory didn't exist for update site copy."
-    echo "  repositoryDir: ${repositoryDir}"
-    echo "  siteDirOnBuildMachine: ${siteDirOnBuildMachine}"
-    exit $RC
-  fi
-
-fi
-
-#TODO: the "logic" needs some TLC
-# In master, we should not need DO_PATH or DO_REMOVE.
-# See patch streams for when/why that might change for patches.
-# But we will be sure defined empty by default, since used later in some calls.
-DO_PACK=""
-DO_REMOVE=""
-
-#DO_PACK="-DdoPack=false"
-
-# In some cases, we do not want to remove "categories", see bug 428099.
-#if [[ -n "${PATCH_BUILD}" ]]
-#then
-#    DO_REMOVE="-DdoNotRemove=true"
-#fi
-
-java -Djava.io.tmpdir=$TMP_DIR -jar "$launcherJar" \
-  -data ${buildDirectory}/workspace-processArtifacts \
-  -application org.eclipse.ant.core.antRunner \
-  -v \
-  -buildfile "${EBuilderDir}/eclipse/buildScripts/process-artifacts.xml" \
-  -DrepositoryDir=${repositoryDir} ${DO_REMOVE} ${DO_PACK} \
-  -Dbuildlogs=$logsDirectory/comparatorlogs \
-  -DsiteDirOnBuildMachine=$siteDirOnBuildMachine \
-  -DcomparatorRepository=$comparatorRepository \
-  -Djava.io.tmpdir=$TMP_DIR ${DO_NOT_MIRROR_IN_ASSEMBLY}
-
-RC=$?
-if [[ $RC != 0 ]]
-then
-  echo "ERROR: java invocation to process-artifacts did not return normally: $RC"
-  exit $RC
-fi
-
-
-# If doing a "patch build", a "site.xml" is created,
-# so a) we'll remove that that, to avoid confusion, and
-# b) we must call "process-artifacts again, so this version
-# has packgz files. (i.e. Tycho isn't doing it for us).
-if [[ -n "${PATCH_BUILD}" ]]
-then
-
-  # no longer needed, will remove
-#  rm "${siteDirOnBuildMachine}/site.xml"
-#  RC=$?
-#  if [[ $RC != 0 ]]
-#  then
-#    echo "ERROR: did not remove 'site.xml' as expected. RC: $RC"
-#    #exit $RC
-#  fi
-
-  # before we created pack.gz files, we'll create zip file, of archive for
-  # DL page ... and those zip files best without pack.gz files, since they
-  # are not used if using local zip archive, so are "wasted" there.
-  pushd ${siteDirOnBuildMachine}
-  zipfile=${PATCH_BUILD}-${BUILD_ID}-repository.zip
-  zip -r ${buildDirectory}/${zipfile}  .
-  # I guess created after "publish"? The checksums are not created, so we'll just create 
-  # them directly. (Note, adding 256, since we will do that for all, in future, so 
-  # do not want to forget.
-  pushd ${buildDirectory}
-  echo [md5] ${zipfile}
-  md5sum -b ${zipfile} > checksum/${zipfile}.md5
-  echo [sha1] ${zipfile}
-  sha1sum -b ${zipfile} > checksum/${zipfile}.sha1
-  echo [sha256] ${zipfile}
-  sha256sum -b ${zipfile} > checksum/${zipfile}.sha256
-  echo [sha512] ${zipfile}
-  sha512sum -b ${zipfile} > checksum/${zipfile}.sha512
-  popd
-  popd
-
-  #    if [[ -n "${PATCH_BUILD}" ]]
-  #    then
-  #        # nothing to remove for patch builds, for now, and we
-  #        # do not want to remove the category we put there intentionally.
-  #        DO_REMOVE="-DdoNotRemove=true"
-  #        # https://bugs.eclipse.org/bugs/show_bug.cgi?id=427873
-  #        # uses 'false' for now.
-  #        DO_PACK="-DdoPack=false"
-  #    fi
-  #
-  #    java -Djava.io.tmpdir=$TMP_DIR -jar "$launcherJar" \
-    #        -data ${buildDirectory}/workspace-processArtifacts2 \
-    #        -application org.eclipse.ant.core.antRunner \
-    #        -v \
-    #        -buildfile "${EBuilderDir}/eclipse/buildScripts/process-artifacts.xml" \
-    #        -DrepositoryDir=${repositoryDir} ${DO_REMOVE} ${DO_PACK} \
-    #        -Dbuildlogs=$logsDirectory/comparatorlogs \
-    #        -DsiteDirOnBuildMachine=$siteDirOnBuildMachine \
-    #        -DcomparatorRepository=$comparatorRepository \
-    #        -Djava.io.tmpdir=$TMP_DIR ${DO_NOT_MIRROR_IN_ASSEMBLY}
-  #
-  #    RC=$?
-  #    if [[ $RC != 0 ]]
-  #    then
-  #        echo "ERROR: java invocation to process-artifacts did not return normally: $RC"
-  #        #exit $RC
-  #    fi
-
-  # == I do not see a need for this? dw 6/3/2016
-  # == BUT, if needed, need to "mkdir" first! 
-  # Make composite directly on build machine, for patches only
-  # repodir is absolute path to composite repository,
-  # complocation is the (relative) child repository (usually direcotry named 'buildId')
-  # site parent is "one up" from siteDirOnBuildMachine.
-  #siteDirParentOnBuildMachine=$( updateSiteParent "$BUILD_ROOT" "$BUILD_ID" "$STREAM" )
-  #java -Djava.io.tmpdir=$TMP_DIR -jar "$launcherJar" \
-  #  -data ${buildDirectory}/workspace-makeComposite \
-  #  -application org.eclipse.ant.core.antRunner \
-  #  -v \
-  #  -buildfile "${EBuilderDir}/eclipse/buildScripts/addToComposite.xml" \
-  #  -Drepodir=${siteDirParentOnBuildMachine}  \
-  #  -Dcomplocation=${BUILD_ID}
-
-  #RC=$?
-  #if [[ $RC != 0 ]]
-  #then
-  #  echo "ERROR: java invocation to process-artifacts did not return normally: $RC"
-    #exit $RC
-  #fi
-
-fi
-
-exit 0
-
diff --git a/production/republish.sh b/production/republish.sh
deleted file mode 100755
index 7a1ee42..0000000
--- a/production/republish.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-
-
-# This script is NOT part of production builds. It is an assist in "republishing" 
-# results, such as if there is a connection problem, or a script needs to be fixed to 
-# publish correctly. Even if this script "works", it does not change the files on 
-# download server, they much be "re-synch'd" manually. 
-
-# This script is only and "assist" to republish. It is not fool proof (and not well tested) 
-# and its exact use depends on what ever the problem was. 
-
-BUILD_ID=I20160527-2118
-BUILD_ROOT=/shared/eclipse/builds
-BUILD_MAJOR=4
-BUILD_TYPE=I
-postingDirectory=${BUILD_ROOT}/${BUILD_MAJOR}${BUILD_TYPE}/siteDir/eclipse/downloads/drops4
-buildDirectory="${postingDirectory}/${BUILD_ID}"
-echo "BUILD_ID: $BUILD_ID" 1>&2
-
-# basebuilder (and tools) in following dir needs usually to be removed if connection problmes, or changes made
-rm -vfr "${buildDirectory}/org.eclipse.releng.basebuilder"
-
-# aggregator needs to be removed if changes to scripts there. 
-# The zip needs to be republished do "downloads" if re-running tests involved (rare) but seldom hurts
-rm -vfr "${buildDirectory}"/eclipse.platform.releng.aggregator
-rm -vfr "${buildDirectory}"/eclipse.platform.releng.aggregator*.zip
-
-# In some cases (rarely) may have to remove index.php (it will not be recreated by default)
-# rm "${buildDirectory}/index.php"
-
-# In some (rare) cases may have to remove compilelogs (will not be recreated by default).
-# location?
-
-# In some (most) cases may have to do a "git pull" on aggregator, to get a fix (but not recursively!)
-pushd "${BUILD_ROOT}/${BUILD_MAJOR}${BUILD_TYPE}/gitCache/eclipse.platform.releng.aggregator" 1>&2
-git pull
-newHASH=$(git rev-parse HEAD)
-echo "newHASH (after pull): $newHASH" 1>&2
-popd 1>&2
-
-# If git pull is done, need to update EBUILDER_HASH in buildproperties.shsource
-oldPattern="\(export EBUILDER_HASH=\"\)\(.*\)\(\"\)"
-replacePattern="\1${newHASH}\3"
-replaceDirCommand="s!${oldPattern}!${replacePattern}!g" 
-echo "[DEBUG] replaceCommnad: ${replaceDirCommand}" 1>&2
-sed  -e "${replaceDirCommand}" "${buildDirectory}/buildproperties.shsource" > "${buildDirectory}/buildproperties.shsourceTEMPNEW"
-RC=$?
-if [[ $RC != 0 ]]
-then 
-  echo "sed returned non-zero return code: $RC" 1>&2
-  exit $RC
-else
-  cp --backup=numbered "${buildDirectory}/buildproperties.shsourceTEMPNEW" "${buildDirectory}/buildproperties.shsource"
-  #TODO check return code of cp
-  echo "replaced original buildproperties.shsource (after backing up original)"
-fi
-
-# sometimes, but rearly, the production directory may need to be replaced changes made.
-export SCRIPT_PATH="${BUILD_ROOT}/${BUILD_MAJOR}${BUILD_TYPE}/production"
-# now republish! 
-${SCRIPT_PATH}/publish-eclipse.sh ${buildDirectory}/buildproperties.shsource 2>&1 | tee republishout.txt
-
-
diff --git a/production/run-maven-build.sh b/production/run-maven-build.sh
deleted file mode 100755
index 0ebb104..0000000
--- a/production/run-maven-build.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-#
-
-if [ $# -ne 1 ]; then
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-if [ ! -r "$1" ]; then
-  echo "$1" cannot be read
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-source "$1"
-
-export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
-
-source $SCRIPT_PATH/build-functions.shsource
-
-cd $BUILD_ROOT
-
-# derived values
-gitCache=$( fn-git-cache "$BUILD_ROOT" )
-aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
-
-if [ -z "$BUILD_ID" ]; then
-  BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
-fi
-
-fn-maven-build-aggregator "$BUILD_ID" "$aggDir" "$LOCAL_REPO" $MVN_DEBUG $MVN_QUIET $SIGNING $MAVEN_BREE
-exitCode=$?
-
-# first make sure exit code is well formed
-if [[ -z "${exitCode}" ]]
-then
-  echo "exitcode was empty"
-  exitrc=0
-elif [[ "${exitCode}" =~ [0] ]]
-then
-  echo "exitcode was zero"
-  exitrc=0
-elif [[ "${exitCode}" =~ ^-?[0-9]+$ ]]
-then
-  echo "exitcode was a legal, non-zero numeric return code"
-  exitrc=$exitCode
-  buildDirectory=$( fn-build-dir "$BUILD_ROOT" "$BUILD_ID" "$STREAM" )
-  # create as "indicator file" ... gets filled in more once there is a log to grep
-  touch  "${buildDirectory}/buildFailed-run-maven-build"
-else
-  echo "exitode was not numeric, so will force to 1"
-  exitrc=1
-fi
-
-echo "$( basename $0) exiting with exitrc: $exitrc"
-exit $exitrc
diff --git a/production/tag-build-input.sh b/production/tag-build-input.sh
deleted file mode 100755
index 5e76c69..0000000
--- a/production/tag-build-input.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-#
-
-if [ $# -ne 1 ]; then
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-if [ ! -r "$1" ]; then
-  echo "$1" cannot be read
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-source "$1"
-
-export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
-
-source $SCRIPT_PATH/build-functions.shsource
-
-cd $BUILD_ROOT
-
-# derived values
-gitCache=$( fn-git-cache "$BUILD_ROOT" )
-aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
-repositories=$( echo $STREAMS_PATH/repositories_${PATCH_OR_BRANCH_LABEL}.txt )
-
-if [ -z "$BUILD_ID" ]; then
-  BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
-fi
-
-
-fn-tag-build-inputs "$BUILD_ID" "$aggDir" "$repositories"
diff --git a/production/update-build-input.sh b/production/update-build-input.sh
deleted file mode 100755
index 198975d..0000000
--- a/production/update-build-input.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env bash
-#*******************************************************************************
-# Copyright (c) 2016 IBM Corporation and others.
-#
-# This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License 2.0
-# which accompanies this distribution, and is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#     David Williams - initial API and implementation
-#*******************************************************************************
-#
-
-if [ $# -ne 1 ]; then
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-if [ ! -r "$1" ]; then
-  echo "$1" cannot be read
-  echo USAGE: $0 env_file
-  exit 1
-fi
-
-source "$1"
-
-export SCRIPT_PATH=${SCRIPT_PATH:-$(pwd)}
-
-source $SCRIPT_PATH/build-functions.shsource
-
-cd $BUILD_ROOT
-
-# derived values
-gitCache=$( fn-git-cache "$BUILD_ROOT")
-aggDir=$( fn-git-dir "$gitCache" "$AGGREGATOR_REPO" )
-# Confirm file exists as expected
-if [[ ! -e "$STREAMS_PATH/repositories_${PATCH_OR_BRANCH_LABEL}.txt" ]]
-then 
-   echo -e "\n\t[ERROR] repositories file did not exist."
-   echo -e "\t[ERROR] expected file: repositories_${PATCH_OR_BRANCH_LABEL}.txt"
-   echo -e "\t[ERROR] to be in directory: $STREAMS_PATH\n"
-   exit 1
-else 
-   echo -e "\n\t[INFO] Using repositories file: $STREAMS_PATH/repositories_${PATCH_OR_BRANCH_LABEL}.txt\n"
-fi
-repositories=$( echo $STREAMS_PATH/repositories_${PATCH_OR_BRANCH_LABEL}.txt )
-repoScript=$( echo $SCRIPT_PATH/git-submodule-checkout.sh )
-
-
-if [ -z "$BUILD_ID" ]; then
-  BUILD_ID=$(fn-build-id "$BUILD_TYPE" )
-fi
-
-
-fn-submodule-checkout "$BUILD_ID" "$aggDir" "$repoScript" "$repositories"
-fn-add-submodule-updates "$aggDir"
diff --git a/scripts/cbi_settings.tpl b/scripts/cbi_settings.tpl
deleted file mode 100644
index bc46ecf..0000000
--- a/scripts/cbi_settings.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                      http://maven.apache.org/xsd/settings-1.0.0.xsd">
-  <localRepository/>
-  <interactiveMode/>
-  <usePluginRegistry/>
-  <offline/>
-  <pluginGroups>
-  </pluginGroups>
-  <servers>
-  </servers>
-  <mirrors>
-  </mirrors>
-  <proxies/>
-  <profiles>
-  </profiles>
-  <activeProfiles/>
-</settings>
-
diff --git a/scripts/cbi_setup.tpl b/scripts/cbi_setup.tpl
deleted file mode 100644
index b77d5cb..0000000
--- a/scripts/cbi_setup.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-# Maven needs a local cache to store its files.
-# If you use Maven for other projects, you probably don't want to pollute the default repository
-# Use this variable to tell the build script where to create the Eclipse CBI Maven cache
-m2repo="$BASE/TMP/m2repo"
-
-# If you use your own Maven proxy, the build will probably fail.
-# Copy your settings.xml to this location to override the defaults.
-m2settings="$BASE/settings.xml"
diff --git a/scripts/createdeltapack.xml b/scripts/createdeltapack.xml
deleted file mode 100644
index 20d6fcc..0000000
--- a/scripts/createdeltapack.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-  name="delta pack build"
-  default="assembler"
-  basedir=".">
-  <!--
-    This script is a starting point for creating a traditional
-    "delta pack" for anyone who does not what to use p2 directly.
-    
-    The ant task has to be invoked via the antRunner application. Something 
-    similar to 
-      ./eclipse -application org.eclipse.ant.core.antRunner -f createdeltapack.xml
-    
-    Be sure to adjust, or pass in, the appropriate buildLabel and buildRepo.
-    
-    Note: the resulting delta pack has not been tested. 
-    
-    Please comment in bug 470913 with imrovements that can be made.
-    https://bugs.eclipse.org/bugs/show_bug.cgi?id=470913
-  -->
-
-
-  <target
-    name="init"
-    unless="buildInitialized">
-    <property
-      name="projectDir"
-      value="${basedir}" />
-    <property
-      name="buildLabel"
-      value="latestIBuild" />
-    <property
-      name="resultsDir"
-      value="${projectDir}/results" />
-    <property
-      name="buildlogs"
-      value="${resultsDir}/buildlogs" />
-    <property
-      name="checksum"
-      value="${resultsDir}/checksum" />
-    <delete
-      verbose="true"
-      dir="${buildlogs}" />
-    <mkdir dir="${buildlogs}" />
-
-    <record
-      name="${buildlogs}/deltaPack-${buildLabel}-log.txt"
-      action="start" />
-
-    <property
-      name="buildRepo"
-      value="https://download.eclipse.org/eclipse/updates/I-builds" />
-    <property
-      name="projectDir"
-      value="${basedir}" />
-    <property
-      name="archivePrefix"
-      value="eclipse" />
-
-    <property
-      name="archiveRoot"
-      value="${archivePrefix}-${buildLabel}" />
-    <property
-      name="archiveName"
-      value="${archiveRoot}-delta-pack.zip" />
-
-    <property
-      name="featureTempRoot"
-      value="${projectDir}/rcp.deltapack" />
-    <property
-      name="featureTempDir"
-      value="featureTemp" />
-    <property
-      name="featureTemp"
-      value="${featureTempRoot}/${featureTempDir}" />
-    <property
-      name="featureTemp2"
-      value="${featureTempRoot}/featureTemp2" />
-    <delete
-      verbose="true"
-      dir="${featureTemp}" />
-    <mkdir dir="${featureTemp}" />
-    <delete
-      verbose="true"
-      dir="${featureTemp2}" />
-    <mkdir dir="${featureTemp2}" />
-
-    <property
-      name="archivePathAndName"
-      value="${resultsDir}/${archiveName}" />
-
-    <property
-      name="buildInitialized"
-      value="true" />
-
-  </target>
-
-  <target
-    name="build"
-    depends="init">
-    <echo message="DEBUG: echoproperties at beginning of deltapack (after init)" />
-    <echoproperties />
-
-    <!--need to change slicing options to only include platform specific bits -->
-    <p2.mirror
-      source="${buildRepo}"
-      log="${buildlogs}/deltapackmirrorlog.txt"
-      verbose="true"
-      ignoreerrors="true">
-      <destination
-        kind="metadata"
-        location="file://${featureTemp}"
-        name="RCP Delta Pack Repo"
-        format="${buildRepo}" />
-      <destination
-        kind="artifact"
-        location="file://${featureTemp}"
-        name="RCP Delta Pack Repo"
-        format="${buildRepo}" />
-      <iu
-        id="org.eclipse.equinox.executable.feature.group"
-        version="" />
-      <iu
-        id="org.eclipse.rcp.configuration.feature.group"
-        version="" />
-      <iu
-        id="org.eclipse.platform.feature.group"
-        version="" />
-      <iu
-        id="org.eclipse.platform.source.feature.group"
-        version="" />
-      <iu
-        id="org.eclipse.rcp.feature.group"
-        version="" />
-      <iu
-        id="org.eclipse.rcp.source.feature.group"
-        version="" />
-      <iu
-        id="org.eclipse.jdt.feature.group"
-        version="" />
-      <iu
-        id="org.eclipse.jdt.source.feature.group"
-        version="" />
-      <iu
-        id="org.eclipse.e4.rcp.feature.group"
-        version="" />
-      <iu
-        id="org.eclipse.e4.rcp.source.feature.group"
-        version="" />
-      <slicingOptions
-        includeOptional="false"
-        includeNonGreedy="false"
-        followStrict="true"
-        followOnlyFilteredRequirements="true"
-        latestVersionOnly="true"/>
-    </p2.mirror>
-    <p2.remove.iu>
-      <repository location="file://${featureTemp}" />
-      <iu id="org.eclipse.jdt.feature.jar" />
-      <iu id="org.eclipse.jdt.source.feature.jar" />
-      <iu id="org.eclipse.platform.feature.jar" />
-      <iu id="org.eclipse.platform.source.feature.jar" />
-      <iu id="org.eclipse.rcp.feature.jar" />
-      <iu id="org.eclipse.rcp.source.feature.jar" />
-      <iu id="org.eclipse.e4.rcp.feature.jar" />
-      <iu id="org.eclipse.e4.rcp.source.feature.jar" />
-    </p2.remove.iu>
-    <p2.repo2runnable
-      destination="${featureTemp2}/eclipse"
-      failonerror="true">
-      <source
-        dir="${featureTempRoot}"
-        includes="${featureTempDir}" />
-    </p2.repo2runnable>
-    <delete verbose="true">
-      <fileset
-        dir="${featureTemp2}/eclipse"
-        includes="*.jar" />
-      <fileset
-        dir="${featureTemp2}/eclipse"
-        includes="*.xml" />
-    </delete>
-
-  </target>
-
-  <target
-    name="assembler"
-    depends="init, build">
-    <delete
-      verbose="true"
-      file="${archivePathAndName}"
-      failonerror="false" />
-    <exec
-      executable="zip"
-      dir="${featureTemp2}">
-      <arg line="${archivePathAndName} -r ." />
-    </exec>
-
-    <delete
-      verbose="true"
-      dir="${checksum}" />
-    <mkdir dir="${checksum}" />
-    <checksum
-      file="${archivePathAndName}"
-      algorithm="sha256"
-      todir="${checksum}"
-      pattern="{0} *{1}" />
-
-    <!--
-      If desired, this would be a good place to remove ${featureTempRoot}
-      since no longer needed ... but, but might assist with debugging?
-    -->
-
-    <record
-      name="${buildlogs}/deltaPack-${buildLabel}-log.txt"
-      action="stop" />
-
-  </target>
-</project>