diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 8fc39ad17..e391a8312 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -166,12 +166,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml new file mode 100644 index 000000000..b268ef36c --- /dev/null +++ b/.idea/deploymentTargetSelector.xml @@ -0,0 +1,10 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index a09fbb599..f6e091477 100755 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,7 +1,8 @@ @file:Suppress("UnstableApiUsage") -import com.itsaky.androidide.plugins.AndroidIDEAssetsPlugin import com.itsaky.androidide.build.config.BuildConfig +import com.itsaky.androidide.desugaring.utils.JavaIOReplacements.applyJavaIOReplacements +import com.itsaky.androidide.plugins.AndroidIDEAssetsPlugin plugins { id("com.android.application") @@ -9,6 +10,7 @@ plugins { id("kotlin-kapt") id("kotlin-parcelize") id("androidx.navigation.safeargs.kotlin") + id("com.itsaky.androidide.desugaring") } apply { @@ -41,6 +43,14 @@ android { kapt { arguments { arg("eventBusIndex", "${BuildConfig.packageName}.events.AppEventsIndex") } } +desugaring { + replacements { + includePackage("org.eclipse.jgit") + + applyJavaIOReplacements() + } +} + dependencies { debugImplementation(libs.common.leakcanary) @@ -91,6 +101,7 @@ dependencies { // Dependencies in composite build implementation(libs.composite.appintro) + implementation(libs.composite.desugaringCore) implementation(libs.composite.javapoet) // Local projects here diff --git a/build.gradle.kts b/build.gradle.kts index 1c4a8dc82..6f49ebe52 100755 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -31,6 +31,7 @@ plugins { alias(libs.plugins.android.application) apply false alias(libs.plugins.android.library) apply false alias(libs.plugins.kotlin.android) apply false + alias(libs.plugins.kotlin.jvm) apply false alias(libs.plugins.maven.publish) apply false alias(libs.plugins.gradle.publish) apply false } @@ -54,10 +55,10 @@ subprojects { project.version = rootProject.version plugins.withId("com.android.application") { - configureAndroidModule(libs.androidx.lib.desugaring.get()) + configureAndroidModule(libs.androidx.libDesugaring) } plugins.withId("com.android.library") { - configureAndroidModule(libs.androidx.lib.desugaring.get()) + configureAndroidModule(libs.androidx.libDesugaring) } plugins.withId("java-library") { configureJavaModule() } plugins.withId("com.vanniktech.maven.publish.base") { configureMavenPublish() } diff --git a/composite-builds/README.md b/composite-builds/README.md new file mode 100644 index 000000000..e7b67749d --- /dev/null +++ b/composite-builds/README.md @@ -0,0 +1,5 @@ +# Composite builds + +- `build-deps` - External dependencies that are built from source and used in the main build. +- `build-deps-common` - Common modules that are used in composite builds as well as the main build. +- `build-logic` - Plugins and configuration for building the AndroidIDE project. \ No newline at end of file diff --git a/build-deps/appintro/.gitignore b/composite-builds/build-deps-common/desugaring-core/.gitignore similarity index 100% rename from build-deps/appintro/.gitignore rename to composite-builds/build-deps-common/desugaring-core/.gitignore diff --git a/composite-builds/build-deps-common/desugaring-core/build.gradle.kts b/composite-builds/build-deps-common/desugaring-core/build.gradle.kts new file mode 100644 index 000000000..8e5352319 --- /dev/null +++ b/composite-builds/build-deps-common/desugaring-core/build.gradle.kts @@ -0,0 +1,25 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +plugins { + id("java-library") +} + +java { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 +} \ No newline at end of file diff --git a/composite-builds/build-deps-common/desugaring-core/src/main/java/com/itsaky/androidide/desugaring/core/java/io/DesugarInputStream.java b/composite-builds/build-deps-common/desugaring-core/src/main/java/com/itsaky/androidide/desugaring/core/java/io/DesugarInputStream.java new file mode 100644 index 000000000..1949eaa80 --- /dev/null +++ b/composite-builds/build-deps-common/desugaring-core/src/main/java/com/itsaky/androidide/desugaring/core/java/io/DesugarInputStream.java @@ -0,0 +1,128 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +package com.itsaky.androidide.desugaring.core.java.io; + +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +/** + * @author Akash Yadav + */ +@SuppressWarnings("unused") +public class DesugarInputStream { + + /** + * The maximum size of array to allocate. Some VMs reserve some header words in an array. Attempts + * to allocate larger arrays may result in OutOfMemoryError: Requested array size exceeds VM + * limit + */ + private static final int MAX_BUFFER_SIZE = Integer.MAX_VALUE - 8; + + // MAX_SKIP_BUFFER_SIZE is used to determine the maximum buffer size to + // use when skipping. + private static final int MAX_SKIP_BUFFER_SIZE = 2048; + + private static final int DEFAULT_BUFFER_SIZE = 16384; + + private DesugarInputStream() { + throw new UnsupportedOperationException(); + } + + public static byte[] readAllBytes(InputStream in) throws IOException { + return readNBytes(in, Integer.MAX_VALUE); + } + + public static byte[] readNBytes(InputStream in, int len) throws IOException { + if (len < 0) { + throw new IllegalArgumentException("len < 0"); + } + + List bufs = null; + byte[] result = null; + int total = 0; + int remaining = len; + int n; + do { + byte[] buf = new byte[Math.min(remaining, DEFAULT_BUFFER_SIZE)]; + int nread = 0; + + // read to EOF which may read more or less than buffer size + while ((n = in.read(buf, nread, Math.min(buf.length - nread, remaining))) > 0) { + nread += n; + remaining -= n; + } + + if (nread > 0) { + if (MAX_BUFFER_SIZE - total < nread) { + throw new OutOfMemoryError("Required array size too large"); + } + if (nread < buf.length) { + buf = Arrays.copyOfRange(buf, 0, nread); + } + total += nread; + if (result == null) { + result = buf; + } else { + if (bufs == null) { + bufs = new ArrayList<>(); + bufs.add(result); + } + bufs.add(buf); + } + } + // if the last call to read returned -1 or the number of bytes + // requested have been read then break + } while (n >= 0 && remaining > 0); + + if (bufs == null) { + if (result == null) { + return new byte[0]; + } + return result.length == total ? result : Arrays.copyOf(result, total); + } + + result = new byte[total]; + int offset = 0; + remaining = total; + for (byte[] b : bufs) { + int count = Math.min(b.length, remaining); + System.arraycopy(b, 0, result, offset, count); + offset += count; + remaining -= count; + } + + return result; + } + + public static int readNBytes(InputStream input, byte[] b, int off, int len) throws IOException { + Objects.checkFromIndexSize(off, len, b.length); + + int n = 0; + while (n < len) { + int count = input.read(b, off + n, len - n); + if (count < 0) + break; + n += count; + } + return n; + } +} diff --git a/build-deps/gradle.properties b/composite-builds/build-deps-common/gradle.properties similarity index 100% rename from build-deps/gradle.properties rename to composite-builds/build-deps-common/gradle.properties diff --git a/composite-builds/build-deps-common/settings.gradle.kts b/composite-builds/build-deps-common/settings.gradle.kts new file mode 100644 index 000000000..50985e10a --- /dev/null +++ b/composite-builds/build-deps-common/settings.gradle.kts @@ -0,0 +1,54 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +@file:Suppress("UnstableApiUsage") + +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") + +pluginManagement { + repositories { + gradlePluginPortal() + google() + mavenCentral() + } +} + +dependencyResolutionManagement { + repositories { + google() + mavenCentral() + } + versionCatalogs { + create("libs") { + from(files("../../gradle/libs.versions.toml")) + } + } +} + +include( + ":desugaring-core", +) + +rootProject.name = "build-deps-common" + +gradle.rootProject { + + // required for setting SDK location for android modules + project.file("../../local.properties") + .takeIf { it.exists() } + ?.copyTo(project.file("local.properties"), overwrite = true) +} \ No newline at end of file diff --git a/build-deps/fuzzysearch/.gitignore b/composite-builds/build-deps/appintro/.gitignore similarity index 100% rename from build-deps/fuzzysearch/.gitignore rename to composite-builds/build-deps/appintro/.gitignore diff --git a/build-deps/appintro/README.md b/composite-builds/build-deps/appintro/README.md similarity index 100% rename from build-deps/appintro/README.md rename to composite-builds/build-deps/appintro/README.md diff --git a/build-deps/appintro/build.gradle.kts b/composite-builds/build-deps/appintro/build.gradle.kts similarity index 100% rename from build-deps/appintro/build.gradle.kts rename to composite-builds/build-deps/appintro/build.gradle.kts diff --git a/build-deps/appintro/consumer-proguard-rules.pro b/composite-builds/build-deps/appintro/consumer-proguard-rules.pro similarity index 100% rename from build-deps/appintro/consumer-proguard-rules.pro rename to composite-builds/build-deps/appintro/consumer-proguard-rules.pro diff --git a/build-deps/appintro/src/main/java/com/github/appintro/AppIntro.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/AppIntro.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/AppIntro.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/AppIntro.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/AppIntro2.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/AppIntro2.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/AppIntro2.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/AppIntro2.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/AppIntroBase.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/AppIntroBase.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/AppIntroBase.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/AppIntroBase.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/AppIntroBaseFragment.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/AppIntroBaseFragment.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/AppIntroBaseFragment.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/AppIntroBaseFragment.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/AppIntroCustomLayoutFragment.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/AppIntroCustomLayoutFragment.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/AppIntroCustomLayoutFragment.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/AppIntroCustomLayoutFragment.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/AppIntroFragment.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/AppIntroFragment.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/AppIntroFragment.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/AppIntroFragment.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/AppIntroFragmentViewModel.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/AppIntroFragmentViewModel.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/AppIntroFragmentViewModel.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/AppIntroFragmentViewModel.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/AppIntroPageTransformerType.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/AppIntroPageTransformerType.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/AppIntroPageTransformerType.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/AppIntroPageTransformerType.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/AppIntroViewPagerListener.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/AppIntroViewPagerListener.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/AppIntroViewPagerListener.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/AppIntroViewPagerListener.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/SlideBackgroundColorHolder.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/SlideBackgroundColorHolder.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/SlideBackgroundColorHolder.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/SlideBackgroundColorHolder.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/SlidePolicy.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/SlidePolicy.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/SlidePolicy.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/SlidePolicy.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/SlideSelectionListener.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/SlideSelectionListener.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/SlideSelectionListener.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/SlideSelectionListener.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/indicator/DotIndicatorController.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/indicator/DotIndicatorController.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/indicator/DotIndicatorController.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/indicator/DotIndicatorController.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/indicator/IndicatorController.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/indicator/IndicatorController.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/indicator/IndicatorController.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/indicator/IndicatorController.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/indicator/ProgressIndicatorController.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/indicator/ProgressIndicatorController.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/indicator/ProgressIndicatorController.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/indicator/ProgressIndicatorController.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/internal/AppIntroViewPagerController.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/internal/AppIntroViewPagerController.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/internal/AppIntroViewPagerController.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/internal/AppIntroViewPagerController.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/internal/CustomFontCache.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/internal/CustomFontCache.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/internal/CustomFontCache.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/internal/CustomFontCache.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/internal/LayoutUtil.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/internal/LayoutUtil.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/internal/LayoutUtil.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/internal/LayoutUtil.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/internal/LogHelper.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/internal/LogHelper.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/internal/LogHelper.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/internal/LogHelper.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/internal/PermissionWrapper.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/internal/PermissionWrapper.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/internal/PermissionWrapper.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/internal/PermissionWrapper.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/internal/SavedStateHelper.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/internal/SavedStateHelper.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/internal/SavedStateHelper.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/internal/SavedStateHelper.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/internal/TypefaceContainer.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/internal/TypefaceContainer.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/internal/TypefaceContainer.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/internal/TypefaceContainer.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/internal/VibrationHelper.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/internal/VibrationHelper.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/internal/VibrationHelper.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/internal/VibrationHelper.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/internal/viewpager/PagerAdapter.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/internal/viewpager/PagerAdapter.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/internal/viewpager/PagerAdapter.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/internal/viewpager/PagerAdapter.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/internal/viewpager/ViewPagerTransformer.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/internal/viewpager/ViewPagerTransformer.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/internal/viewpager/ViewPagerTransformer.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/internal/viewpager/ViewPagerTransformer.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/model/SliderPage.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/model/SliderPage.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/model/SliderPage.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/model/SliderPage.kt diff --git a/build-deps/appintro/src/main/java/com/github/appintro/model/SliderPagerBuilder.kt b/composite-builds/build-deps/appintro/src/main/java/com/github/appintro/model/SliderPagerBuilder.kt similarity index 100% rename from build-deps/appintro/src/main/java/com/github/appintro/model/SliderPagerBuilder.kt rename to composite-builds/build-deps/appintro/src/main/java/com/github/appintro/model/SliderPagerBuilder.kt diff --git a/build-deps/appintro/src/main/res/drawable-v21/ic_appintro_ripple.xml b/composite-builds/build-deps/appintro/src/main/res/drawable-v21/ic_appintro_ripple.xml similarity index 100% rename from build-deps/appintro/src/main/res/drawable-v21/ic_appintro_ripple.xml rename to composite-builds/build-deps/appintro/src/main/res/drawable-v21/ic_appintro_ripple.xml diff --git a/build-deps/appintro/src/main/res/drawable/ic_appintro_arrow.xml b/composite-builds/build-deps/appintro/src/main/res/drawable/ic_appintro_arrow.xml similarity index 100% rename from build-deps/appintro/src/main/res/drawable/ic_appintro_arrow.xml rename to composite-builds/build-deps/appintro/src/main/res/drawable/ic_appintro_arrow.xml diff --git a/build-deps/appintro/src/main/res/drawable/ic_appintro_done.xml b/composite-builds/build-deps/appintro/src/main/res/drawable/ic_appintro_done.xml similarity index 100% rename from build-deps/appintro/src/main/res/drawable/ic_appintro_done.xml rename to composite-builds/build-deps/appintro/src/main/res/drawable/ic_appintro_done.xml diff --git a/build-deps/appintro/src/main/res/drawable/ic_appintro_fab_background.xml b/composite-builds/build-deps/appintro/src/main/res/drawable/ic_appintro_fab_background.xml similarity index 100% rename from build-deps/appintro/src/main/res/drawable/ic_appintro_fab_background.xml rename to composite-builds/build-deps/appintro/src/main/res/drawable/ic_appintro_fab_background.xml diff --git a/build-deps/appintro/src/main/res/drawable/ic_appintro_fab_done.xml b/composite-builds/build-deps/appintro/src/main/res/drawable/ic_appintro_fab_done.xml similarity index 100% rename from build-deps/appintro/src/main/res/drawable/ic_appintro_fab_done.xml rename to composite-builds/build-deps/appintro/src/main/res/drawable/ic_appintro_fab_done.xml diff --git a/build-deps/appintro/src/main/res/drawable/ic_appintro_fab_next.xml b/composite-builds/build-deps/appintro/src/main/res/drawable/ic_appintro_fab_next.xml similarity index 100% rename from build-deps/appintro/src/main/res/drawable/ic_appintro_fab_next.xml rename to composite-builds/build-deps/appintro/src/main/res/drawable/ic_appintro_fab_next.xml diff --git a/build-deps/appintro/src/main/res/drawable/ic_appintro_fab_selected.xml b/composite-builds/build-deps/appintro/src/main/res/drawable/ic_appintro_fab_selected.xml similarity index 100% rename from build-deps/appintro/src/main/res/drawable/ic_appintro_fab_selected.xml rename to composite-builds/build-deps/appintro/src/main/res/drawable/ic_appintro_fab_selected.xml diff --git a/build-deps/appintro/src/main/res/drawable/ic_appintro_fab_skip.xml b/composite-builds/build-deps/appintro/src/main/res/drawable/ic_appintro_fab_skip.xml similarity index 100% rename from build-deps/appintro/src/main/res/drawable/ic_appintro_fab_skip.xml rename to composite-builds/build-deps/appintro/src/main/res/drawable/ic_appintro_fab_skip.xml diff --git a/build-deps/appintro/src/main/res/drawable/ic_appintro_indicator.xml b/composite-builds/build-deps/appintro/src/main/res/drawable/ic_appintro_indicator.xml similarity index 100% rename from build-deps/appintro/src/main/res/drawable/ic_appintro_indicator.xml rename to composite-builds/build-deps/appintro/src/main/res/drawable/ic_appintro_indicator.xml diff --git a/build-deps/appintro/src/main/res/drawable/ic_appintro_next.xml b/composite-builds/build-deps/appintro/src/main/res/drawable/ic_appintro_next.xml similarity index 100% rename from build-deps/appintro/src/main/res/drawable/ic_appintro_next.xml rename to composite-builds/build-deps/appintro/src/main/res/drawable/ic_appintro_next.xml diff --git a/build-deps/appintro/src/main/res/drawable/ic_appintro_ripple.xml b/composite-builds/build-deps/appintro/src/main/res/drawable/ic_appintro_ripple.xml similarity index 100% rename from build-deps/appintro/src/main/res/drawable/ic_appintro_ripple.xml rename to composite-builds/build-deps/appintro/src/main/res/drawable/ic_appintro_ripple.xml diff --git a/build-deps/appintro/src/main/res/drawable/ic_appintro_skip.xml b/composite-builds/build-deps/appintro/src/main/res/drawable/ic_appintro_skip.xml similarity index 100% rename from build-deps/appintro/src/main/res/drawable/ic_appintro_skip.xml rename to composite-builds/build-deps/appintro/src/main/res/drawable/ic_appintro_skip.xml diff --git a/build-deps/appintro/src/main/res/layout-land/appintro_fragment_intro.xml b/composite-builds/build-deps/appintro/src/main/res/layout-land/appintro_fragment_intro.xml similarity index 100% rename from build-deps/appintro/src/main/res/layout-land/appintro_fragment_intro.xml rename to composite-builds/build-deps/appintro/src/main/res/layout-land/appintro_fragment_intro.xml diff --git a/build-deps/appintro/src/main/res/layout/appintro_fragment_intro.xml b/composite-builds/build-deps/appintro/src/main/res/layout/appintro_fragment_intro.xml similarity index 100% rename from build-deps/appintro/src/main/res/layout/appintro_fragment_intro.xml rename to composite-builds/build-deps/appintro/src/main/res/layout/appintro_fragment_intro.xml diff --git a/build-deps/appintro/src/main/res/layout/appintro_intro_layout.xml b/composite-builds/build-deps/appintro/src/main/res/layout/appintro_intro_layout.xml similarity index 100% rename from build-deps/appintro/src/main/res/layout/appintro_intro_layout.xml rename to composite-builds/build-deps/appintro/src/main/res/layout/appintro_intro_layout.xml diff --git a/build-deps/appintro/src/main/res/layout/appintro_intro_layout2.xml b/composite-builds/build-deps/appintro/src/main/res/layout/appintro_intro_layout2.xml similarity index 100% rename from build-deps/appintro/src/main/res/layout/appintro_intro_layout2.xml rename to composite-builds/build-deps/appintro/src/main/res/layout/appintro_intro_layout2.xml diff --git a/build-deps/appintro/src/main/res/values-ar/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-ar/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-ar/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-ar/strings.xml diff --git a/build-deps/appintro/src/main/res/values-az/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-az/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-az/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-az/strings.xml diff --git a/build-deps/appintro/src/main/res/values-bg/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-bg/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-bg/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-bg/strings.xml diff --git a/build-deps/appintro/src/main/res/values-bn-rIN/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-bn-rIN/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-bn-rIN/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-bn-rIN/strings.xml diff --git a/build-deps/appintro/src/main/res/values-cs/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-cs/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-cs/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-cs/strings.xml diff --git a/build-deps/appintro/src/main/res/values-de/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-de/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-de/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-de/strings.xml diff --git a/build-deps/appintro/src/main/res/values-el/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-el/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-el/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-el/strings.xml diff --git a/build-deps/appintro/src/main/res/values-es/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-es/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-es/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-es/strings.xml diff --git a/build-deps/appintro/src/main/res/values-fa/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-fa/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-fa/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-fa/strings.xml diff --git a/build-deps/appintro/src/main/res/values-fr/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-fr/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-fr/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-fr/strings.xml diff --git a/build-deps/appintro/src/main/res/values-gu/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-gu/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-gu/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-gu/strings.xml diff --git a/build-deps/appintro/src/main/res/values-hi/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-hi/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-hi/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-hi/strings.xml diff --git a/build-deps/appintro/src/main/res/values-hu/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-hu/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-hu/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-hu/strings.xml diff --git a/build-deps/appintro/src/main/res/values-in/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-in/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-in/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-in/strings.xml diff --git a/build-deps/appintro/src/main/res/values-it/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-it/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-it/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-it/strings.xml diff --git a/build-deps/appintro/src/main/res/values-ja/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-ja/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-ja/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-ja/strings.xml diff --git a/build-deps/appintro/src/main/res/values-ko/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-ko/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-ko/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-ko/strings.xml diff --git a/build-deps/appintro/src/main/res/values-lt/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-lt/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-lt/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-lt/strings.xml diff --git a/build-deps/appintro/src/main/res/values-nl/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-nl/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-nl/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-nl/strings.xml diff --git a/build-deps/appintro/src/main/res/values-no/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-no/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-no/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-no/strings.xml diff --git a/build-deps/appintro/src/main/res/values-pl/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-pl/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-pl/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-pl/strings.xml diff --git a/build-deps/appintro/src/main/res/values-pt-rBR/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-pt-rBR/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-pt-rBR/strings.xml diff --git a/build-deps/appintro/src/main/res/values-pt/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-pt/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-pt/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-pt/strings.xml diff --git a/build-deps/appintro/src/main/res/values-ro/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-ro/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-ro/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-ro/strings.xml diff --git a/build-deps/appintro/src/main/res/values-ru/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-ru/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-ru/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-ru/strings.xml diff --git a/build-deps/appintro/src/main/res/values-sk/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-sk/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-sk/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-sk/strings.xml diff --git a/build-deps/appintro/src/main/res/values-sr/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-sr/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-sr/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-sr/strings.xml diff --git a/build-deps/appintro/src/main/res/values-sw600dp/dimen-sw600dp.xml b/composite-builds/build-deps/appintro/src/main/res/values-sw600dp/dimen-sw600dp.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-sw600dp/dimen-sw600dp.xml rename to composite-builds/build-deps/appintro/src/main/res/values-sw600dp/dimen-sw600dp.xml diff --git a/build-deps/appintro/src/main/res/values-ta/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-ta/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-ta/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-ta/strings.xml diff --git a/build-deps/appintro/src/main/res/values-tr/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-tr/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-tr/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-tr/strings.xml diff --git a/build-deps/appintro/src/main/res/values-uk-rUA/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-uk-rUA/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-uk-rUA/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-uk-rUA/strings.xml diff --git a/build-deps/appintro/src/main/res/values-v21/styles.xml b/composite-builds/build-deps/appintro/src/main/res/values-v21/styles.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-v21/styles.xml rename to composite-builds/build-deps/appintro/src/main/res/values-v21/styles.xml diff --git a/build-deps/appintro/src/main/res/values-vi-rVN/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-vi-rVN/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-vi-rVN/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-vi-rVN/strings.xml diff --git a/build-deps/appintro/src/main/res/values-vi/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-vi/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-vi/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-vi/strings.xml diff --git a/build-deps/appintro/src/main/res/values-yo/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-yo/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-yo/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-yo/strings.xml diff --git a/build-deps/appintro/src/main/res/values-zh-rCN/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-zh-rCN/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-zh-rCN/strings.xml diff --git a/build-deps/appintro/src/main/res/values-zh-rTW/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values-zh-rTW/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values-zh-rTW/strings.xml diff --git a/build-deps/appintro/src/main/res/values/colors.xml b/composite-builds/build-deps/appintro/src/main/res/values/colors.xml similarity index 100% rename from build-deps/appintro/src/main/res/values/colors.xml rename to composite-builds/build-deps/appintro/src/main/res/values/colors.xml diff --git a/build-deps/appintro/src/main/res/values/dimen.xml b/composite-builds/build-deps/appintro/src/main/res/values/dimen.xml similarity index 100% rename from build-deps/appintro/src/main/res/values/dimen.xml rename to composite-builds/build-deps/appintro/src/main/res/values/dimen.xml diff --git a/build-deps/appintro/src/main/res/values/strings.xml b/composite-builds/build-deps/appintro/src/main/res/values/strings.xml similarity index 100% rename from build-deps/appintro/src/main/res/values/strings.xml rename to composite-builds/build-deps/appintro/src/main/res/values/strings.xml diff --git a/build-deps/appintro/src/main/res/values/styles.xml b/composite-builds/build-deps/appintro/src/main/res/values/styles.xml similarity index 100% rename from build-deps/appintro/src/main/res/values/styles.xml rename to composite-builds/build-deps/appintro/src/main/res/values/styles.xml diff --git a/build-deps/build.gradle.kts b/composite-builds/build-deps/build.gradle.kts similarity index 100% rename from build-deps/build.gradle.kts rename to composite-builds/build-deps/build.gradle.kts diff --git a/build-deps/google-java-format/.gitignore b/composite-builds/build-deps/fuzzysearch/.gitignore similarity index 100% rename from build-deps/google-java-format/.gitignore rename to composite-builds/build-deps/fuzzysearch/.gitignore diff --git a/build-deps/fuzzysearch/build.gradle.kts b/composite-builds/build-deps/fuzzysearch/build.gradle.kts similarity index 100% rename from build-deps/fuzzysearch/build.gradle.kts rename to composite-builds/build-deps/fuzzysearch/build.gradle.kts diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/diffutils/DiffUtils.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/diffutils/DiffUtils.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/diffutils/DiffUtils.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/diffutils/DiffUtils.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/diffutils/structs/EditOp.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/diffutils/structs/EditOp.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/diffutils/structs/EditOp.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/diffutils/structs/EditOp.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/diffutils/structs/EditType.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/diffutils/structs/EditType.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/diffutils/structs/EditType.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/diffutils/structs/EditType.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/diffutils/structs/MatchingBlock.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/diffutils/structs/MatchingBlock.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/diffutils/structs/MatchingBlock.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/diffutils/structs/MatchingBlock.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/diffutils/structs/OpCode.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/diffutils/structs/OpCode.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/diffutils/structs/OpCode.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/diffutils/structs/OpCode.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/Applicable.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/Applicable.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/Applicable.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/Applicable.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/Extractor.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/Extractor.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/Extractor.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/Extractor.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/FuzzySearch.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/FuzzySearch.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/FuzzySearch.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/FuzzySearch.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/Ratio.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/Ratio.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/Ratio.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/Ratio.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/StringProcessor.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/StringProcessor.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/StringProcessor.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/StringProcessor.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/ToStringFunction.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/ToStringFunction.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/ToStringFunction.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/ToStringFunction.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/BasicAlgorithm.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/BasicAlgorithm.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/BasicAlgorithm.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/BasicAlgorithm.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/DefaultStringFunction.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/DefaultStringFunction.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/DefaultStringFunction.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/DefaultStringFunction.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/DefaultStringProcessor.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/DefaultStringProcessor.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/DefaultStringProcessor.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/DefaultStringProcessor.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/NoProcess.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/NoProcess.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/NoProcess.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/NoProcess.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/PrimitiveUtils.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/PrimitiveUtils.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/PrimitiveUtils.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/PrimitiveUtils.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/RatioAlgorithm.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/RatioAlgorithm.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/RatioAlgorithm.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/RatioAlgorithm.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/SetUtils.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/SetUtils.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/SetUtils.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/SetUtils.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/TokenSet.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/TokenSet.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/TokenSet.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/TokenSet.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/TokenSort.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/TokenSort.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/TokenSort.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/TokenSort.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/Utils.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/Utils.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/Utils.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/Utils.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/WeightedRatio.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/WeightedRatio.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/WeightedRatio.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/algorithms/WeightedRatio.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/model/BoundExtractedResult.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/model/BoundExtractedResult.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/model/BoundExtractedResult.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/model/BoundExtractedResult.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/model/ExtractedResult.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/model/ExtractedResult.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/model/ExtractedResult.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/model/ExtractedResult.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/ratios/PartialRatio.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/ratios/PartialRatio.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/ratios/PartialRatio.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/ratios/PartialRatio.java diff --git a/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/ratios/SimpleRatio.java b/composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/ratios/SimpleRatio.java similarity index 100% rename from build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/ratios/SimpleRatio.java rename to composite-builds/build-deps/fuzzysearch/src/main/java/com/itsaky/androidide/fuzzysearch/ratios/SimpleRatio.java diff --git a/build-deps/java-compiler/.gitignore b/composite-builds/build-deps/google-java-format/.gitignore similarity index 100% rename from build-deps/java-compiler/.gitignore rename to composite-builds/build-deps/google-java-format/.gitignore diff --git a/build-deps/google-java-format/build.gradle.kts b/composite-builds/build-deps/google-java-format/build.gradle.kts similarity index 100% rename from build-deps/google-java-format/build.gradle.kts rename to composite-builds/build-deps/google-java-format/build.gradle.kts diff --git a/build-deps/google-java-format/src/main/java/com/google/common/collect/CollectSpliteratorUtils.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/common/collect/CollectSpliteratorUtils.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/common/collect/CollectSpliteratorUtils.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/common/collect/CollectSpliteratorUtils.java diff --git a/build-deps/google-java-format/src/main/java/com/google/common/collect/ImmutableListUtils.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/common/collect/ImmutableListUtils.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/common/collect/ImmutableListUtils.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/common/collect/ImmutableListUtils.java diff --git a/build-deps/google-java-format/src/main/java/com/google/common/collect/Streams.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/common/collect/Streams.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/common/collect/Streams.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/common/collect/Streams.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/CloseOp.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/CloseOp.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/CloseOp.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/CloseOp.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/CommentsHelper.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/CommentsHelper.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/CommentsHelper.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/CommentsHelper.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Doc.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Doc.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Doc.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Doc.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/DocBuilder.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/DocBuilder.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/DocBuilder.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/DocBuilder.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/FormatterDiagnostic.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/FormatterDiagnostic.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/FormatterDiagnostic.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/FormatterDiagnostic.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/FormattingError.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/FormattingError.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/FormattingError.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/FormattingError.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Indent.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Indent.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Indent.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Indent.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Input.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Input.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Input.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Input.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/InputOutput.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/InputOutput.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/InputOutput.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/InputOutput.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Newlines.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Newlines.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Newlines.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Newlines.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Op.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Op.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Op.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Op.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/OpenOp.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/OpenOp.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/OpenOp.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/OpenOp.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/OpsBuilder.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/OpsBuilder.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/OpsBuilder.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/OpsBuilder.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Output.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Output.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Output.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/Output.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/AutoOneOf_JavaInputAstVisitor_AnnotationOrModifier.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/AutoOneOf_JavaInputAstVisitor_AnnotationOrModifier.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/AutoOneOf_JavaInputAstVisitor_AnnotationOrModifier.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/AutoOneOf_JavaInputAstVisitor_AnnotationOrModifier.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/AutoValue_JavaInputAstVisitor_DeclarationModifiersAndTypeAnnotations.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/AutoValue_JavaInputAstVisitor_DeclarationModifiersAndTypeAnnotations.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/AutoValue_JavaInputAstVisitor_DeclarationModifiersAndTypeAnnotations.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/AutoValue_JavaInputAstVisitor_DeclarationModifiersAndTypeAnnotations.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/CommandLineOptions.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/CommandLineOptions.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/CommandLineOptions.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/CommandLineOptions.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/CommandLineOptionsParser.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/CommandLineOptionsParser.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/CommandLineOptionsParser.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/CommandLineOptionsParser.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/DimensionHelpers.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/DimensionHelpers.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/DimensionHelpers.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/DimensionHelpers.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/FormatFileCallable.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/FormatFileCallable.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/FormatFileCallable.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/FormatFileCallable.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/Formatter.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/Formatter.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/Formatter.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/Formatter.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/FormatterException.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/FormatterException.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/FormatterException.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/FormatterException.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/GoogleJavaFormatVersion.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/GoogleJavaFormatVersion.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/GoogleJavaFormatVersion.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/GoogleJavaFormatVersion.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/GoogleJavaFormatVersion.java.template b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/GoogleJavaFormatVersion.java.template similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/GoogleJavaFormatVersion.java.template rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/GoogleJavaFormatVersion.java.template diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/ImportOrderer.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/ImportOrderer.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/ImportOrderer.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/ImportOrderer.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaCommentsHelper.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaCommentsHelper.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaCommentsHelper.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaCommentsHelper.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaFormatterOptions.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaFormatterOptions.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaFormatterOptions.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaFormatterOptions.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaInput.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaInput.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaInput.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaInput.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaInputAstVisitor.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaOutput.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaOutput.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaOutput.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavaOutput.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavacTokens.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavacTokens.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavacTokens.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/JavacTokens.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/Main.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/Main.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/Main.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/Main.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/ModifierOrderer.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/ModifierOrderer.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/ModifierOrderer.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/ModifierOrderer.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/RemoveUnusedImports.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/RemoveUnusedImports.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/RemoveUnusedImports.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/RemoveUnusedImports.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/Replacement.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/Replacement.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/Replacement.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/Replacement.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/SnippetFormatter.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/SnippetFormatter.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/SnippetFormatter.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/SnippetFormatter.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/StringWrapper.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/StringWrapper.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/StringWrapper.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/StringWrapper.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/Trees.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/Trees.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/Trees.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/Trees.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/TypeNameClassifier.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/TypeNameClassifier.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/TypeNameClassifier.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/TypeNameClassifier.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/UsageException.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/UsageException.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/UsageException.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/UsageException.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/filer/FormattingFiler.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/filer/FormattingFiler.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/filer/FormattingFiler.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/filer/FormattingFiler.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/filer/FormattingJavaFileObject.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/filer/FormattingJavaFileObject.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/filer/FormattingJavaFileObject.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/filer/FormattingJavaFileObject.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/java17/Java17InputAstVisitor.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/java17/Java17InputAstVisitor.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/java17/Java17InputAstVisitor.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/java17/Java17InputAstVisitor.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/CharStream.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/CharStream.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/CharStream.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/CharStream.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocFormatter.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocFormatter.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocFormatter.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocFormatter.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocLexer.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocLexer.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocLexer.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocLexer.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocWriter.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocWriter.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocWriter.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/JavadocWriter.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/NestingCounter.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/NestingCounter.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/NestingCounter.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/NestingCounter.java diff --git a/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/Token.java b/composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/Token.java similarity index 100% rename from build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/Token.java rename to composite-builds/build-deps/google-java-format/src/main/java/com/google/googlejavaformat/java/javadoc/Token.java diff --git a/composite-builds/build-deps/gradle.properties b/composite-builds/build-deps/gradle.properties new file mode 100644 index 000000000..c135c26f5 --- /dev/null +++ b/composite-builds/build-deps/gradle.properties @@ -0,0 +1,23 @@ +# +# This file is part of AndroidIDE. +# +# AndroidIDE is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# AndroidIDE is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with AndroidIDE. If not, see . +# + +org.gradle.parallel=true +org.gradle.caching=true +org.gradle.configureondemand=true + +android.useAndroidX=true +android.enableJetifier=false \ No newline at end of file diff --git a/build-deps/javac/.gitignore b/composite-builds/build-deps/java-compiler/.gitignore similarity index 100% rename from build-deps/javac/.gitignore rename to composite-builds/build-deps/java-compiler/.gitignore diff --git a/build-deps/java-compiler/build.gradle.kts b/composite-builds/build-deps/java-compiler/build.gradle.kts similarity index 100% rename from build-deps/java-compiler/build.gradle.kts rename to composite-builds/build-deps/java-compiler/build.gradle.kts diff --git a/build-deps/java-compiler/src/main/java/com/itsaky/androidide/javac/config/JavacConfigProvider.java b/composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/javac/config/JavacConfigProvider.java similarity index 100% rename from build-deps/java-compiler/src/main/java/com/itsaky/androidide/javac/config/JavacConfigProvider.java rename to composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/javac/config/JavacConfigProvider.java diff --git a/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/AndroidFsProvider.java b/composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/AndroidFsProvider.java similarity index 100% rename from build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/AndroidFsProvider.java rename to composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/AndroidFsProvider.java diff --git a/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ByteArrayChannel.java b/composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ByteArrayChannel.java similarity index 100% rename from build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ByteArrayChannel.java rename to composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ByteArrayChannel.java diff --git a/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/Collections2.java b/composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/Collections2.java similarity index 100% rename from build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/Collections2.java rename to composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/Collections2.java diff --git a/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/JarFileSystemProvider.java b/composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/JarFileSystemProvider.java similarity index 100% rename from build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/JarFileSystemProvider.java rename to composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/JarFileSystemProvider.java diff --git a/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/JarPackageProvider.java b/composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/JarPackageProvider.java similarity index 100% rename from build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/JarPackageProvider.java rename to composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/JarPackageProvider.java diff --git a/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipCoder.java b/composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipCoder.java similarity index 100% rename from build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipCoder.java rename to composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipCoder.java diff --git a/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipConstants.java b/composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipConstants.java similarity index 100% rename from build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipConstants.java rename to composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipConstants.java diff --git a/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipDirectoryStream.java b/composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipDirectoryStream.java similarity index 100% rename from build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipDirectoryStream.java rename to composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipDirectoryStream.java diff --git a/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipFileAttributeView.java b/composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipFileAttributeView.java similarity index 100% rename from build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipFileAttributeView.java rename to composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipFileAttributeView.java diff --git a/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipFileAttributes.java b/composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipFileAttributes.java similarity index 100% rename from build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipFileAttributes.java rename to composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipFileAttributes.java diff --git a/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipFileStore.java b/composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipFileStore.java similarity index 100% rename from build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipFileStore.java rename to composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipFileStore.java diff --git a/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipFileSystem.java b/composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipFileSystem.java similarity index 100% rename from build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipFileSystem.java rename to composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipFileSystem.java diff --git a/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipFileSystemProvider.java b/composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipFileSystemProvider.java similarity index 100% rename from build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipFileSystemProvider.java rename to composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipFileSystemProvider.java diff --git a/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipInfo.java b/composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipInfo.java similarity index 100% rename from build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipInfo.java rename to composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipInfo.java diff --git a/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipPath.java b/composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipPath.java similarity index 100% rename from build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipPath.java rename to composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipPath.java diff --git a/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipUtils.java b/composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipUtils.java similarity index 100% rename from build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipUtils.java rename to composite-builds/build-deps/java-compiler/src/main/java/com/itsaky/androidide/zipfs2/ZipUtils.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/PreviewFeature.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/PreviewFeature.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/PreviewFeature.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/PreviewFeature.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jimage/BasicImageReader.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/BasicImageReader.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jimage/BasicImageReader.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/BasicImageReader.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageBufferCache.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageBufferCache.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageBufferCache.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageBufferCache.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageHeader.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageHeader.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageHeader.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageHeader.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageLocation.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageLocation.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageLocation.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageLocation.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageReader.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageReader.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageReader.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageReader.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageReaderFactory.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageReaderFactory.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageReaderFactory.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageReaderFactory.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageStream.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageStream.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageStream.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageStream.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageStrings.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageStrings.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageStrings.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageStrings.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageStringsReader.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageStringsReader.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageStringsReader.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/ImageStringsReader.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jimage/NativeImageBuffer.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/NativeImageBuffer.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jimage/NativeImageBuffer.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/NativeImageBuffer.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/CompressIndexes.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/CompressIndexes.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/CompressIndexes.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/CompressIndexes.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/CompressedResourceHeader.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/CompressedResourceHeader.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/CompressedResourceHeader.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/CompressedResourceHeader.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/Decompressor.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/Decompressor.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/Decompressor.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/Decompressor.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/ResourceDecompressor.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/ResourceDecompressor.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/ResourceDecompressor.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/ResourceDecompressor.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/ResourceDecompressorFactory.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/ResourceDecompressorFactory.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/ResourceDecompressorFactory.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/ResourceDecompressorFactory.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/ResourceDecompressorRepository.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/ResourceDecompressorRepository.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/ResourceDecompressorRepository.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/ResourceDecompressorRepository.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/SignatureParser.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/SignatureParser.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/SignatureParser.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/SignatureParser.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/StringSharingDecompressor.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/StringSharingDecompressor.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/StringSharingDecompressor.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/StringSharingDecompressor.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/StringSharingDecompressorFactory.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/StringSharingDecompressorFactory.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/StringSharingDecompressorFactory.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/StringSharingDecompressorFactory.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/ZipDecompressor.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/ZipDecompressor.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/ZipDecompressor.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/ZipDecompressor.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/ZipDecompressorFactory.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/ZipDecompressorFactory.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/ZipDecompressorFactory.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jimage/decompressor/ZipDecompressorFactory.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jmod/JmodFile.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jmod/JmodFile.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jmod/JmodFile.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jmod/JmodFile.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/ExplodedImage.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/ExplodedImage.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jrtfs/ExplodedImage.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/ExplodedImage.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtDirectoryStream.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtDirectoryStream.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtDirectoryStream.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtDirectoryStream.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtFileAttributeView.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtFileAttributeView.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtFileAttributeView.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtFileAttributeView.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtFileAttributes.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtFileAttributes.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtFileAttributes.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtFileAttributes.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtFileStore.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtFileStore.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtFileStore.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtFileStore.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtFileSystem.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtFileSystem.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtFileSystem.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtFileSystem.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtFileSystemProvider.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtFileSystemProvider.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtFileSystemProvider.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtFileSystemProvider.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtPath.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtPath.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtPath.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtPath.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtUtils.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtUtils.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtUtils.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/JrtUtils.java diff --git a/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/SystemImage.java b/composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/SystemImage.java similarity index 100% rename from build-deps/java-compiler/src/main/java/javac/internal/jrtfs/SystemImage.java rename to composite-builds/build-deps/java-compiler/src/main/java/javac/internal/jrtfs/SystemImage.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/AbstractProcessor.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/AbstractProcessor.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/annotation/processing/AbstractProcessor.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/AbstractProcessor.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Completion.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Completion.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Completion.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Completion.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Completions.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Completions.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Completions.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Completions.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Filer.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Filer.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Filer.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Filer.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/FilerException.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/FilerException.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/annotation/processing/FilerException.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/FilerException.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Generated.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Generated.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Generated.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Generated.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Messager.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Messager.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Messager.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Messager.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/ProcessingEnvironment.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/ProcessingEnvironment.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/annotation/processing/ProcessingEnvironment.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/ProcessingEnvironment.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Processor.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Processor.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Processor.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/Processor.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/RoundEnvironment.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/RoundEnvironment.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/annotation/processing/RoundEnvironment.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/RoundEnvironment.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/SupportedAnnotationTypes.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/SupportedAnnotationTypes.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/annotation/processing/SupportedAnnotationTypes.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/SupportedAnnotationTypes.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/SupportedOptions.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/SupportedOptions.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/annotation/processing/SupportedOptions.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/SupportedOptions.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/SupportedSourceVersion.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/SupportedSourceVersion.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/annotation/processing/SupportedSourceVersion.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/SupportedSourceVersion.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/package-info.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/package-info.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/annotation/processing/package-info.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/annotation/processing/package-info.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/AnnotatedConstruct.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/AnnotatedConstruct.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/AnnotatedConstruct.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/AnnotatedConstruct.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/SourceVersion.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/SourceVersion.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/SourceVersion.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/SourceVersion.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/UnknownEntityException.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/UnknownEntityException.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/UnknownEntityException.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/UnknownEntityException.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/AnnotationMirror.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/AnnotationMirror.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/element/AnnotationMirror.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/AnnotationMirror.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/AnnotationValue.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/AnnotationValue.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/element/AnnotationValue.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/AnnotationValue.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/AnnotationValueVisitor.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/AnnotationValueVisitor.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/element/AnnotationValueVisitor.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/AnnotationValueVisitor.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/Element.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/Element.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/element/Element.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/Element.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/ElementKind.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/ElementKind.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/element/ElementKind.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/ElementKind.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/ElementVisitor.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/ElementVisitor.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/element/ElementVisitor.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/ElementVisitor.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/ExecutableElement.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/ExecutableElement.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/element/ExecutableElement.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/ExecutableElement.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/Modifier.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/Modifier.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/element/Modifier.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/Modifier.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/ModuleElement.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/ModuleElement.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/element/ModuleElement.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/ModuleElement.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/Name.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/Name.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/element/Name.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/Name.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/NestingKind.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/NestingKind.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/element/NestingKind.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/NestingKind.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/PackageElement.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/PackageElement.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/element/PackageElement.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/PackageElement.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/Parameterizable.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/Parameterizable.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/element/Parameterizable.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/Parameterizable.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/QualifiedNameable.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/QualifiedNameable.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/element/QualifiedNameable.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/QualifiedNameable.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/RecordComponentElement.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/RecordComponentElement.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/element/RecordComponentElement.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/RecordComponentElement.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/TypeElement.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/TypeElement.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/element/TypeElement.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/TypeElement.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/TypeParameterElement.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/TypeParameterElement.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/element/TypeParameterElement.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/TypeParameterElement.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/UnknownAnnotationValueException.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/UnknownAnnotationValueException.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/element/UnknownAnnotationValueException.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/UnknownAnnotationValueException.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/UnknownDirectiveException.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/UnknownDirectiveException.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/element/UnknownDirectiveException.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/UnknownDirectiveException.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/UnknownElementException.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/UnknownElementException.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/element/UnknownElementException.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/UnknownElementException.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/VariableElement.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/VariableElement.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/element/VariableElement.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/VariableElement.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/package-info.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/package-info.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/element/package-info.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/element/package-info.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/package-info.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/package-info.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/package-info.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/package-info.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/ArrayType.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/ArrayType.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/type/ArrayType.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/ArrayType.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/DeclaredType.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/DeclaredType.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/type/DeclaredType.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/DeclaredType.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/ErrorType.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/ErrorType.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/type/ErrorType.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/ErrorType.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/ExecutableType.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/ExecutableType.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/type/ExecutableType.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/ExecutableType.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/IntersectionType.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/IntersectionType.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/type/IntersectionType.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/IntersectionType.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/MirroredTypeException.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/MirroredTypeException.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/type/MirroredTypeException.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/MirroredTypeException.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/MirroredTypesException.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/MirroredTypesException.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/type/MirroredTypesException.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/MirroredTypesException.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/NoType.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/NoType.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/type/NoType.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/NoType.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/NullType.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/NullType.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/type/NullType.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/NullType.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/PrimitiveType.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/PrimitiveType.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/type/PrimitiveType.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/PrimitiveType.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/ReferenceType.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/ReferenceType.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/type/ReferenceType.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/ReferenceType.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/TypeKind.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/TypeKind.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/type/TypeKind.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/TypeKind.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/TypeMirror.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/TypeMirror.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/type/TypeMirror.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/TypeMirror.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/TypeVariable.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/TypeVariable.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/type/TypeVariable.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/TypeVariable.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/TypeVisitor.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/TypeVisitor.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/type/TypeVisitor.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/TypeVisitor.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/UnionType.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/UnionType.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/type/UnionType.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/UnionType.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/UnknownTypeException.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/UnknownTypeException.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/type/UnknownTypeException.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/UnknownTypeException.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/WildcardType.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/WildcardType.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/type/WildcardType.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/WildcardType.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/package-info.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/package-info.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/type/package-info.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/type/package-info.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractAnnotationValueVisitor14.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractAnnotationValueVisitor14.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractAnnotationValueVisitor14.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractAnnotationValueVisitor14.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractAnnotationValueVisitor6.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractAnnotationValueVisitor6.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractAnnotationValueVisitor6.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractAnnotationValueVisitor6.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractAnnotationValueVisitor7.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractAnnotationValueVisitor7.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractAnnotationValueVisitor7.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractAnnotationValueVisitor7.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractAnnotationValueVisitor8.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractAnnotationValueVisitor8.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractAnnotationValueVisitor8.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractAnnotationValueVisitor8.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractAnnotationValueVisitor9.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractAnnotationValueVisitor9.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractAnnotationValueVisitor9.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractAnnotationValueVisitor9.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractElementVisitor14.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractElementVisitor14.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractElementVisitor14.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractElementVisitor14.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractElementVisitor6.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractElementVisitor6.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractElementVisitor6.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractElementVisitor6.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractElementVisitor7.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractElementVisitor7.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractElementVisitor7.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractElementVisitor7.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractElementVisitor8.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractElementVisitor8.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractElementVisitor8.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractElementVisitor8.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractElementVisitor9.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractElementVisitor9.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractElementVisitor9.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractElementVisitor9.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractTypeVisitor14.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractTypeVisitor14.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractTypeVisitor14.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractTypeVisitor14.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractTypeVisitor6.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractTypeVisitor6.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractTypeVisitor6.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractTypeVisitor6.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractTypeVisitor7.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractTypeVisitor7.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractTypeVisitor7.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractTypeVisitor7.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractTypeVisitor8.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractTypeVisitor8.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractTypeVisitor8.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractTypeVisitor8.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractTypeVisitor9.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractTypeVisitor9.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractTypeVisitor9.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/AbstractTypeVisitor9.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementFilter.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementFilter.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementFilter.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementFilter.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementKindVisitor14.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementKindVisitor14.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementKindVisitor14.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementKindVisitor14.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementKindVisitor6.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementKindVisitor6.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementKindVisitor6.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementKindVisitor6.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementKindVisitor7.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementKindVisitor7.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementKindVisitor7.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementKindVisitor7.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementKindVisitor8.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementKindVisitor8.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementKindVisitor8.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementKindVisitor8.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementKindVisitor9.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementKindVisitor9.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementKindVisitor9.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementKindVisitor9.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementScanner14.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementScanner14.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementScanner14.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementScanner14.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementScanner6.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementScanner6.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementScanner6.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementScanner6.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementScanner7.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementScanner7.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementScanner7.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementScanner7.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementScanner8.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementScanner8.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementScanner8.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementScanner8.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementScanner9.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementScanner9.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementScanner9.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/ElementScanner9.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/Elements.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/Elements.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/Elements.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/Elements.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleAnnotationValueVisitor14.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleAnnotationValueVisitor14.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleAnnotationValueVisitor14.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleAnnotationValueVisitor14.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleAnnotationValueVisitor6.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleAnnotationValueVisitor6.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleAnnotationValueVisitor6.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleAnnotationValueVisitor6.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleAnnotationValueVisitor7.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleAnnotationValueVisitor7.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleAnnotationValueVisitor7.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleAnnotationValueVisitor7.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleAnnotationValueVisitor8.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleAnnotationValueVisitor8.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleAnnotationValueVisitor8.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleAnnotationValueVisitor8.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleAnnotationValueVisitor9.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleAnnotationValueVisitor9.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleAnnotationValueVisitor9.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleAnnotationValueVisitor9.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleElementVisitor14.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleElementVisitor14.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleElementVisitor14.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleElementVisitor14.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleElementVisitor6.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleElementVisitor6.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleElementVisitor6.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleElementVisitor6.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleElementVisitor7.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleElementVisitor7.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleElementVisitor7.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleElementVisitor7.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleElementVisitor8.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleElementVisitor8.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleElementVisitor8.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleElementVisitor8.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleElementVisitor9.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleElementVisitor9.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleElementVisitor9.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleElementVisitor9.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleTypeVisitor14.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleTypeVisitor14.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleTypeVisitor14.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleTypeVisitor14.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleTypeVisitor6.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleTypeVisitor6.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleTypeVisitor6.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleTypeVisitor6.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleTypeVisitor7.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleTypeVisitor7.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleTypeVisitor7.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleTypeVisitor7.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleTypeVisitor8.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleTypeVisitor8.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleTypeVisitor8.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleTypeVisitor8.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleTypeVisitor9.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleTypeVisitor9.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleTypeVisitor9.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/SimpleTypeVisitor9.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/TypeKindVisitor14.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/TypeKindVisitor14.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/TypeKindVisitor14.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/TypeKindVisitor14.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/TypeKindVisitor6.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/TypeKindVisitor6.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/TypeKindVisitor6.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/TypeKindVisitor6.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/TypeKindVisitor7.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/TypeKindVisitor7.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/TypeKindVisitor7.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/TypeKindVisitor7.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/TypeKindVisitor8.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/TypeKindVisitor8.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/TypeKindVisitor8.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/TypeKindVisitor8.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/TypeKindVisitor9.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/TypeKindVisitor9.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/TypeKindVisitor9.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/TypeKindVisitor9.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/Types.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/Types.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/Types.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/Types.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/package-info.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/package-info.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/lang/model/util/package-info.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/lang/model/util/package-info.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/tools/Diagnostic.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/Diagnostic.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/tools/Diagnostic.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/Diagnostic.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/tools/DiagnosticCollector.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/DiagnosticCollector.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/tools/DiagnosticCollector.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/DiagnosticCollector.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/tools/DiagnosticListener.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/DiagnosticListener.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/tools/DiagnosticListener.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/DiagnosticListener.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/tools/DocumentationTool.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/DocumentationTool.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/tools/DocumentationTool.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/DocumentationTool.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/tools/FileObject.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/FileObject.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/tools/FileObject.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/FileObject.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/tools/ForwardingFileObject.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/ForwardingFileObject.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/tools/ForwardingFileObject.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/ForwardingFileObject.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/tools/ForwardingJavaFileManager.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/ForwardingJavaFileManager.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/tools/ForwardingJavaFileManager.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/ForwardingJavaFileManager.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/tools/ForwardingJavaFileObject.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/ForwardingJavaFileObject.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/tools/ForwardingJavaFileObject.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/ForwardingJavaFileObject.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/tools/JavaCompiler.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/JavaCompiler.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/tools/JavaCompiler.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/JavaCompiler.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/tools/JavaFileManager.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/JavaFileManager.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/tools/JavaFileManager.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/JavaFileManager.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/tools/JavaFileObject.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/JavaFileObject.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/tools/JavaFileObject.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/JavaFileObject.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/tools/OptionChecker.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/OptionChecker.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/tools/OptionChecker.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/OptionChecker.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/tools/SimpleJavaFileObject.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/SimpleJavaFileObject.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/tools/SimpleJavaFileObject.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/SimpleJavaFileObject.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/tools/StandardJavaFileManager.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/StandardJavaFileManager.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/tools/StandardJavaFileManager.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/StandardJavaFileManager.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/tools/StandardLocation.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/StandardLocation.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/tools/StandardLocation.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/StandardLocation.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/tools/Tool.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/Tool.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/tools/Tool.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/Tool.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/tools/ToolProvider.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/ToolProvider.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/tools/ToolProvider.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/ToolProvider.java diff --git a/build-deps/java-compiler/src/main/java/jdkx/tools/package-info.java b/composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/package-info.java similarity index 100% rename from build-deps/java-compiler/src/main/java/jdkx/tools/package-info.java rename to composite-builds/build-deps/java-compiler/src/main/java/jdkx/tools/package-info.java diff --git a/build-deps/javapoet/.gitignore b/composite-builds/build-deps/javac/.gitignore similarity index 100% rename from build-deps/javapoet/.gitignore rename to composite-builds/build-deps/javac/.gitignore diff --git a/build-deps/javac/build.gradle.kts b/composite-builds/build-deps/javac/build.gradle.kts similarity index 100% rename from build-deps/javac/build.gradle.kts rename to composite-builds/build-deps/javac/build.gradle.kts diff --git a/build-deps/jaxp/.gitignore b/composite-builds/build-deps/javapoet/.gitignore similarity index 100% rename from build-deps/jaxp/.gitignore rename to composite-builds/build-deps/javapoet/.gitignore diff --git a/build-deps/javapoet/build.gradle.kts b/composite-builds/build-deps/javapoet/build.gradle.kts similarity index 100% rename from build-deps/javapoet/build.gradle.kts rename to composite-builds/build-deps/javapoet/build.gradle.kts diff --git a/build-deps/javapoet/src/main/java/com/squareup/javapoet/AnnotationSpec.java b/composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/AnnotationSpec.java similarity index 100% rename from build-deps/javapoet/src/main/java/com/squareup/javapoet/AnnotationSpec.java rename to composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/AnnotationSpec.java diff --git a/build-deps/javapoet/src/main/java/com/squareup/javapoet/ArrayTypeName.java b/composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/ArrayTypeName.java similarity index 100% rename from build-deps/javapoet/src/main/java/com/squareup/javapoet/ArrayTypeName.java rename to composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/ArrayTypeName.java diff --git a/build-deps/javapoet/src/main/java/com/squareup/javapoet/ClassName.java b/composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/ClassName.java similarity index 100% rename from build-deps/javapoet/src/main/java/com/squareup/javapoet/ClassName.java rename to composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/ClassName.java diff --git a/build-deps/javapoet/src/main/java/com/squareup/javapoet/CodeBlock.java b/composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/CodeBlock.java similarity index 100% rename from build-deps/javapoet/src/main/java/com/squareup/javapoet/CodeBlock.java rename to composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/CodeBlock.java diff --git a/build-deps/javapoet/src/main/java/com/squareup/javapoet/CodeWriter.java b/composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/CodeWriter.java similarity index 100% rename from build-deps/javapoet/src/main/java/com/squareup/javapoet/CodeWriter.java rename to composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/CodeWriter.java diff --git a/build-deps/javapoet/src/main/java/com/squareup/javapoet/FieldSpec.java b/composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/FieldSpec.java similarity index 100% rename from build-deps/javapoet/src/main/java/com/squareup/javapoet/FieldSpec.java rename to composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/FieldSpec.java diff --git a/build-deps/javapoet/src/main/java/com/squareup/javapoet/ImportCollectingCodeWriter.java b/composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/ImportCollectingCodeWriter.java similarity index 100% rename from build-deps/javapoet/src/main/java/com/squareup/javapoet/ImportCollectingCodeWriter.java rename to composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/ImportCollectingCodeWriter.java diff --git a/build-deps/javapoet/src/main/java/com/squareup/javapoet/JavaFile.java b/composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/JavaFile.java similarity index 100% rename from build-deps/javapoet/src/main/java/com/squareup/javapoet/JavaFile.java rename to composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/JavaFile.java diff --git a/build-deps/javapoet/src/main/java/com/squareup/javapoet/LineWrapper.java b/composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/LineWrapper.java similarity index 100% rename from build-deps/javapoet/src/main/java/com/squareup/javapoet/LineWrapper.java rename to composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/LineWrapper.java diff --git a/build-deps/javapoet/src/main/java/com/squareup/javapoet/MethodSpec.java b/composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/MethodSpec.java similarity index 100% rename from build-deps/javapoet/src/main/java/com/squareup/javapoet/MethodSpec.java rename to composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/MethodSpec.java diff --git a/build-deps/javapoet/src/main/java/com/squareup/javapoet/NameAllocator.java b/composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/NameAllocator.java similarity index 100% rename from build-deps/javapoet/src/main/java/com/squareup/javapoet/NameAllocator.java rename to composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/NameAllocator.java diff --git a/build-deps/javapoet/src/main/java/com/squareup/javapoet/ParameterSpec.java b/composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/ParameterSpec.java similarity index 100% rename from build-deps/javapoet/src/main/java/com/squareup/javapoet/ParameterSpec.java rename to composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/ParameterSpec.java diff --git a/build-deps/javapoet/src/main/java/com/squareup/javapoet/ParameterizedTypeName.java b/composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/ParameterizedTypeName.java similarity index 100% rename from build-deps/javapoet/src/main/java/com/squareup/javapoet/ParameterizedTypeName.java rename to composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/ParameterizedTypeName.java diff --git a/build-deps/javapoet/src/main/java/com/squareup/javapoet/TypeName.java b/composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/TypeName.java similarity index 100% rename from build-deps/javapoet/src/main/java/com/squareup/javapoet/TypeName.java rename to composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/TypeName.java diff --git a/build-deps/javapoet/src/main/java/com/squareup/javapoet/TypeSpec.java b/composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/TypeSpec.java similarity index 100% rename from build-deps/javapoet/src/main/java/com/squareup/javapoet/TypeSpec.java rename to composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/TypeSpec.java diff --git a/build-deps/javapoet/src/main/java/com/squareup/javapoet/TypeVariableName.java b/composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/TypeVariableName.java similarity index 100% rename from build-deps/javapoet/src/main/java/com/squareup/javapoet/TypeVariableName.java rename to composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/TypeVariableName.java diff --git a/build-deps/javapoet/src/main/java/com/squareup/javapoet/Util.java b/composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/Util.java similarity index 100% rename from build-deps/javapoet/src/main/java/com/squareup/javapoet/Util.java rename to composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/Util.java diff --git a/build-deps/javapoet/src/main/java/com/squareup/javapoet/WildcardTypeName.java b/composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/WildcardTypeName.java similarity index 100% rename from build-deps/javapoet/src/main/java/com/squareup/javapoet/WildcardTypeName.java rename to composite-builds/build-deps/javapoet/src/main/java/com/squareup/javapoet/WildcardTypeName.java diff --git a/build-deps/jdk-compiler/.gitignore b/composite-builds/build-deps/jaxp/.gitignore similarity index 100% rename from build-deps/jdk-compiler/.gitignore rename to composite-builds/build-deps/jaxp/.gitignore diff --git a/build-deps/jaxp/build.gradle.kts b/composite-builds/build-deps/jaxp/build.gradle.kts similarity index 100% rename from build-deps/jaxp/build.gradle.kts rename to composite-builds/build-deps/jaxp/build.gradle.kts diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/java_cup/internal/runtime/Scanner.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/java_cup/internal/runtime/Scanner.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/java_cup/internal/runtime/Scanner.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/java_cup/internal/runtime/Scanner.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/java_cup/internal/runtime/Symbol.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/java_cup/internal/runtime/Symbol.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/java_cup/internal/runtime/Symbol.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/java_cup/internal/runtime/Symbol.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/java_cup/internal/runtime/lr_parser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/java_cup/internal/runtime/lr_parser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/java_cup/internal/runtime/lr_parser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/java_cup/internal/runtime/lr_parser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/java_cup/internal/runtime/virtual_parse_stack.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/java_cup/internal/runtime/virtual_parse_stack.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/java_cup/internal/runtime/virtual_parse_stack.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/java_cup/internal/runtime/virtual_parse_stack.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/Constants.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/Constants.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/Constants.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/Constants.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/ExceptionConstants.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/ExceptionConstants.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/ExceptionConstants.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/ExceptionConstants.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/Repository.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/Repository.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/Repository.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/Repository.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/AccessFlags.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/AccessFlags.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/AccessFlags.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/AccessFlags.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Attribute.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Attribute.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Attribute.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Attribute.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/AttributeReader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/AttributeReader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/AttributeReader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/AttributeReader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ClassFormatException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ClassFormatException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ClassFormatException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ClassFormatException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ClassParser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ClassParser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ClassParser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ClassParser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Code.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Code.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Code.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Code.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/CodeException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/CodeException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/CodeException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/CodeException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Constant.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Constant.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Constant.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Constant.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantCP.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantCP.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantCP.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantCP.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantClass.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantClass.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantClass.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantClass.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantDouble.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantDouble.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantDouble.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantDouble.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantFieldref.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantFieldref.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantFieldref.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantFieldref.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantFloat.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantFloat.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantFloat.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantFloat.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantInteger.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantInteger.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantInteger.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantInteger.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantInterfaceMethodref.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantInterfaceMethodref.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantInterfaceMethodref.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantInterfaceMethodref.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantLong.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantLong.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantLong.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantLong.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantMethodref.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantMethodref.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantMethodref.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantMethodref.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantNameAndType.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantObject.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantObject.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantObject.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantObject.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantPool.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantPool.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantPool.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantPool.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantString.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantString.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantString.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantString.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantUtf8.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantUtf8.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantUtf8.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantUtf8.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantValue.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantValue.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantValue.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ConstantValue.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Deprecated.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Deprecated.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Deprecated.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Deprecated.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/DescendingVisitor.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/EmptyVisitor.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ExceptionTable.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ExceptionTable.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ExceptionTable.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/ExceptionTable.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Field.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Field.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Field.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Field.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/FieldOrMethod.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/InnerClass.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/InnerClass.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/InnerClass.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/InnerClass.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/InnerClasses.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/InnerClasses.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/InnerClasses.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/InnerClasses.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/JavaClass.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/JavaClass.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/JavaClass.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/JavaClass.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/LineNumber.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/LineNumber.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/LineNumber.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/LineNumber.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/LineNumberTable.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/LineNumberTable.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/LineNumberTable.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/LineNumberTable.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/LocalVariable.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/LocalVariable.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/LocalVariable.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/LocalVariable.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/LocalVariableTable.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/LocalVariableTable.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/LocalVariableTable.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/LocalVariableTable.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/LocalVariableTypeTable.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Method.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Method.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Method.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Method.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Node.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Node.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Node.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Node.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/PMGClass.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/PMGClass.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/PMGClass.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/PMGClass.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Signature.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Signature.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Signature.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Signature.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/SourceFile.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/SourceFile.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/SourceFile.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/SourceFile.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/StackMap.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/StackMap.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/StackMap.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/StackMap.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/StackMapEntry.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/StackMapEntry.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/StackMapEntry.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/StackMapEntry.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/StackMapType.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/StackMapType.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/StackMapType.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/StackMapType.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Synthetic.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Synthetic.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Synthetic.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Synthetic.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Unknown.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Unknown.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Unknown.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Unknown.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Utility.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Utility.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Utility.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Utility.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Visitor.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Visitor.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Visitor.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/Visitor.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/classfile/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/AALOAD.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/AALOAD.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/AALOAD.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/AALOAD.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/AASTORE.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/AASTORE.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/AASTORE.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/AASTORE.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ACONST_NULL.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ACONST_NULL.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ACONST_NULL.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ACONST_NULL.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ALOAD.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ALOAD.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ALOAD.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ALOAD.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ANEWARRAY.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ANEWARRAY.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ANEWARRAY.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ANEWARRAY.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ARETURN.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ARETURN.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ARETURN.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ARETURN.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ARRAYLENGTH.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ASTORE.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ASTORE.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ASTORE.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ASTORE.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ATHROW.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ATHROW.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ATHROW.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ATHROW.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/AllocationInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/AllocationInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/AllocationInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/AllocationInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ArithmeticInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ArrayInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ArrayInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ArrayInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ArrayInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ArrayType.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ArrayType.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ArrayType.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ArrayType.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BALOAD.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BALOAD.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BALOAD.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BALOAD.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BASTORE.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BASTORE.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BASTORE.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BASTORE.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BIPUSH.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BIPUSH.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BIPUSH.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BIPUSH.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BREAKPOINT.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BREAKPOINT.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BREAKPOINT.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BREAKPOINT.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BasicType.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BasicType.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BasicType.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BasicType.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BranchHandle.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BranchHandle.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BranchHandle.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BranchHandle.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BranchInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BranchInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BranchInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/BranchInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CALOAD.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CALOAD.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CALOAD.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CALOAD.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CASTORE.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CASTORE.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CASTORE.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CASTORE.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CHECKCAST.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CHECKCAST.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CHECKCAST.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CHECKCAST.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CPInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CPInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CPInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CPInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ClassGen.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ClassGen.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ClassGen.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ClassGen.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ClassGenException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ClassGenException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ClassGenException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ClassGenException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ClassObserver.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ClassObserver.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ClassObserver.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ClassObserver.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CodeExceptionGen.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CompoundInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CompoundInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CompoundInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/CompoundInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ConstantPoolGen.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ConstantPushInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ConversionInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ConversionInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ConversionInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ConversionInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/D2F.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/D2F.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/D2F.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/D2F.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/D2I.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/D2I.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/D2I.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/D2I.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/D2L.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/D2L.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/D2L.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/D2L.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DADD.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DADD.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DADD.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DADD.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DALOAD.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DALOAD.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DALOAD.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DALOAD.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DASTORE.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DASTORE.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DASTORE.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DASTORE.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DCMPG.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DCMPG.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DCMPG.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DCMPG.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DCMPL.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DCMPL.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DCMPL.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DCMPL.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DCONST.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DCONST.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DCONST.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DCONST.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DDIV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DDIV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DDIV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DDIV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DLOAD.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DLOAD.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DLOAD.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DLOAD.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DMUL.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DMUL.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DMUL.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DMUL.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DNEG.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DNEG.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DNEG.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DNEG.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DREM.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DREM.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DREM.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DREM.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DRETURN.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DRETURN.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DRETURN.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DRETURN.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DSTORE.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DSTORE.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DSTORE.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DSTORE.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DSUB.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DSUB.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DSUB.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DSUB.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP2.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP2.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP2.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP2.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP2_X1.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP2_X1.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP2_X1.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP2_X1.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP2_X2.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP2_X2.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP2_X2.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP2_X2.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP_X1.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP_X1.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP_X1.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP_X1.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP_X2.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP_X2.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP_X2.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/DUP_X2.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/EmptyVisitor.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/EmptyVisitor.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/EmptyVisitor.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/EmptyVisitor.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ExceptionThrower.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ExceptionThrower.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ExceptionThrower.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ExceptionThrower.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/F2D.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/F2D.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/F2D.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/F2D.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/F2I.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/F2I.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/F2I.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/F2I.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/F2L.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/F2L.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/F2L.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/F2L.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FADD.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FADD.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FADD.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FADD.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FALOAD.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FALOAD.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FALOAD.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FALOAD.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FASTORE.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FASTORE.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FASTORE.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FASTORE.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FCMPG.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FCMPG.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FCMPG.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FCMPG.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FCMPL.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FCMPL.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FCMPL.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FCMPL.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FCONST.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FCONST.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FCONST.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FCONST.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FDIV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FDIV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FDIV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FDIV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FLOAD.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FLOAD.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FLOAD.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FLOAD.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FMUL.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FMUL.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FMUL.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FMUL.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FNEG.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FNEG.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FNEG.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FNEG.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FREM.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FREM.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FREM.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FREM.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FRETURN.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FRETURN.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FRETURN.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FRETURN.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FSTORE.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FSTORE.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FSTORE.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FSTORE.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FSUB.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FSUB.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FSUB.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FSUB.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FieldGen.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FieldGen.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FieldGen.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FieldGen.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FieldGenOrMethodGen.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FieldInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FieldInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FieldInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FieldInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FieldObserver.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FieldObserver.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FieldObserver.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FieldObserver.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FieldOrMethod.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FieldOrMethod.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FieldOrMethod.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/FieldOrMethod.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/GETFIELD.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/GETFIELD.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/GETFIELD.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/GETFIELD.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/GETSTATIC.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/GETSTATIC.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/GETSTATIC.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/GETSTATIC.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/GOTO.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/GOTO.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/GOTO.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/GOTO.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/GOTO_W.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/GOTO_W.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/GOTO_W.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/GOTO_W.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/GotoInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/GotoInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/GotoInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/GotoInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2B.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2B.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2B.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2B.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2C.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2C.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2C.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2C.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2D.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2D.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2D.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2D.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2F.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2F.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2F.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2F.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2L.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2L.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2L.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2L.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2S.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2S.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2S.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/I2S.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IADD.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IADD.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IADD.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IADD.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IALOAD.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IALOAD.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IALOAD.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IALOAD.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IAND.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IAND.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IAND.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IAND.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IASTORE.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IASTORE.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IASTORE.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IASTORE.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ICONST.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ICONST.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ICONST.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ICONST.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IDIV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IDIV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IDIV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IDIV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFEQ.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFEQ.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFEQ.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFEQ.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFGE.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFGE.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFGE.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFGE.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFGT.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFGT.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFGT.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFGT.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFLE.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFLE.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFLE.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFLE.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFLT.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFLT.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFLT.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFLT.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFNE.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFNE.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFNE.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFNE.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFNONNULL.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFNONNULL.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFNONNULL.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFNONNULL.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFNULL.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFNULL.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFNULL.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IFNULL.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ACMPEQ.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ACMPNE.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPEQ.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPGE.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPGT.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPLE.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPLT.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IF_ICMPNE.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IINC.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IINC.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IINC.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IINC.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ILOAD.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ILOAD.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ILOAD.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ILOAD.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IMPDEP1.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IMPDEP1.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IMPDEP1.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IMPDEP1.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IMPDEP2.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IMPDEP2.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IMPDEP2.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IMPDEP2.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IMUL.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IMUL.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IMUL.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IMUL.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INEG.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INEG.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INEG.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INEG.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INSTANCEOF.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INSTANCEOF.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INSTANCEOF.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INSTANCEOF.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INVOKEINTERFACE.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INVOKESPECIAL.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INVOKESTATIC.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/INVOKEVIRTUAL.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IOR.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IOR.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IOR.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IOR.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IREM.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IREM.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IREM.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IREM.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IRETURN.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IRETURN.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IRETURN.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IRETURN.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ISHL.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ISHL.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ISHL.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ISHL.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ISHR.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ISHR.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ISHR.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ISHR.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ISTORE.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ISTORE.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ISTORE.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ISTORE.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ISUB.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ISUB.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ISUB.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ISUB.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IUSHR.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IUSHR.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IUSHR.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IUSHR.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IXOR.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IXOR.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IXOR.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IXOR.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IfInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IfInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IfInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IfInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IndexedInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IndexedInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IndexedInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/IndexedInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/Instruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/Instruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/Instruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/Instruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionComparator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionComparator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionComparator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionComparator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionConstants.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionConstants.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionConstants.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionConstants.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionHandle.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionHandle.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionHandle.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionHandle.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionList.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionList.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionList.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionList.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionListObserver.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionListObserver.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionListObserver.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionListObserver.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionTargeter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionTargeter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionTargeter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InstructionTargeter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InvokeInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InvokeInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InvokeInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/InvokeInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/JSR.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/JSR.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/JSR.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/JSR.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/JSR_W.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/JSR_W.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/JSR_W.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/JSR_W.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/JsrInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/JsrInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/JsrInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/JsrInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/L2D.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/L2D.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/L2D.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/L2D.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/L2F.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/L2F.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/L2F.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/L2F.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/L2I.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/L2I.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/L2I.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/L2I.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LADD.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LADD.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LADD.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LADD.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LALOAD.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LALOAD.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LALOAD.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LALOAD.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LAND.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LAND.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LAND.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LAND.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LASTORE.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LASTORE.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LASTORE.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LASTORE.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LCMP.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LCMP.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LCMP.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LCMP.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LCONST.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LCONST.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LCONST.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LCONST.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LDC.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LDC.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LDC.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LDC.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LDC2_W.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LDC2_W.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LDC2_W.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LDC2_W.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LDC_W.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LDC_W.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LDC_W.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LDC_W.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LDIV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LDIV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LDIV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LDIV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LLOAD.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LLOAD.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LLOAD.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LLOAD.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LMUL.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LMUL.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LMUL.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LMUL.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LNEG.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LNEG.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LNEG.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LNEG.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LOOKUPSWITCH.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LOR.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LOR.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LOR.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LOR.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LREM.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LREM.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LREM.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LREM.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LRETURN.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LRETURN.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LRETURN.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LRETURN.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LSHL.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LSHL.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LSHL.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LSHL.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LSHR.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LSHR.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LSHR.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LSHR.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LSTORE.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LSTORE.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LSTORE.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LSTORE.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LSUB.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LSUB.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LSUB.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LSUB.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LUSHR.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LUSHR.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LUSHR.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LUSHR.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LXOR.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LXOR.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LXOR.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LXOR.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LineNumberGen.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LineNumberGen.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LineNumberGen.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LineNumberGen.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LoadClass.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LoadClass.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LoadClass.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LoadClass.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LoadInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LoadInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LoadInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LoadInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LocalVariableGen.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LocalVariableGen.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LocalVariableGen.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LocalVariableGen.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/LocalVariableInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/MONITORENTER.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/MONITORENTER.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/MONITORENTER.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/MONITORENTER.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/MONITOREXIT.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/MONITOREXIT.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/MONITOREXIT.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/MONITOREXIT.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/MULTIANEWARRAY.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/MethodGen.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/MethodGen.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/MethodGen.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/MethodGen.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/MethodObserver.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/MethodObserver.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/MethodObserver.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/MethodObserver.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/NEW.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/NEW.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/NEW.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/NEW.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/NEWARRAY.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/NEWARRAY.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/NEWARRAY.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/NEWARRAY.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/NOP.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/NOP.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/NOP.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/NOP.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/NamedAndTyped.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/NamedAndTyped.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/NamedAndTyped.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/NamedAndTyped.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ObjectType.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ObjectType.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ObjectType.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ObjectType.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/POP.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/POP.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/POP.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/POP.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/POP2.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/POP2.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/POP2.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/POP2.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/PUSH.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/PUSH.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/PUSH.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/PUSH.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/PUTFIELD.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/PUTFIELD.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/PUTFIELD.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/PUTFIELD.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/PUTSTATIC.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/PUTSTATIC.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/PUTSTATIC.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/PUTSTATIC.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/PopInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/PopInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/PopInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/PopInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/PushInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/PushInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/PushInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/PushInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/RET.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/RET.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/RET.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/RET.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/RETURN.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/RETURN.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/RETURN.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/RETURN.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ReferenceType.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ReferenceType.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ReferenceType.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ReferenceType.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ReturnInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ReturnInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ReturnInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ReturnInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ReturnaddressType.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ReturnaddressType.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ReturnaddressType.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/ReturnaddressType.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/SALOAD.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/SALOAD.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/SALOAD.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/SALOAD.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/SASTORE.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/SASTORE.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/SASTORE.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/SASTORE.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/SIPUSH.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/SIPUSH.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/SIPUSH.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/SIPUSH.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/SWAP.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/SWAP.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/SWAP.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/SWAP.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/SWITCH.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/SWITCH.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/SWITCH.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/SWITCH.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/Select.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/Select.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/Select.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/Select.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/StackConsumer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/StackConsumer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/StackConsumer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/StackConsumer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/StackInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/StackInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/StackInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/StackInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/StackProducer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/StackProducer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/StackProducer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/StackProducer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/StoreInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/StoreInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/StoreInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/StoreInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/TABLESWITCH.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/TABLESWITCH.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/TABLESWITCH.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/TABLESWITCH.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/TargetLostException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/TargetLostException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/TargetLostException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/TargetLostException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/Type.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/Type.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/Type.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/Type.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/TypedInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/TypedInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/TypedInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/TypedInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/UnconditionalBranch.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/UnconditionalBranch.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/UnconditionalBranch.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/UnconditionalBranch.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/VariableLengthInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/VariableLengthInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/VariableLengthInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/VariableLengthInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/Visitor.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/Visitor.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/Visitor.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/Visitor.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/generic/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/AttributeHTML.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/AttributeHTML.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/AttributeHTML.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/AttributeHTML.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/BCELFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/BCELFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/BCELFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/BCELFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/BCELifier.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/BCELifier.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/BCELifier.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/BCELifier.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ByteSequence.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ByteSequence.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ByteSequence.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ByteSequence.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/Class2HTML.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/Class2HTML.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/Class2HTML.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/Class2HTML.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassLoader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassLoader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassLoader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassLoader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassLoaderRepository.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassLoaderRepository.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassLoaderRepository.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassLoaderRepository.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassPath.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassPath.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassPath.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassPath.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassQueue.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassQueue.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassQueue.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassQueue.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassSet.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassSet.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassSet.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassSet.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassStack.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassStack.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassStack.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassStack.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassVector.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassVector.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassVector.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ClassVector.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/CodeHTML.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/CodeHTML.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/CodeHTML.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/CodeHTML.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ConstantHTML.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ConstantHTML.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ConstantHTML.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/ConstantHTML.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/InstructionFinder.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/InstructionFinder.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/InstructionFinder.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/InstructionFinder.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/JavaWrapper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/JavaWrapper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/JavaWrapper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/JavaWrapper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/MethodHTML.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/MethodHTML.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/MethodHTML.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/MethodHTML.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/Repository.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/Repository.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/Repository.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/Repository.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/SecuritySupport.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/SecuritySupport.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/SecuritySupport.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/SecuritySupport.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/SyntheticRepository.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/SyntheticRepository.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/SyntheticRepository.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/SyntheticRepository.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/bcel/internal/util/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/CharacterArrayCharacterIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/CharacterArrayCharacterIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/CharacterArrayCharacterIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/CharacterArrayCharacterIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/CharacterIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/CharacterIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/CharacterIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/CharacterIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/RE.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/RE.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/RE.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/RE.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/RECompiler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/RECompiler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/RECompiler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/RECompiler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/REDebugCompiler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/REDebugCompiler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/REDebugCompiler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/REDebugCompiler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/REProgram.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/REProgram.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/REProgram.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/REProgram.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/RESyntaxException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/RESyntaxException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/RESyntaxException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/RESyntaxException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/RETest.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/RETest.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/RETest.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/RETest.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/REUtil.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/REUtil.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/REUtil.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/REUtil.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/ReaderCharacterIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/ReaderCharacterIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/ReaderCharacterIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/ReaderCharacterIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/StreamCharacterIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/StreamCharacterIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/StreamCharacterIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/StreamCharacterIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/StringCharacterIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/StringCharacterIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/StringCharacterIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/StringCharacterIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/recompile.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/recompile.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/recompile.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/regexp/internal/recompile.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/Version.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/Version.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/Version.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/Version.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/XalanConstants.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/XalanConstants.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/XalanConstants.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/XalanConstants.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/extensions/ExpressionContext.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/extensions/ExpressionContext.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/extensions/ExpressionContext.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/extensions/ExpressionContext.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/extensions/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/extensions/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/extensions/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/extensions/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltBase.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltBase.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltBase.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltBase.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltCommon.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltCommon.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltCommon.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltCommon.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltDatetime.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltDatetime.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltDatetime.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltDatetime.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltDynamic.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltDynamic.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltDynamic.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltDynamic.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltMath.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltMath.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltMath.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltMath.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltSets.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltSets.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltSets.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltSets.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltStrings.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltStrings.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltStrings.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/ExsltStrings.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/Extensions.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/Extensions.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/Extensions.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/Extensions.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/NodeInfo.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/NodeInfo.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/NodeInfo.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/NodeInfo.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/lib/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLMessages.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLMessages.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLMessages.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLMessages.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_en.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_en.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_en.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_en.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_es.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_it.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_ja.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_ko.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_pt_BR.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_sv.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_CN.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTErrorResources_zh_TW.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTInfo.properties b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTInfo.properties similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTInfo.properties rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/XSLTInfo.properties diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/res/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/templates/Constants.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/templates/Constants.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/templates/Constants.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/templates/Constants.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/templates/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/templates/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/templates/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/templates/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/ConfigurationError.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/ConfigurationError.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/ConfigurationError.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/ConfigurationError.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/FactoryImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/FactoryImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/FactoryImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/FactoryImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/FeatureManager.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/FeatureManager.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/FeatureManager.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/FeatureManager.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/FeaturePropertyBase.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/FeaturePropertyBase.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/FeaturePropertyBase.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/FeaturePropertyBase.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/ObjectFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/ObjectFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/ObjectFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/ObjectFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/SecuritySupport.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/SecuritySupport.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/SecuritySupport.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/SecuritySupport.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/XMLSecurityManager.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/utils/XMLSecurityPropertyManager.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xslt/EnvironmentCheck.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xslt/Process.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xslt/Process.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xslt/Process.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xslt/Process.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xslt/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xslt/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xslt/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xslt/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/CollatorFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/CollatorFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/CollatorFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/CollatorFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/DOM.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/DOM.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/DOM.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/DOM.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/DOMCache.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/DOMCache.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/DOMCache.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/DOMCache.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/DOMEnhancedForDTM.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/NodeIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/NodeIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/NodeIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/NodeIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/ProcessorVersion.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/ProcessorVersion.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/ProcessorVersion.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/ProcessorVersion.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/StripFilter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/StripFilter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/StripFilter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/StripFilter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/Translet.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/Translet.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/Translet.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/Translet.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/TransletException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/TransletException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/TransletException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/TransletException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/Compile.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/Transform.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/Transform.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/Transform.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/Transform.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOpt.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOpt.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOpt.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOpt.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOptsException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOptsException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOptsException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/GetOptsException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/IllegalArgumentException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/IllegalArgumentException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/IllegalArgumentException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/IllegalArgumentException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/MissingOptArgException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/MissingOptArgException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/MissingOptArgException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/cmdline/getopt/MissingOptArgException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AbsoluteLocationPath.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AbsoluteLocationPath.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AbsoluteLocationPath.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AbsoluteLocationPath.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AbsolutePathPattern.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AlternativePattern.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AlternativePattern.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AlternativePattern.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AlternativePattern.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AncestorPattern.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AncestorPattern.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AncestorPattern.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AncestorPattern.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ApplyImports.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ApplyImports.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ApplyImports.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ApplyImports.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ApplyTemplates.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ArgumentList.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ArgumentList.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ArgumentList.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ArgumentList.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Attribute.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Attribute.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Attribute.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Attribute.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AttributeSet.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValue.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/AttributeValueTemplate.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/BinOpExpr.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/BooleanCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/BooleanExpr.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/BooleanExpr.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/BooleanExpr.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/BooleanExpr.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CallTemplate.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CastCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CastExpr.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CeilingCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Choose.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Closure.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Closure.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Closure.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Closure.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Comment.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CompilerException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CompilerException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CompilerException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CompilerException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ConcatCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Constants.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Constants.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Constants.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Constants.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ContainsCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Copy.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Copy.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Copy.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Copy.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CopyOf.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CopyOf.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CopyOf.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CopyOf.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CurrentCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CurrentCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CurrentCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/CurrentCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/DecimalFormatting.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/DecimalFormatting.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/DecimalFormatting.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/DecimalFormatting.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/DocumentCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ElementAvailableCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/EqualityExpr.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Expression.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Fallback.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Fallback.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Fallback.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Fallback.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FilterExpr.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FilterParentPath.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FilterParentPath.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FilterParentPath.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FilterParentPath.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FilteredAbsoluteLocationPath.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FilteredAbsoluteLocationPath.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FilteredAbsoluteLocationPath.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FilteredAbsoluteLocationPath.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FloorCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FlowList.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ForEach.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FormatNumberCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FunctionAvailableCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/FunctionCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/GenerateIdCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/IdKeyPattern.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/IdKeyPattern.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/IdKeyPattern.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/IdKeyPattern.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/IdPattern.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/If.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/If.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/If.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/If.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/IllegalCharException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/IllegalCharException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/IllegalCharException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/IllegalCharException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Import.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Import.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Import.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Import.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Include.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Include.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Include.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Include.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Instruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Instruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Instruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Instruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/IntExpr.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/IntExpr.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/IntExpr.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/IntExpr.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Key.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Key.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Key.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Key.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/KeyCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/KeyPattern.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/KeyPattern.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/KeyPattern.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/KeyPattern.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LangCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LastCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LastCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LastCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LastCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LiteralAttribute.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LiteralAttribute.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LiteralAttribute.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LiteralAttribute.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LiteralElement.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LiteralExpr.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LiteralExpr.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LiteralExpr.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LiteralExpr.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LocalNameCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LocationPathPattern.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LocationPathPattern.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LocationPathPattern.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LocationPathPattern.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/LogicalExpr.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Makefile.inc b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Makefile.inc similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Makefile.inc rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Makefile.inc diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Message.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Message.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Message.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Message.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Mode.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NameBase.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NameCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceAlias.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceAlias.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceAlias.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceAlias.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NamespaceUriCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NodeTest.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NodeTest.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NodeTest.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NodeTest.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NotCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Number.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Number.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Number.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Number.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/NumberCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Otherwise.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Otherwise.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Otherwise.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Otherwise.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Output.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Output.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Output.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Output.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Param.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Param.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Param.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Param.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ParameterRef.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ParameterRef.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ParameterRef.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ParameterRef.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ParentLocationPath.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ParentPattern.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ParentPattern.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ParentPattern.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ParentPattern.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Parser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Pattern.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Pattern.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Pattern.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Pattern.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/PositionCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/PositionCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/PositionCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/PositionCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Predicate.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ProcessingInstructionPattern.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/QName.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/QName.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/QName.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/QName.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/RealExpr.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/RealExpr.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/RealExpr.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/RealExpr.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/RelationalExpr.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/RelativeLocationPath.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/RelativePathPattern.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/RoundCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/SimpleAttributeValue.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/SimpleAttributeValue.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/SimpleAttributeValue.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/SimpleAttributeValue.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Sort.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/SourceLoader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/SourceLoader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/SourceLoader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/SourceLoader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/StartsWithCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Step.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Step.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Step.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Step.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/StepPattern.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/StringCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/StringLengthCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Stylesheet.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/SymbolTable.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/SyntaxTreeNode.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Template.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Template.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Template.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Template.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/TestSeq.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Text.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Text.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Text.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Text.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/TopLevelElement.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/TransletOutput.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UnaryOpExpr.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UnionPathExpr.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UnparsedEntityUriCall.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UnresolvedRef.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UnresolvedRef.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UnresolvedRef.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UnresolvedRef.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UnsupportedElement.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/UseAttributeSets.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ValueOf.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ValueOf.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ValueOf.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/ValueOf.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Variable.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Variable.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Variable.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Variable.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/VariableBase.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/VariableRef.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/VariableRef.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/VariableRef.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/VariableRef.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/VariableRefBase.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/When.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/When.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/When.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/When.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/Whitespace.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/WithParam.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/XPathLexer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/XPathParser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/XSLTC.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/XslAttribute.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/XslElement.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/sym.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/sym.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/sym.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/sym.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/AttributeSetMethodGenerator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/AttributeSetMethodGenerator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/AttributeSetMethodGenerator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/AttributeSetMethodGenerator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/BooleanType.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ClassGenerator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/CompareGenerator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/CompareGenerator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/CompareGenerator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/CompareGenerator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ca.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_cs.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_de.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_es.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_fr.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_it.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ja.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_ko.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_pt_BR.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sk.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_sv.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_CN.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMessages_zh_TW.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ErrorMsg.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/FilterGenerator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/FilterGenerator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/FilterGenerator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/FilterGenerator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/IntType.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/InternalError.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/MarkerInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/MarkerInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/MarkerInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/MarkerInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/MatchGenerator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/MatchGenerator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/MatchGenerator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/MatchGenerator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodGenerator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/MethodType.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/MultiHashtable.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NamedMethodGenerator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NamedMethodGenerator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NamedMethodGenerator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NamedMethodGenerator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeCounterGenerator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeCounterGenerator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeCounterGenerator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeCounterGenerator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSetType.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordFactGenerator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordGenerator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordGenerator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordGenerator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeSortRecordGenerator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NodeType.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NumberType.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NumberType.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NumberType.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/NumberType.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ObjectType.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkEnd.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkEnd.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkEnd.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkEnd.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkStart.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkStart.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkStart.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/OutlineableChunkStart.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/RealType.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ReferenceType.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/ResultTreeType.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/RtMethodGenerator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/RtMethodGenerator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/RtMethodGenerator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/RtMethodGenerator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/SlotAllocator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/SlotAllocator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/SlotAllocator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/SlotAllocator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/StringStack.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/StringType.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/TestGenerator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/TestGenerator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/TestGenerator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/TestGenerator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/Type.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/TypeCheckError.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/TypeCheckError.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/TypeCheckError.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/TypeCheckError.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/Util.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/util/VoidType.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/xpath.cup b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/xpath.cup similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/xpath.cup rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/xpath.cup diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/xpath.lex b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/xpath.lex similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/xpath.lex rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/compiler/xpath.lex diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/AbsoluteIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/AbsoluteIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/AbsoluteIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/AbsoluteIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/AdaptiveResultTreeImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/AnyNodeCounter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/AnyNodeCounter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/AnyNodeCounter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/AnyNodeCounter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/ArrayNodeListIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/ArrayNodeListIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/ArrayNodeListIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/ArrayNodeListIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/BitArray.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/BitArray.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/BitArray.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/BitArray.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/CachedNodeListIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/CachedNodeListIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/CachedNodeListIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/CachedNodeListIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/ClonedNodeListIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/ClonedNodeListIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/ClonedNodeListIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/ClonedNodeListIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/CollatorFactoryBase.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListFilter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListFilter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListFilter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListFilter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/CurrentNodeListIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/DOMAdapter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/DOMBuilder.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/DOMBuilder.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/DOMBuilder.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/DOMBuilder.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/DOMWSFilter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/DocumentCache.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/DupFilterIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/DupFilterIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/DupFilterIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/DupFilterIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/EmptyFilter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/ExtendedSAX.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/ExtendedSAX.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/ExtendedSAX.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/ExtendedSAX.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/Filter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/Filter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/Filter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/Filter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/FilterIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/FilterIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/FilterIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/FilterIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/FilteredStepIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/FilteredStepIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/FilteredStepIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/FilteredStepIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/ForwardPositionIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/ForwardPositionIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/ForwardPositionIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/ForwardPositionIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/KeyIndex.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/LoadDocument.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/MatchingIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/MatchingIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/MatchingIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/MatchingIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/MultiDOM.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/MultiValuedNodeHeapIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/MultiValuedNodeHeapIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/MultiValuedNodeHeapIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/MultiValuedNodeHeapIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/MultipleNodeCounter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/MultipleNodeCounter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/MultipleNodeCounter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/MultipleNodeCounter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/NodeCounter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/NodeIteratorBase.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/NodeIteratorBase.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/NodeIteratorBase.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/NodeIteratorBase.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecord.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/NodeSortRecordFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/NthIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SAXImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SimpleResultTreeImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SingleNodeCounter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SingletonIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SingletonIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SingletonIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SingletonIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SortSettings.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/SortingIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/StepIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/StepIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/StepIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/StepIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/StripWhitespaceFilter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/StripWhitespaceFilter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/StripWhitespaceFilter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/StripWhitespaceFilter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/UnionIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/UnionIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/UnionIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/UnionIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/XSLTCDTMManager.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/XSLTCDTMManager.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/XSLTCDTMManager.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/dom/XSLTCDTMManager.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/javax.xml.transform.TransformerFactory b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/javax.xml.transform.TransformerFactory similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/javax.xml.transform.TransformerFactory rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/javax.xml.transform.TransformerFactory diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/AbstractTranslet.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Attributes.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/BasisLibrary.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Constants.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Constants.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Constants.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Constants.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ca.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_cs.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_de.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_es.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_fr.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_it.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ja.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_ko.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_pt_BR.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sk.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_sv.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_CN.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/ErrorMessages_zh_TW.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Hashtable.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Hashtable.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Hashtable.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Hashtable.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/InternalRuntimeError.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/MessageHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/MessageHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/MessageHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/MessageHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Node.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Node.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Node.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Node.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Operators.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Operators.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Operators.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Operators.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Parameter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Parameter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Parameter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/Parameter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/StringValueHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/output/OutputBuffer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/output/StringOutputBuffer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/output/StringOutputBuffer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/output/StringOutputBuffer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/output/StringOutputBuffer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/output/TransletOutputHandlerFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/runtime/output/WriterOutputBuffer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/DOM2SAX.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/DOM2TO.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/DOM2TO.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/DOM2TO.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/DOM2TO.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/OutputSettings.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/OutputSettings.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/OutputSettings.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/OutputSettings.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/SAX2DOM.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXBaseWriter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXBaseWriter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXBaseWriter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXBaseWriter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXEventWriter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXStreamWriter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXStreamWriter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXStreamWriter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/SAX2StAXStreamWriter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/SmartTransformerFactoryImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/SmartTransformerFactoryImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/SmartTransformerFactoryImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/SmartTransformerFactoryImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/StAXEvent2SAX.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/StAXStream2SAX.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TemplatesHandlerImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TemplatesImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TrAXFilter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TransformerFactoryImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TransformerHandlerImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/TransformerImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/Util.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/Util.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/Util.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/Util.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/trax/XSLTCSource.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xalan/internal/xsltc/util/IntegerArray.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/AttrImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/AttrImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/AttrImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/AttrImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/AttrNSImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/AttrNSImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/AttrNSImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/AttrNSImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/AttributeMap.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/AttributeMap.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/AttributeMap.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/AttributeMap.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/CDATASectionImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/CDATASectionImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/CDATASectionImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/CDATASectionImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/CharacterDataImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/CharacterDataImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/CharacterDataImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/CharacterDataImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ChildNode.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ChildNode.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ChildNode.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ChildNode.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/CommentImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/CommentImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/CommentImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/CommentImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/CoreDOMImplementationImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/CoreDocumentImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMConfigurationImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMErrorImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMErrorImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMErrorImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMErrorImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMImplementationImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMImplementationListImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMImplementationSourceImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMInputImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMInputImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMInputImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMInputImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMLocatorImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMLocatorImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMLocatorImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMLocatorImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMMessageFormatter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMNormalizer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMNormalizer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMNormalizer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMNormalizer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMOutputImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMOutputImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMOutputImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMOutputImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMStringListImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DOMXSImplementationSourceImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeepNodeListImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredAttrImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredAttrImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredAttrImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredAttrImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredAttrNSImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredAttrNSImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredAttrNSImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredAttrNSImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredCDATASectionImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredCDATASectionImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredCDATASectionImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredCDATASectionImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredCommentImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredDOMImplementationImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredDOMImplementationImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredDOMImplementationImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredDOMImplementationImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredDocumentImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredDocumentTypeImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredElementDefinitionImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredElementDefinitionImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredElementDefinitionImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredElementDefinitionImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredElementImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredElementImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredElementImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredElementImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredElementNSImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredElementNSImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredElementNSImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredElementNSImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredEntityImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredEntityImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredEntityImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredEntityImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredEntityReferenceImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredEntityReferenceImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredEntityReferenceImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredEntityReferenceImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredNode.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredNode.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredNode.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredNode.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredNotationImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredNotationImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredNotationImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredNotationImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredProcessingInstructionImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredProcessingInstructionImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredProcessingInstructionImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredProcessingInstructionImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredTextImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredTextImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredTextImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DeferredTextImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DocumentFragmentImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DocumentFragmentImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DocumentFragmentImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DocumentFragmentImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DocumentImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DocumentImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DocumentImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DocumentImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/DocumentTypeImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ElementDefinitionImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ElementDefinitionImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ElementDefinitionImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ElementDefinitionImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ElementImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ElementImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ElementImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ElementImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ElementNSImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ElementNSImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ElementNSImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ElementNSImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/EntityImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/EntityImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/EntityImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/EntityImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/EntityReferenceImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/EntityReferenceImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/EntityReferenceImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/EntityReferenceImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/LCount.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/LCount.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/LCount.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/LCount.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/NamedNodeMapImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/NodeImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/NodeImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/NodeImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/NodeImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/NodeIteratorImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/NodeIteratorImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/NodeIteratorImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/NodeIteratorImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/NodeListCache.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/NodeListCache.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/NodeListCache.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/NodeListCache.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/NotationImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/NotationImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/NotationImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/NotationImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/PSVIAttrNSImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/PSVIDOMImplementationImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/PSVIDOMImplementationImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/PSVIDOMImplementationImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/PSVIDOMImplementationImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/PSVIDocumentImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/PSVIDocumentImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/PSVIDocumentImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/PSVIDocumentImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/PSVIElementNSImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ParentNode.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ParentNode.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ParentNode.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ParentNode.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ProcessingInstructionImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ProcessingInstructionImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ProcessingInstructionImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/ProcessingInstructionImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/RangeExceptionImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/RangeExceptionImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/RangeExceptionImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/RangeExceptionImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/RangeImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/RangeImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/RangeImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/RangeImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/TextImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/TextImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/TextImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/TextImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/TreeWalkerImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/TreeWalkerImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/TreeWalkerImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/TreeWalkerImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/events/EventImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/events/EventImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/events/EventImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/events/EventImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/events/MutationEventImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/org.apache.xerces.dom.DOMImplementationSourceImpl b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/org.apache.xerces.dom.DOMImplementationSourceImpl similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/org.apache.xerces.dom.DOMImplementationSourceImpl rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/org.apache.xerces.dom.DOMImplementationSourceImpl diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/org.w3c.dom.DOMImplementationSourceList b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/org.w3c.dom.DOMImplementationSourceList similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/org.w3c.dom.DOMImplementationSourceList rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/dom/org.w3c.dom.DOMImplementationSourceList diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/Constants.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/Constants.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/Constants.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/Constants.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/ExternalSubsetResolver.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/ExternalSubsetResolver.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/ExternalSubsetResolver.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/ExternalSubsetResolver.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/PropertyManager.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/PropertyManager.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/PropertyManager.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/PropertyManager.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/RevalidationHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/RevalidationHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/RevalidationHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/RevalidationHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/Version.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/Version.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/Version.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/Version.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XML11DTDScannerImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XML11DocumentScannerImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XML11EntityScanner.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XML11NSDocumentScannerImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XML11NamespaceBinder.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XML11NamespaceBinder.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XML11NamespaceBinder.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XML11NamespaceBinder.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLDTDScannerImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLDocumentFragmentScannerImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLDocumentScannerImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLEntityDescription.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLEntityDescription.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLEntityDescription.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLEntityDescription.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLEntityHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLEntityHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLEntityHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLEntityHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLEntityManager.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLEntityManager.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLEntityManager.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLEntityManager.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLEntityScanner.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLErrorReporter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLNSDocumentScannerImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLNamespaceBinder.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLScanner.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLScanner.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLScanner.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLScanner.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLStreamFilterImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLStreamReaderImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/XMLVersionDetector.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/BalancedDTDGrammar.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/DTDGrammar.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/DTDGrammarBucket.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XML11DTDProcessor.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XML11DTDValidator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XML11DTDValidator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XML11DTDValidator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XML11DTDValidator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XML11NSDTDValidator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XML11NSDTDValidator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XML11NSDTDValidator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XML11NSDTDValidator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLAttributeDecl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLContentSpec.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLDTDDescription.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLDTDLoader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLDTDProcessor.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLDTDValidatorFilter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLElementDecl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLElementDecl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLElementDecl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLElementDecl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLEntityDecl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLNSDTDValidator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLNSDTDValidator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLNSDTDValidator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLNSDTDValidator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLNotationDecl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLNotationDecl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLNotationDecl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLNotationDecl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLSimpleType.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLSimpleType.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLSimpleType.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/XMLSimpleType.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMAny.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMBinOp.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMBinOp.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMBinOp.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMBinOp.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMLeaf.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMNode.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMNode.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMNode.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMNode.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMStateSet.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMStateSet.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMStateSet.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMStateSet.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMUniOp.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMUniOp.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMUniOp.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/CMUniOp.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/ContentModelValidator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/ContentModelValidator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/ContentModelValidator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/ContentModelValidator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/DFAContentModel.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/MixedContentModel.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/MixedContentModel.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/MixedContentModel.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/MixedContentModel.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/SimpleContentModel.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/SimpleContentModel.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/SimpleContentModel.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dtd/models/SimpleContentModel.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/DTDDVFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/DVFactoryException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/DVFactoryException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/DVFactoryException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/DVFactoryException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/DatatypeException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/DatatypeValidator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/DatatypeValidator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/DatatypeValidator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/DatatypeValidator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeFacetException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeFacetException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeFacetException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeFacetException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/InvalidDatatypeValueException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/SchemaDVFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/ValidatedInfo.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/ValidatedInfo.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/ValidatedInfo.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/ValidatedInfo.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/ValidationContext.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/XSFacets.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/XSFacets.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/XSFacets.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/XSFacets.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/XSSimpleType.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/XSSimpleType.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/XSSimpleType.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/XSSimpleType.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/DTDDVFactoryImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/ENTITYDatatypeValidator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/ENTITYDatatypeValidator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/ENTITYDatatypeValidator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/ENTITYDatatypeValidator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/IDDatatypeValidator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/IDDatatypeValidator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/IDDatatypeValidator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/IDDatatypeValidator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/IDREFDatatypeValidator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/IDREFDatatypeValidator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/IDREFDatatypeValidator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/IDREFDatatypeValidator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/ListDatatypeValidator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/ListDatatypeValidator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/ListDatatypeValidator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/ListDatatypeValidator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/NMTOKENDatatypeValidator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/NMTOKENDatatypeValidator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/NMTOKENDatatypeValidator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/NMTOKENDatatypeValidator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/NOTATIONDatatypeValidator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/NOTATIONDatatypeValidator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/NOTATIONDatatypeValidator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/NOTATIONDatatypeValidator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/StringDatatypeValidator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/StringDatatypeValidator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/StringDatatypeValidator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/StringDatatypeValidator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/XML11DTDDVFactoryImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDDatatypeValidator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDDatatypeValidator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDDatatypeValidator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDDatatypeValidator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDREFDatatypeValidator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDREFDatatypeValidator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDREFDatatypeValidator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/XML11IDREFDatatypeValidator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/dtd/XML11NMTOKENDatatypeValidator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/util/Base64.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/util/Base64.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/util/Base64.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/util/Base64.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/util/ByteListImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/util/HexBin.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/util/HexBin.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/util/HexBin.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/util/HexBin.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/AbstractDateTimeDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/AnyAtomicDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/AnyAtomicDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/AnyAtomicDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/AnyAtomicDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/AnySimpleDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/AnySimpleDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/AnySimpleDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/AnySimpleDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/AnyURIDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/AnyURIDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/AnyURIDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/AnyURIDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/Base64BinaryDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/BaseDVFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/BaseSchemaDVFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/BaseSchemaDVFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/BaseSchemaDVFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/BaseSchemaDVFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/BooleanDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DateDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DateTimeDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DayDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DayTimeDurationDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DecimalDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DoubleDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/DurationDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/EntityDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/EntityDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/EntityDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/EntityDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/ExtendedSchemaDVFactoryImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/FloatDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/FullDVFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/HexBinaryDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/IDDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/IDDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/IDDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/IDDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/IDREFDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/IDREFDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/IDREFDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/IDREFDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/IntegerDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/IntegerDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/IntegerDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/IntegerDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/ListDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/MonthDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/MonthDayDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/PrecisionDecimalDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/QNameDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/QNameDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/QNameDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/QNameDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDVFactoryImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDateTimeException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDateTimeException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDateTimeException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/SchemaDateTimeException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/StringDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/TimeDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/TypeValidator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/TypeValidator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/TypeValidator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/TypeValidator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/UnionDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/UnionDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/UnionDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/UnionDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDecl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDelegate.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDelegate.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDelegate.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/XSSimpleTypeDelegate.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/YearDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/dv/xs/YearMonthDurationDV.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/io/ASCIIReader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/io/ASCIIReader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/io/ASCIIReader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/io/ASCIIReader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/io/MalformedByteSequenceException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/io/MalformedByteSequenceException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/io/MalformedByteSequenceException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/io/MalformedByteSequenceException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/io/UCSReader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/io/UCSReader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/io/UCSReader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/io/UCSReader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/io/UTF8Reader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_de.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_es.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_fr.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_it.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ja.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_ko.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_pt_BR.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_sv.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_CN.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessageFormatter_zh_TW.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/validation/EntityState.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/validation/EntityState.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/validation/EntityState.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/validation/EntityState.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/validation/ValidationManager.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/validation/ValidationState.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/validation/ValidationState.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/validation/ValidationState.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/validation/ValidationState.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/XPath.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/XPath.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/XPath.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/XPath.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/XPathException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/XPathException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/XPathException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/XPathException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/BMPattern.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/BMPattern.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/BMPattern.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/BMPattern.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/CaseInsensitiveMap.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/Match.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/Match.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/Match.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/Match.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/Op.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/Op.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/Op.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/Op.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/ParseException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/ParseException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/ParseException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/ParseException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/ParserForXMLSchema.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/REUtil.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/RangeToken.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/RangeToken.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/RangeToken.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/RangeToken.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/RegexParser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/RegularExpression.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/Token.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message.properties diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_de.properties diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_es.properties b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_es.properties similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_es.properties rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_es.properties diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_fr.properties diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_it.properties b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_it.properties similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_it.properties rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_it.properties diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_ja.properties diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_ko.properties b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_ko.properties similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_ko.properties rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_ko.properties diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_pt_BR.properties b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_pt_BR.properties similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_pt_BR.properties rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_pt_BR.properties diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_sv.properties b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_sv.properties similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_sv.properties rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_sv.properties diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_CN.properties diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_TW.properties b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_TW.properties similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_TW.properties rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xpath/regex/message_zh_TW.properties diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/AttributePSVImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/ElementPSVImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/SchemaGrammar.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/SchemaNamespaceSupport.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/SchemaNamespaceSupport.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/SchemaNamespaceSupport.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/SchemaNamespaceSupport.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/SchemaSymbols.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/SubstitutionGroupHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XMLSchemaException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XMLSchemaException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XMLSchemaException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XMLSchemaException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XMLSchemaLoader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XMLSchemaValidator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSAnnotationImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSAnnotationImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSAnnotationImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSAnnotationImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSAttributeDecl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSAttributeGroupDecl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSAttributeUseImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSComplexTypeDecl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSConstraints.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSDDescription.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSDeclarationPool.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSElementDecl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSGrammarBucket.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSGroupDecl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSImplementationImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSImplementationImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSImplementationImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSImplementationImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSLoaderImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSMessageFormatter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSModelGroupImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSModelImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSNotationDecl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSParticleDecl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/XSWildcardDecl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/Field.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/Field.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/Field.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/Field.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/FieldActivator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/FieldActivator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/FieldActivator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/FieldActivator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/IdentityConstraint.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/IdentityConstraint.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/IdentityConstraint.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/IdentityConstraint.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/KeyRef.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/Selector.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/UniqueOrKey.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/UniqueOrKey.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/UniqueOrKey.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/UniqueOrKey.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/ValueStore.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/ValueStore.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/ValueStore.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/ValueStore.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/identity/XPathMatcher.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/CMBuilder.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/CMNodeFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSAllCM.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSCMBinOp.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSCMBinOp.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSCMBinOp.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSCMBinOp.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSCMLeaf.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSCMLeaf.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSCMLeaf.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSCMLeaf.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSCMRepeatingLeaf.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSCMUniOp.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSCMValidator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSDFACM.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/models/XSEmptyCM.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/AttrImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/DefaultDocument.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/DefaultElement.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/DefaultElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/DefaultElement.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/DefaultElement.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/DefaultNode.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/DefaultNode.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/DefaultNode.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/DefaultNode.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/DefaultText.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/DefaultText.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/DefaultText.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/DefaultText.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/DefaultXMLDocumentHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/DefaultXMLDocumentHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/DefaultXMLDocumentHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/DefaultXMLDocumentHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/ElementImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/NamedNodeMapImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/NamedNodeMapImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/NamedNodeMapImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/NamedNodeMapImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/NodeImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOM.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMImplementation.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMImplementation.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMImplementation.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMImplementation.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/SchemaDOMParser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/SchemaParsingConfig.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/TextImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/TextImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/TextImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/opti/TextImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/SchemaContentHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/SchemaContentHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/SchemaContentHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/SchemaContentHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/StAXSchemaParser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSAnnotationInfo.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSAnnotationInfo.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSAnnotationInfo.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSAnnotationInfo.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSAttributeChecker.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractIDConstraintTraverser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractParticleTraverser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAbstractTraverser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeGroupTraverser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDAttributeTraverser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDComplexTypeTraverser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDElementTraverser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDGroupTraverser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDKeyrefTraverser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDNotationTraverser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDSimpleTypeTraverser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDUniqueOrKeyTraverser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDWildcardTraverser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/traversers/XSDocumentInfo.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/LSInputListImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/ObjectListImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/ShortListImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/SimpleLocator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/SimpleLocator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/SimpleLocator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/SimpleLocator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/StringListImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XInt.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XInt.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XInt.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XInt.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XIntPool.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XIntPool.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XIntPool.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XIntPool.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XSGrammarPool.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XSInputSource.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XSInputSource.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XSInputSource.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XSInputSource.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMap4Types.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XSNamedMapImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/impl/xs/util/XSObjectListImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/DefaultValidationErrorHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/DocumentBuilderFactoryImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/DocumentBuilderImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/JAXPConstants.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/JAXPConstants.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/JAXPConstants.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/JAXPConstants.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/JAXPValidatorComponent.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/SAXParserFactoryImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/SAXParserImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/SchemaValidatorConfiguration.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/TeeXMLDocumentFilterImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/UnparsedEntityHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/DatatypeFactoryImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/DurationDayTimeImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/DurationImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/DurationYearMonthImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/XMLGregorianCalendarImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/javax.xml.datatype.DatatypeFactory b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/javax.xml.datatype.DatatypeFactory similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/javax.xml.datatype.DatatypeFactory rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/datatype/javax.xml.datatype.DatatypeFactory diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/javax.xml.parsers.DocumentBuilderFactory b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/javax.xml.parsers.DocumentBuilderFactory similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/javax.xml.parsers.DocumentBuilderFactory rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/javax.xml.parsers.DocumentBuilderFactory diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/javax.xml.parsers.SAXParserFactory b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/javax.xml.parsers.SAXParserFactory similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/javax.xml.parsers.SAXParserFactory rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/javax.xml.parsers.SAXParserFactory diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/AbstractXMLSchema.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/DOMDocumentHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/DOMDocumentHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/DOMDocumentHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/DOMDocumentHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/DOMResultAugmentor.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/DOMResultAugmentor.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/DOMResultAugmentor.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/DOMResultAugmentor.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/DOMResultBuilder.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/DOMValidatorHelper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/DraconianErrorHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/EmptyXMLSchema.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/ErrorHandlerAdaptor.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/JAXPValidationMessageFormatter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/ReadOnlyGrammarPool.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/SimpleXMLSchema.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/SoftReferenceGrammarPool.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/StAXValidatorHelper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/StreamValidatorHelper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/Util.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/Util.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/Util.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/Util.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHelper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHelper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHelper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHelper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/ValidatorImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/WeakReferenceXMLSchema.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/WrappedSAXException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/XMLSchema.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/XMLSchema.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/XMLSchema.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/XMLSchema.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/XMLSchemaValidatorComponentManager.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/XSGrammarPoolContainer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/javax.xml.validation.SchemaFactory b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/javax.xml.validation.SchemaFactory similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/javax.xml.validation.SchemaFactory rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/jaxp/validation/javax.xml.validation.SchemaFactory diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/AbstractDOMParser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/AbstractSAXParser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/AbstractXMLDocumentParser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/AbstractXMLDocumentParser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/AbstractXMLDocumentParser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/AbstractXMLDocumentParser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/BasicParserConfiguration.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/CachingParserPool.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/CachingParserPool.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/CachingParserPool.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/CachingParserPool.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/DOMParser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/DOMParser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/DOMParser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/DOMParser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/DOMParserImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/DTDConfiguration.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/DTDParser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/DTDParser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/DTDParser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/DTDParser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/IntegratedParserConfiguration.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/NonValidatingConfiguration.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/SAXParser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/SAXParser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/SAXParser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/SAXParser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/SecurityConfiguration.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/StandardParserConfiguration.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XIncludeAwareParserConfiguration.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XIncludeParserConfiguration.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XML11Configurable.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XML11Configurable.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XML11Configurable.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XML11Configurable.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XML11Configuration.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XML11Configuration.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XML11Configuration.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XML11Configuration.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XML11DTDConfiguration.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XML11NonValidatingConfiguration.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XMLDocumentParser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XMLGrammarCachingConfiguration.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XMLGrammarParser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XMLGrammarPreparser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XMLParser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XMLParser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XMLParser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XMLParser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XPointerParserConfiguration.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XPointerParserConfiguration.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XPointerParserConfiguration.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/XPointerParserConfiguration.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.DTDConfiguration b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.DTDConfiguration similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.DTDConfiguration rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.DTDConfiguration diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.XML11Configuration b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.XML11Configuration similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.XML11Configuration rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.XML11Configuration diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.XMLParserConfiguration b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.XMLParserConfiguration similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.XMLParserConfiguration rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/org.apache.xerces.xni.parser.XMLParserConfiguration diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/org.xml.sax.driver b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/org.xml.sax.driver similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/org.xml.sax.driver rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/parsers/org.xml.sax.driver diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/AttributesProxy.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/AttributesProxy.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/AttributesProxy.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/AttributesProxy.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/AugmentationsImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/AugmentationsImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/AugmentationsImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/AugmentationsImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DOMEntityResolverWrapper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DOMErrorHandlerWrapper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DOMInputSource.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DOMInputSource.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DOMInputSource.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DOMInputSource.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DOMUtil.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DOMUtil.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DOMUtil.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DOMUtil.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DatatypeMessageFormatter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DefaultErrorHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DefaultErrorHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DefaultErrorHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DefaultErrorHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/DraconianErrorHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/EncodingMap.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/EncodingMap.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/EncodingMap.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/EncodingMap.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/EntityResolver2Wrapper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/EntityResolver2Wrapper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/EntityResolver2Wrapper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/EntityResolver2Wrapper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/EntityResolverWrapper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/ErrorHandlerProxy.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/ErrorHandlerWrapper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/ErrorHandlerWrapper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/ErrorHandlerWrapper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/ErrorHandlerWrapper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/FeatureState.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/FeatureState.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/FeatureState.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/FeatureState.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/HTTPInputSource.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/HTTPInputSource.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/HTTPInputSource.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/HTTPInputSource.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/IntStack.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/IntStack.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/IntStack.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/IntStack.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/JAXPNamespaceContextWrapper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/LocatorProxy.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/LocatorProxy.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/LocatorProxy.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/LocatorProxy.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/LocatorWrapper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/LocatorWrapper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/LocatorWrapper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/LocatorWrapper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/MessageFormatter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/MessageFormatter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/MessageFormatter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/MessageFormatter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/NamespaceContextWrapper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/NamespaceSupport.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/NamespaceSupport.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/NamespaceSupport.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/NamespaceSupport.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/ParserConfigurationSettings.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/PropertyState.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/PropertyState.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/PropertyState.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/PropertyState.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SAX2XNI.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SAX2XNI.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SAX2XNI.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SAX2XNI.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SAXInputSource.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SAXInputSource.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SAXInputSource.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SAXInputSource.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SAXLocatorWrapper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SAXLocatorWrapper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SAXLocatorWrapper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SAXLocatorWrapper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SAXMessageFormatter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SecurityManager.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SecurityManager.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SecurityManager.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SecurityManager.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/ShadowedSymbolTable.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/ShadowedSymbolTable.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/ShadowedSymbolTable.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/ShadowedSymbolTable.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/StAXInputSource.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/StAXInputSource.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/StAXInputSource.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/StAXInputSource.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/StAXLocationWrapper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/StAXLocationWrapper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/StAXLocationWrapper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/StAXLocationWrapper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/Status.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/Status.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/Status.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/Status.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SymbolHash.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SymbolHash.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SymbolHash.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SymbolHash.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SymbolTable.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SymbolTable.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SymbolTable.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SymbolTable.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SynchronizedSymbolTable.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SynchronizedSymbolTable.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SynchronizedSymbolTable.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/SynchronizedSymbolTable.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/TeeXMLDocumentFilterImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/TypeInfoImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/TypeInfoImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/TypeInfoImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/TypeInfoImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/URI.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/URI.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/URI.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/URI.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XML11Char.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XML11Char.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XML11Char.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XML11Char.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLAttributesImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLAttributesIteratorImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLAttributesIteratorImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLAttributesIteratorImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLAttributesIteratorImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLCatalogResolver.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLCatalogResolver.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLCatalogResolver.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLCatalogResolver.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLChar.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLChar.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLChar.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLChar.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLDocumentFilterImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLEntityDescriptionImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLErrorCode.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLErrorCode.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLErrorCode.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLErrorCode.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLGrammarPoolImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLGrammarPoolImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLGrammarPoolImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLGrammarPoolImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLInputSourceAdaptor.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLResourceIdentifierImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLStringBuffer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLStringBuffer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLStringBuffer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLStringBuffer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLSymbols.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLSymbols.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLSymbols.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/util/XMLSymbols.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/ConfigurationError.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/ConfigurationError.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/ConfigurationError.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/ConfigurationError.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/ObjectFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/ObjectFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/ObjectFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/ObjectFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/SecuritySupport.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/SecuritySupport.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/SecuritySupport.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/SecuritySupport.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/XMLLimitAnalyzer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/XMLSecurityManager.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/utils/XMLSecurityPropertyManager.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/MultipleScopeNamespaceSupport.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/SecuritySupport.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XInclude11TextReader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XInclude11TextReader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XInclude11TextReader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XInclude11TextReader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XIncludeHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XIncludeMessageFormatter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XIncludeNamespaceSupport.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XIncludeNamespaceSupport.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XIncludeNamespaceSupport.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XIncludeNamespaceSupport.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XIncludeTextReader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XPointerElementHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XPointerElementHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XPointerElementHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XPointerElementHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XPointerFramework.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XPointerFramework.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XPointerFramework.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XPointerFramework.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XPointerSchema.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XPointerSchema.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XPointerSchema.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xinclude/XPointerSchema.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/Augmentations.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/Augmentations.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/Augmentations.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/Augmentations.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/NamespaceContext.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/NamespaceContext.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/NamespaceContext.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/NamespaceContext.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/QName.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/QName.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/QName.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/QName.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLAttributes.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLAttributes.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLAttributes.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLAttributes.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLDTDContentModelHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLDTDContentModelHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLDTDContentModelHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLDTDContentModelHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLDTDHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLDTDHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLDTDHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLDTDHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLDocumentFragmentHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLDocumentFragmentHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLDocumentFragmentHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLDocumentFragmentHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLDocumentHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLDocumentHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLDocumentHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLDocumentHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLLocator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLLocator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLLocator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLLocator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLResourceIdentifier.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLResourceIdentifier.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLResourceIdentifier.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLResourceIdentifier.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLString.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLString.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLString.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XMLString.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XNIException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XNIException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XNIException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/XNIException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/Grammar.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/Grammar.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/Grammar.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/Grammar.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XMLDTDDescription.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XMLDTDDescription.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XMLDTDDescription.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XMLDTDDescription.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarDescription.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarDescription.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarDescription.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarDescription.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarLoader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarLoader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarLoader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarLoader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarPool.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarPool.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarPool.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XMLGrammarPool.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XMLSchemaDescription.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XMLSchemaDescription.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XMLSchemaDescription.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XMLSchemaDescription.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XSGrammar.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XSGrammar.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XSGrammar.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/grammars/XSGrammar.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLComponent.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLComponent.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLComponent.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLComponent.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLComponentManager.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLConfigurationException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelFilter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelFilter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelFilter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelFilter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelSource.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelSource.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelSource.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDTDContentModelSource.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDTDFilter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDTDFilter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDTDFilter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDTDFilter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDTDScanner.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDTDSource.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDTDSource.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDTDSource.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDTDSource.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDocumentFilter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDocumentFilter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDocumentFilter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDocumentFilter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDocumentScanner.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDocumentScanner.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDocumentScanner.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDocumentScanner.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDocumentSource.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDocumentSource.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDocumentSource.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLDocumentSource.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLEntityResolver.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLEntityResolver.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLEntityResolver.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLEntityResolver.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLErrorHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLErrorHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLErrorHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLErrorHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLInputSource.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLInputSource.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLInputSource.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLInputSource.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLParseException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLParseException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLParseException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLParseException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLParserConfiguration.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLParserConfiguration.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLParserConfiguration.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLParserConfiguration.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLPullParserConfiguration.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLPullParserConfiguration.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLPullParserConfiguration.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xni/parser/XMLPullParserConfiguration.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/ElementSchemePointer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/ShortHandPointer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/XPointerErrorHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/XPointerHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/XPointerMessageFormatter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/XPointerPart.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/XPointerPart.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/XPointerPart.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/XPointerPart.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/XPointerProcessor.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/XPointerProcessor.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/XPointerProcessor.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xpointer/XPointerProcessor.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/AttributePSVI.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/AttributePSVI.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/AttributePSVI.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/AttributePSVI.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/ElementPSVI.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/ElementPSVI.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/ElementPSVI.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/ElementPSVI.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/ItemPSVI.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/ItemPSVI.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/ItemPSVI.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/ItemPSVI.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/LSInputList.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/LSInputList.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/LSInputList.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/LSInputList.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/PSVIProvider.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/PSVIProvider.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/PSVIProvider.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/PSVIProvider.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/ShortList.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/ShortList.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/ShortList.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/ShortList.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/StringList.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/StringList.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/StringList.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/StringList.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSAnnotation.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSAnnotation.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSAnnotation.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSAnnotation.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSAttributeDeclaration.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSAttributeGroupDefinition.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSAttributeUse.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSAttributeUse.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSAttributeUse.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSAttributeUse.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSComplexTypeDefinition.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSComplexTypeDefinition.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSComplexTypeDefinition.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSComplexTypeDefinition.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSConstants.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSConstants.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSConstants.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSConstants.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSElementDeclaration.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSElementDeclaration.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSElementDeclaration.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSElementDeclaration.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSFacet.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSFacet.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSFacet.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSFacet.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSIDCDefinition.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSImplementation.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSImplementation.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSImplementation.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSImplementation.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSLoader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSLoader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSLoader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSLoader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSModel.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSModel.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSModel.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSModel.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSModelGroup.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSModelGroup.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSModelGroup.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSModelGroup.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSModelGroupDefinition.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSModelGroupDefinition.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSModelGroupDefinition.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSModelGroupDefinition.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSMultiValueFacet.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSMultiValueFacet.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSMultiValueFacet.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSMultiValueFacet.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSNamedMap.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSNamedMap.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSNamedMap.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSNamedMap.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSNamespaceItem.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSNamespaceItemList.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSNotationDeclaration.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSNotationDeclaration.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSNotationDeclaration.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSNotationDeclaration.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSObject.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSObject.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSObject.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSObject.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSObjectList.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSObjectList.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSObjectList.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSObjectList.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSParticle.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSParticle.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSParticle.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSParticle.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSSimpleTypeDefinition.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSSimpleTypeDefinition.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSSimpleTypeDefinition.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSSimpleTypeDefinition.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSTerm.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSTerm.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSTerm.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSTerm.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSTypeDefinition.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSTypeDefinition.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSTypeDefinition.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSTypeDefinition.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSWildcard.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSWildcard.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSWildcard.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/XSWildcard.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/ByteList.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/ObjectList.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/XSDateTime.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/XSDateTime.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/XSDateTime.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/XSDateTime.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/XSDecimal.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/XSDouble.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/XSFloat.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/XSFloat.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/XSFloat.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/XSFloat.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/XSQName.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/XSQName.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/XSQName.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/XSQName.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xerces/internal/xs/datatypes/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/Axis.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/Axis.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/Axis.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/Axis.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTM.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTM.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTM.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTM.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMAxisIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMAxisIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMAxisIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMAxisIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMAxisTraverser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMAxisTraverser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMAxisTraverser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMAxisTraverser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMConfigurationException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMDOMException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMDOMException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMDOMException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMDOMException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMFilter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMFilter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMFilter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMFilter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMManager.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMManager.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMManager.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMManager.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMWSFilter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMWSFilter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMWSFilter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/DTMWSFilter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/ChunkedIntArray.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/ChunkedIntArray.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/ChunkedIntArray.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/ChunkedIntArray.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/CoroutineManager.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/CoroutineManager.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/CoroutineManager.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/CoroutineManager.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/CoroutineParser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/CoroutineParser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/CoroutineParser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/CoroutineParser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/CustomStringPool.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMAxisIterNodeList.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMAxisIteratorBase.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMAxisIteratorBase.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMAxisIteratorBase.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMAxisIteratorBase.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMChildIterNodeList.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMChildIterNodeList.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMChildIterNodeList.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMChildIterNodeList.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBase.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseIterators.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMDefaultBaseTraversers.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMDocumentImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMManagerDefault.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMNamedNodeMap.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMNamedNodeMap.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMNamedNodeMap.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMNamedNodeMap.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMNodeIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMNodeList.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMNodeListBase.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMNodeListBase.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMNodeListBase.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMNodeListBase.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMNodeProxy.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMSafeStringPool.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMStringPool.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMTreeWalker.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMTreeWalker.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMTreeWalker.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/DTMTreeWalker.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/EmptyIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/EmptyIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/EmptyIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/EmptyIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/ExpandedNameTable.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/ExtendedType.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/ExtendedType.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/ExtendedType.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/ExtendedType.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Filter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Filter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Filter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Filter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/IncrementalSAXSource_Xerces.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/NodeLocator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/NodeLocator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/NodeLocator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/NodeLocator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTM.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/dom2dtm/DOM2DTMdefaultNamespaceDeclarationNode.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2DTM2.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/dtm/ref/sax2dtm/SAX2RTFDTM.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_ca.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_cs.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_de.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_de.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_de.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_de.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_en.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_en.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_en.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_en.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_es.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_es.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_es.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_es.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_fr.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_it.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_it.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_it.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_it.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_ja.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_ko.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_pt_BR.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_sk.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_sv.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_tr.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_zh_CN.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_zh_HK.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_zh_HK.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_zh_HK.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_zh_HK.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLErrorResources_zh_TW.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLMessages.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLMessages.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLMessages.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/res/XMLMessages.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/Catalog.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/Catalog.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/Catalog.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/Catalog.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/CatalogEntry.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/CatalogEntry.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/CatalogEntry.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/CatalogEntry.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/CatalogException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/CatalogException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/CatalogException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/CatalogException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/CatalogManager.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/CatalogManager.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/CatalogManager.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/CatalogManager.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/Resolver.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/Resolver.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/Resolver.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/Resolver.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/helpers/BootstrapResolver.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/helpers/Debug.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/helpers/Debug.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/helpers/Debug.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/helpers/Debug.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/helpers/FileURL.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/helpers/FileURL.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/helpers/FileURL.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/helpers/FileURL.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/helpers/Namespaces.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/helpers/Namespaces.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/helpers/Namespaces.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/helpers/Namespaces.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/helpers/PublicId.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/helpers/PublicId.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/helpers/PublicId.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/helpers/PublicId.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/CatalogReader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/CatalogReader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/CatalogReader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/CatalogReader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/DOMCatalogParser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/DOMCatalogParser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/DOMCatalogParser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/DOMCatalogParser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/DOMCatalogReader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/ExtendedXMLCatalogReader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/ExtendedXMLCatalogReader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/ExtendedXMLCatalogReader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/ExtendedXMLCatalogReader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/OASISXMLCatalogReader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/OASISXMLCatalogReader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/OASISXMLCatalogReader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/OASISXMLCatalogReader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/SAXCatalogParser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/SAXCatalogParser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/SAXCatalogParser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/SAXCatalogParser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/SAXCatalogReader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/SAXParserHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/SAXParserHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/SAXParserHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/SAXParserHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/TR9401CatalogReader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/TR9401CatalogReader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/TR9401CatalogReader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/TR9401CatalogReader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/TextCatalogReader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/TextCatalogReader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/TextCatalogReader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/TextCatalogReader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/XCatalogReader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/XCatalogReader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/XCatalogReader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/readers/XCatalogReader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/tools/CatalogResolver.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/tools/ResolvingParser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/tools/ResolvingParser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/tools/ResolvingParser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/tools/ResolvingParser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLFilter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLFilter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLFilter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLFilter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLReader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLReader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLReader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/resolver/tools/ResolvingXMLReader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/BaseMarkupSerializer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/DOMSerializer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/DOMSerializer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/DOMSerializer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/DOMSerializer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/DOMSerializerImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/ElementState.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/ElementState.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/ElementState.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/ElementState.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/EncodingInfo.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/EncodingInfo.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/EncodingInfo.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/EncodingInfo.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/Encodings.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/Encodings.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/Encodings.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/Encodings.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/HTMLEntities.res b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/HTMLEntities.res similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/HTMLEntities.res rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/HTMLEntities.res diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/HTMLSerializer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/HTMLSerializer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/HTMLSerializer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/HTMLSerializer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/HTMLdtd.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/HTMLdtd.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/HTMLdtd.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/HTMLdtd.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/IndentPrinter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/IndentPrinter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/IndentPrinter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/IndentPrinter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/LineSeparator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/LineSeparator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/LineSeparator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/LineSeparator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/Method.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/Method.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/Method.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/Method.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/OutputFormat.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/OutputFormat.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/OutputFormat.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/OutputFormat.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/Printer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/Printer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/Printer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/Printer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/SecuritySupport.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/SecuritySupport.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/SecuritySupport.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/SecuritySupport.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/Serializer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/Serializer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/Serializer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/Serializer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/SerializerFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/SerializerFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/SerializerFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/SerializerFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/SerializerFactoryImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/SerializerFactoryImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/SerializerFactoryImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/SerializerFactoryImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/TextSerializer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/TextSerializer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/TextSerializer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/TextSerializer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/XHTMLSerializer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/XHTMLSerializer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/XHTMLSerializer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/XHTMLSerializer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/XML11Serializer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/XML11Serializer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/XML11Serializer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/XML11Serializer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/XMLSerializer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/XMLSerializer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/XMLSerializer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serialize/XMLSerializer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/AttributesImplSerializer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/CharInfo.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/CharInfo.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/CharInfo.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/CharInfo.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/DOMSerializer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/DOMSerializer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/DOMSerializer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/DOMSerializer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ElemContext.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ElemContext.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ElemContext.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ElemContext.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ElemDesc.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ElemDesc.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ElemDesc.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ElemDesc.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/EmptySerializer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/EmptySerializer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/EmptySerializer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/EmptySerializer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/EncodingInfo.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/EncodingInfo.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/EncodingInfo.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/EncodingInfo.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Encodings.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Encodings.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Encodings.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Encodings.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Encodings.properties b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Encodings.properties similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Encodings.properties rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Encodings.properties diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ExtendedContentHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ExtendedContentHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ExtendedContentHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ExtendedContentHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ExtendedLexicalHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ExtendedLexicalHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ExtendedLexicalHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ExtendedLexicalHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/HTMLEntities.properties b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/HTMLEntities.properties similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/HTMLEntities.properties rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/HTMLEntities.properties diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Method.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Method.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Method.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Method.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/NamespaceMappings.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/NamespaceMappings.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/NamespaceMappings.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/NamespaceMappings.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/OutputPropertiesFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/OutputPropertyUtils.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/OutputPropertyUtils.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/OutputPropertyUtils.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/OutputPropertyUtils.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializationHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializationHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializationHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializationHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Serializer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Serializer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Serializer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Serializer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializerBase.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializerBase.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializerBase.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializerBase.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializerConstants.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializerConstants.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializerConstants.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializerConstants.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializerFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializerFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializerFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializerFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializerTrace.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializerTrace.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializerTrace.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializerTrace.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializerTraceWriter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializerTraceWriter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializerTraceWriter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/SerializerTraceWriter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToHTMLSAXHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToHTMLSAXHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToHTMLSAXHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToHTMLSAXHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToHTMLStream.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToHTMLStream.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToHTMLStream.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToHTMLStream.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToSAXHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToSAXHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToSAXHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToSAXHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToStream.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToStream.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToStream.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToStream.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToTextSAXHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToTextSAXHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToTextSAXHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToTextSAXHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToTextStream.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToTextStream.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToTextStream.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToTextStream.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToUnknownStream.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToUnknownStream.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToUnknownStream.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToUnknownStream.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToXMLSAXHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToXMLSAXHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToXMLSAXHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToXMLSAXHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToXMLStream.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToXMLStream.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToXMLStream.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/ToXMLStream.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/TransformStateSetter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/TransformStateSetter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/TransformStateSetter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/TransformStateSetter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/TreeWalker.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/TreeWalker.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/TreeWalker.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/TreeWalker.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Utils.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Utils.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Utils.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Utils.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Version.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Version.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Version.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/Version.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/WriterChain.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/WriterChain.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/WriterChain.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/WriterChain.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/WriterToASCI.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/WriterToASCI.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/WriterToASCI.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/WriterToASCI.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/WriterToUTF8Buffered.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/WriterToUTF8Buffered.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/WriterToUTF8Buffered.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/WriterToUTF8Buffered.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/XMLEntities.properties b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/XMLEntities.properties similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/XMLEntities.properties rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/XMLEntities.properties diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/XSLOutputAttributes.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/output_html.properties b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/output_html.properties similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/output_html.properties rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/output_html.properties diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/output_text.properties b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/output_text.properties similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/output_text.properties rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/output_text.properties diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/output_unknown.properties b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/output_unknown.properties similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/output_unknown.properties rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/output_unknown.properties diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/output_xml.properties b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/output_xml.properties similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/output_xml.properties rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/output_xml.properties diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/AttList.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/AttList.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/AttList.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/AttList.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/BoolStack.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/BoolStack.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/BoolStack.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/BoolStack.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/DOM2Helper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/DOM2Helper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/DOM2Helper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/DOM2Helper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/Messages.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/Messages.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/Messages.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/Messages.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/MsgKey.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/MsgKey.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/MsgKey.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/MsgKey.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ca.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_cs.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_cs.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_cs.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_cs.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_de.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_en.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_en.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_en.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_en.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_es.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_fr.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_it.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ja.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_ko.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_pt_BR.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_pt_BR.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_pt_BR.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_pt_BR.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_sv.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_CN.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessages_zh_TW.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/StringToIntTable.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/StringToIntTable.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/StringToIntTable.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/StringToIntTable.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/SystemIDResolver.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/URI.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/URI.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/URI.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/URI.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/Utils.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/Utils.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/Utils.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/Utils.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/WrappedRuntimeException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/WrappedRuntimeException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/WrappedRuntimeException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/serializer/utils/WrappedRuntimeException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/AttList.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/AttList.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/AttList.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/AttList.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/BoolStack.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/BoolStack.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/BoolStack.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/BoolStack.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/CharKey.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/CharKey.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/CharKey.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/CharKey.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/Constants.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/Constants.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/Constants.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/Constants.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/DOM2Helper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/DOM2Helper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/DOM2Helper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/DOM2Helper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/DOMBuilder.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/DOMBuilder.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/DOMBuilder.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/DOMBuilder.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/DOMHelper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/DOMHelper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/DOMHelper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/DOMHelper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/DOMOrder.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/DOMOrder.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/DOMOrder.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/DOMOrder.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/DefaultErrorHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/DefaultErrorHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/DefaultErrorHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/DefaultErrorHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ElemDesc.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ElemDesc.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ElemDesc.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ElemDesc.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/FastStringBuffer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/FastStringBuffer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/FastStringBuffer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/FastStringBuffer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/Hashtree2Node.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/Hashtree2Node.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/Hashtree2Node.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/Hashtree2Node.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/IntStack.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/IntStack.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/IntStack.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/IntStack.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/IntVector.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/IntVector.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/IntVector.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/IntVector.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ListingErrorHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ListingErrorHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ListingErrorHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ListingErrorHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/LocaleUtility.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/LocaleUtility.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/LocaleUtility.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/LocaleUtility.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/MutableAttrListImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/MutableAttrListImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/MutableAttrListImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/MutableAttrListImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/NSInfo.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/NSInfo.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/NSInfo.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/NSInfo.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/NameSpace.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/NameSpace.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/NameSpace.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/NameSpace.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/NamespaceSupport2.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/NamespaceSupport2.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/NamespaceSupport2.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/NamespaceSupport2.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/NodeConsumer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/NodeConsumer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/NodeConsumer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/NodeConsumer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/NodeVector.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/NodeVector.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/NodeVector.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/NodeVector.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ObjectPool.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ObjectPool.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ObjectPool.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ObjectPool.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ObjectStack.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ObjectStack.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ObjectStack.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ObjectStack.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ObjectVector.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ObjectVector.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ObjectVector.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ObjectVector.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/PrefixResolver.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/PrefixResolver.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/PrefixResolver.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/PrefixResolver.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/PrefixResolverDefault.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/PrefixResolverDefault.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/PrefixResolverDefault.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/PrefixResolverDefault.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/QName.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/QName.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/QName.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/QName.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/RawCharacterHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/RawCharacterHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/RawCharacterHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/RawCharacterHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/SAXSourceLocator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/SAXSourceLocator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/SAXSourceLocator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/SAXSourceLocator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/SerializableLocatorImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/SerializableLocatorImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/SerializableLocatorImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/SerializableLocatorImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StopParseException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StopParseException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StopParseException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StopParseException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringBufferPool.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringBufferPool.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringBufferPool.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringBufferPool.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringComparable.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringComparable.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringComparable.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringComparable.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringToIntTable.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringToIntTable.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringToIntTable.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringToIntTable.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringToStringTable.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringToStringTable.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringToStringTable.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringToStringTable.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringToStringTableVector.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringToStringTableVector.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringToStringTableVector.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringToStringTableVector.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringVector.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringVector.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringVector.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StringVector.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/StylesheetPIHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/SuballocatedByteVector.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/SuballocatedByteVector.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/SuballocatedByteVector.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/SuballocatedByteVector.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/SuballocatedIntVector.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/SuballocatedIntVector.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/SuballocatedIntVector.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/SuballocatedIntVector.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/SystemIDResolver.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/SystemIDResolver.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/SystemIDResolver.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/SystemIDResolver.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/ThreadControllerWrapper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/TreeWalker.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/TreeWalker.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/TreeWalker.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/TreeWalker.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/Trie.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/Trie.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/Trie.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/Trie.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/URI.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/URI.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/URI.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/URI.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/UnImplNode.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/UnImplNode.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/UnImplNode.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/UnImplNode.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/WrappedRuntimeException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/WrappedRuntimeException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/WrappedRuntimeException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/WrappedRuntimeException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/WrongParserException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/WrongParserException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/WrongParserException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/WrongParserException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XML11Char.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XML11Char.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XML11Char.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XML11Char.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLChar.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLChar.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLChar.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLChar.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLCharacterRecognizer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLCharacterRecognizer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLCharacterRecognizer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLCharacterRecognizer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLReaderManager.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLReaderManager.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLReaderManager.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLReaderManager.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLString.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLString.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLString.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLString.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLStringDefault.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLStringDefault.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLStringDefault.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLStringDefault.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLStringFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLStringFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLStringFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLStringFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLStringFactoryDefault.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLStringFactoryDefault.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLStringFactoryDefault.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/XMLStringFactoryDefault.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/CharArrayWrapper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/CharArrayWrapper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/CharArrayWrapper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/CharArrayWrapper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/IntArrayWrapper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/IntArrayWrapper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/IntArrayWrapper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/IntArrayWrapper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/LongArrayWrapper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/LongArrayWrapper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/LongArrayWrapper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/LongArrayWrapper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/StringArrayWrapper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResourceBundle.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResourceBundle.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResourceBundle.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResourceBundle.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResourceBundleBase.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResourceBundleBase.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResourceBundleBase.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResourceBundleBase.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_de.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_de.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_de.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_de.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_en.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_en.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_en.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_en.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_es.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_es.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_es.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_es.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_fr.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_fr.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_fr.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_fr.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_it.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_it.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_it.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_it.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_A.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_A.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_A.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_A.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HA.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HA.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HA.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HA.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HI.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HI.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HI.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_HI.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_I.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_I.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_I.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_ja_JP_I.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_ko.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_ko.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_ko.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_ko.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_sv.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_sv.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_sv.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_sv.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_zh_CN.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_zh_CN.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_zh_CN.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_zh_CN.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_zh_TW.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_zh_TW.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_zh_TW.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xml/internal/utils/res/XResources_zh_TW.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/Arg.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/Arg.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/Arg.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/Arg.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/CachedXPathAPI.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/CachedXPathAPI.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/CachedXPathAPI.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/CachedXPathAPI.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/Expression.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/Expression.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/Expression.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/Expression.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/ExpressionNode.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/ExpressionNode.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/ExpressionNode.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/ExpressionNode.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/ExpressionOwner.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/ExpressionOwner.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/ExpressionOwner.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/ExpressionOwner.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/ExtensionsProvider.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/ExtensionsProvider.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/ExtensionsProvider.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/ExtensionsProvider.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/FoundIndex.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/FoundIndex.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/FoundIndex.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/FoundIndex.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/NodeSet.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/NodeSet.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/NodeSet.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/NodeSet.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/NodeSetDTM.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/NodeSetDTM.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/NodeSetDTM.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/NodeSetDTM.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/SourceTree.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/SourceTree.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/SourceTree.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/SourceTree.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/SourceTreeManager.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/SourceTreeManager.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/SourceTreeManager.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/SourceTreeManager.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/VariableStack.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/VariableStack.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/VariableStack.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/VariableStack.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/WhitespaceStrippingElementMatcher.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/WhitespaceStrippingElementMatcher.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/WhitespaceStrippingElementMatcher.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/WhitespaceStrippingElementMatcher.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPath.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPath.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPath.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPath.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathAPI.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathAPI.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathAPI.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathAPI.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathContext.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathContext.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathContext.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathContext.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathProcessorException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathProcessorException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathProcessorException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathProcessorException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathVisitable.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathVisitable.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathVisitable.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathVisitable.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathVisitor.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathVisitor.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathVisitor.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/XPathVisitor.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/AttributeIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/AttributeIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/AttributeIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/AttributeIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/AxesWalker.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/AxesWalker.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/AxesWalker.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/AxesWalker.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/BasicTestIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/BasicTestIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/BasicTestIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/BasicTestIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/ChildIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/ChildIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/ChildIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/ChildIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/ChildTestIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/ChildTestIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/ChildTestIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/ChildTestIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/ContextNodeList.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/ContextNodeList.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/ContextNodeList.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/ContextNodeList.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/DescendantIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/DescendantIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/DescendantIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/DescendantIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/FilterExprIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/FilterExprIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/FilterExprIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/FilterExprIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/FilterExprIteratorSimple.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/FilterExprWalker.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/FilterExprWalker.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/FilterExprWalker.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/FilterExprWalker.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/HasPositionalPredChecker.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/IteratorPool.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/IteratorPool.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/IteratorPool.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/IteratorPool.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/LocPathIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/LocPathIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/LocPathIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/LocPathIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/MatchPatternIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/NodeSequence.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/NodeSequence.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/NodeSequence.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/NodeSequence.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/OneStepIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/OneStepIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/OneStepIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/OneStepIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/OneStepIteratorForward.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/OneStepIteratorForward.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/OneStepIteratorForward.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/OneStepIteratorForward.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/PathComponent.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/PathComponent.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/PathComponent.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/PathComponent.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/PredicatedNodeTest.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/RTFIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/RTFIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/RTFIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/RTFIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/ReverseAxesWalker.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/ReverseAxesWalker.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/ReverseAxesWalker.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/ReverseAxesWalker.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/SelfIteratorNoPredicate.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/SelfIteratorNoPredicate.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/SelfIteratorNoPredicate.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/SelfIteratorNoPredicate.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/SubContextList.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/SubContextList.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/SubContextList.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/SubContextList.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/UnionChildIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/UnionChildIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/UnionChildIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/UnionChildIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/UnionPathIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/UnionPathIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/UnionPathIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/UnionPathIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/WalkerFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/WalkerFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/WalkerFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/WalkerFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/WalkingIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/WalkingIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/WalkingIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/WalkingIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/WalkingIteratorSorted.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/axes/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/Compiler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/Compiler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/Compiler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/Compiler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/FuncLoader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/FuncLoader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/FuncLoader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/FuncLoader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/FunctionTable.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/FunctionTable.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/FunctionTable.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/FunctionTable.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/Keywords.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/Keywords.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/Keywords.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/Keywords.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/Lexer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/Lexer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/Lexer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/Lexer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/OpCodes.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/OpCodes.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/OpCodes.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/OpCodes.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/OpMap.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/OpMap.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/OpMap.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/OpMap.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/OpMapVector.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/OpMapVector.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/OpMapVector.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/OpMapVector.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/PsuedoNames.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/PsuedoNames.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/PsuedoNames.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/PsuedoNames.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/XPathDumper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/XPathDumper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/XPathDumper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/XPathDumper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/XPathParser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/XPathParser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/XPathParser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/XPathParser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/compiler/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathEvaluatorImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathEvaluatorImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathEvaluatorImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathEvaluatorImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathExpressionImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathExpressionImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathExpressionImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathExpressionImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathNSResolverImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathNSResolverImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathNSResolverImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathNSResolverImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathNamespaceImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathNamespaceImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathNamespaceImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathNamespaceImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathResultImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathResultImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathResultImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathResultImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathStylesheetDOM3Exception.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathStylesheetDOM3Exception.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathStylesheetDOM3Exception.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/XPathStylesheetDOM3Exception.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/domapi/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncBoolean.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncBoolean.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncBoolean.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncBoolean.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncCeiling.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncCeiling.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncCeiling.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncCeiling.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncConcat.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncConcat.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncConcat.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncConcat.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncContains.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncContains.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncContains.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncContains.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncCount.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncCount.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncCount.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncCount.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncCurrent.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncCurrent.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncCurrent.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncCurrent.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncDoclocation.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncDoclocation.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncDoclocation.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncDoclocation.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncExtElementAvailable.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncExtElementAvailable.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncExtElementAvailable.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncExtElementAvailable.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncExtFunction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncExtFunction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncExtFunction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncExtFunction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncExtFunctionAvailable.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncExtFunctionAvailable.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncExtFunctionAvailable.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncExtFunctionAvailable.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncFalse.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncFalse.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncFalse.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncFalse.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncFloor.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncFloor.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncFloor.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncFloor.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncGenerateId.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncGenerateId.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncGenerateId.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncGenerateId.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncId.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncId.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncId.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncId.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncLang.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncLang.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncLang.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncLang.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncLast.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncLast.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncLast.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncLast.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncLocalPart.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncLocalPart.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncLocalPart.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncLocalPart.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncNamespace.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncNamespace.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncNamespace.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncNamespace.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncNormalizeSpace.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncNormalizeSpace.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncNormalizeSpace.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncNormalizeSpace.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncNot.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncNot.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncNot.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncNot.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncNumber.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncNumber.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncNumber.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncNumber.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncPosition.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncPosition.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncPosition.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncPosition.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncQname.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncQname.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncQname.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncQname.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncRound.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncRound.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncRound.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncRound.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncStartsWith.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncStartsWith.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncStartsWith.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncStartsWith.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncString.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncString.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncString.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncString.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncStringLength.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncStringLength.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncStringLength.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncStringLength.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncSubstring.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncSubstring.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncSubstring.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncSubstring.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncSubstringAfter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncSubstringAfter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncSubstringAfter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncSubstringAfter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncSubstringBefore.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncSubstringBefore.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncSubstringBefore.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncSubstringBefore.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncSum.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncSum.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncSum.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncSum.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncTranslate.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncTranslate.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncTranslate.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncTranslate.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncTrue.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncTrue.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncTrue.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncTrue.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncUnparsedEntityURI.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncUnparsedEntityURI.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncUnparsedEntityURI.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FuncUnparsedEntityURI.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/Function.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/Function.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/Function.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/Function.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/Function2Args.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/Function2Args.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/Function2Args.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/Function2Args.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/Function3Args.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/Function3Args.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/Function3Args.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/Function3Args.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FunctionDef1Arg.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FunctionDef1Arg.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FunctionDef1Arg.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FunctionDef1Arg.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FunctionMultiArgs.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FunctionOneArg.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FunctionOneArg.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FunctionOneArg.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/FunctionOneArg.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/WrongNumberArgsException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/functions/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/JAXPExtensionsProvider.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/JAXPPrefixResolver.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/JAXPVariableStack.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/XPathExpressionImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/XPathFactoryImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/XPathImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/XPathImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/XPathImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/jaxp/XPathImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/DTMXRTreeFrag.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/DTMXRTreeFrag.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/DTMXRTreeFrag.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/DTMXRTreeFrag.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XBoolean.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XBoolean.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XBoolean.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XBoolean.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XBooleanStatic.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XBooleanStatic.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XBooleanStatic.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XBooleanStatic.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XMLStringFactoryImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XMLStringFactoryImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XMLStringFactoryImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XMLStringFactoryImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XNodeSet.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XNodeSet.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XNodeSet.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XNodeSet.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XNodeSetForDOM.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XNull.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XNull.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XNull.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XNull.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XNumber.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XNumber.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XNumber.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XNumber.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XObject.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XObject.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XObject.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XObject.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XObjectFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XObjectFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XObjectFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XObjectFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XRTreeFrag.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XRTreeFrag.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XRTreeFrag.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XRTreeFrag.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XRTreeFragSelectWrapper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XString.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XString.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XString.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XString.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XStringForChars.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XStringForChars.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XStringForChars.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XStringForChars.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XStringForFSB.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XStringForFSB.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XStringForFSB.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/XStringForFSB.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/objects/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/And.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/And.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/And.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/And.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Bool.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Bool.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Bool.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Bool.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Div.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Div.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Div.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Div.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Equals.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Equals.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Equals.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Equals.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Gt.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Gt.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Gt.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Gt.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Gte.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Gte.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Gte.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Gte.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Lt.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Lt.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Lt.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Lt.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Lte.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Lte.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Lte.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Lte.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Minus.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Minus.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Minus.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Minus.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Mod.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Mod.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Mod.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Mod.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Mult.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Mult.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Mult.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Mult.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Neg.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Neg.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Neg.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Neg.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/NotEquals.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/NotEquals.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/NotEquals.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/NotEquals.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Number.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Number.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Number.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Number.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Operation.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Operation.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Operation.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Operation.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Or.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Or.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Or.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Or.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Plus.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Plus.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Plus.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Plus.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Quo.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Quo.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Quo.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Quo.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/String.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/String.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/String.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/String.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/UnaryOperation.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/UnaryOperation.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/UnaryOperation.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/UnaryOperation.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Variable.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Variable.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Variable.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/Variable.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/VariableSafeAbsRef.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/operations/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/ContextMatchStepPattern.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/FunctionPattern.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/FunctionPattern.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/FunctionPattern.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/FunctionPattern.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/NodeTest.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/NodeTest.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/NodeTest.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/NodeTest.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/NodeTestFilter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/StepPattern.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/StepPattern.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/StepPattern.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/StepPattern.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/UnionPattern.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/UnionPattern.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/UnionPattern.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/UnionPattern.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/patterns/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_de.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_en.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_en.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_en.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_en.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_es.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_fr.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_it.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_ja.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_ko.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_pt_BR.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_sv.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_CN.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHErrorResources_zh_TW.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHMessages.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHMessages.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHMessages.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/XPATHMessages.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/org/apache/xpath/internal/res/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/Entity.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/Entity.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/Entity.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/Entity.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/EventFilterSupport.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/EventFilterSupport.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/EventFilterSupport.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/EventFilterSupport.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/StaxEntityResolverWrapper.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/StaxEntityResolverWrapper.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/StaxEntityResolverWrapper.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/StaxEntityResolverWrapper.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/StaxErrorReporter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/StaxErrorReporter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/StaxErrorReporter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/StaxErrorReporter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/StaxXMLInputSource.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/StaxXMLInputSource.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/StaxXMLInputSource.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/StaxXMLInputSource.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLBufferListener.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLBufferListener.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLBufferListener.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLBufferListener.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLEntityReader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLEntityReader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLEntityReader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLEntityReader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLEntityStorage.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLEntityStorage.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLEntityStorage.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLEntityStorage.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLEventReaderImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLEventReaderImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLEventReaderImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLEventReaderImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLInputFactoryImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLInputFactoryImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLInputFactoryImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLInputFactoryImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLOutputFactoryImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLOutputFactoryImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLOutputFactoryImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/XMLOutputFactoryImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/DTDGrammarUtil.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/DTDGrammarUtil.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/DTDGrammarUtil.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/DTDGrammarUtil.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/nonvalidating/DTDGrammar.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/nonvalidating/XMLAttributeDecl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/nonvalidating/XMLElementDecl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/nonvalidating/XMLNotationDecl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/nonvalidating/XMLSimpleType.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/nonvalidating/XMLSimpleType.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/nonvalidating/XMLSimpleType.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/dtd/nonvalidating/XMLSimpleType.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/AttributeImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/AttributeImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/AttributeImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/AttributeImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/CharacterEvent.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/CharacterEvent.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/CharacterEvent.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/CharacterEvent.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/CommentEvent.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/CommentEvent.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/CommentEvent.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/CommentEvent.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/DTDEvent.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/DTDEvent.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/DTDEvent.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/DTDEvent.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/DummyEvent.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/DummyEvent.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/DummyEvent.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/DummyEvent.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/EndDocumentEvent.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/EndDocumentEvent.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/EndDocumentEvent.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/EndDocumentEvent.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/EndElementEvent.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/EndElementEvent.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/EndElementEvent.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/EndElementEvent.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/EntityDeclarationImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/EntityDeclarationImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/EntityDeclarationImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/EntityDeclarationImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/EntityReferenceEvent.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/EntityReferenceEvent.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/EntityReferenceEvent.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/EntityReferenceEvent.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/LocationImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/LocationImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/LocationImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/LocationImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/NamedEvent.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/NamedEvent.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/NamedEvent.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/NamedEvent.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/NamespaceImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/NamespaceImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/NamespaceImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/NamespaceImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/NotationDeclarationImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/NotationDeclarationImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/NotationDeclarationImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/NotationDeclarationImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/ProcessingInstructionEvent.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/ProcessingInstructionEvent.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/ProcessingInstructionEvent.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/ProcessingInstructionEvent.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/StartDocumentEvent.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/StartDocumentEvent.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/StartDocumentEvent.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/StartDocumentEvent.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/StartElementEvent.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/StartElementEvent.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/StartElementEvent.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/StartElementEvent.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/XMLEventAllocatorImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/XMLEventFactoryImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/XMLEventFactoryImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/XMLEventFactoryImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/events/XMLEventFactoryImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/javax.xml.stream.XMLEventFactory b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/javax.xml.stream.XMLEventFactory similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/javax.xml.stream.XMLEventFactory rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/javax.xml.stream.XMLEventFactory diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/javax.xml.stream.XMLInputFactory b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/javax.xml.stream.XMLInputFactory similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/javax.xml.stream.XMLInputFactory rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/javax.xml.stream.XMLInputFactory diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/javax.xml.stream.XMLOutputFactory b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/javax.xml.stream.XMLOutputFactory similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/javax.xml.stream.XMLOutputFactory rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/javax.xml.stream.XMLOutputFactory diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/util/BufferAllocator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/util/BufferAllocator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/util/BufferAllocator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/util/BufferAllocator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/util/ReadOnlyIterator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/util/ReadOnlyIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/util/ReadOnlyIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/util/ReadOnlyIterator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/util/ThreadLocalBufferAllocator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/UTF8OutputStreamWriter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/WriterUtility.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/WriterUtility.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/WriterUtility.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/WriterUtility.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/XMLDOMWriterImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/XMLEventWriterImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/XMLEventWriterImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/XMLEventWriterImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/XMLEventWriterImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/XMLOutputSource.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/XMLOutputSource.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/XMLOutputSource.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/XMLOutputSource.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/XMLStreamWriterImpl.java diff --git a/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/XMLWriter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/XMLWriter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/XMLWriter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/sun/xml/internal/stream/writers/XMLWriter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/XMLConstants.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/XMLConstants.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/XMLConstants.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/XMLConstants.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/datatype/DatatypeConfigurationException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/datatype/DatatypeConfigurationException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/datatype/DatatypeConfigurationException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/datatype/DatatypeConfigurationException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/datatype/DatatypeConstants.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/datatype/DatatypeConstants.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/datatype/DatatypeConstants.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/datatype/DatatypeConstants.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/datatype/DatatypeFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/datatype/DatatypeFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/datatype/DatatypeFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/datatype/DatatypeFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/datatype/Duration.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/datatype/Duration.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/datatype/Duration.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/datatype/Duration.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/datatype/FactoryFinder.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/datatype/FactoryFinder.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/datatype/FactoryFinder.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/datatype/FactoryFinder.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/datatype/SecuritySupport.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/datatype/SecuritySupport.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/datatype/SecuritySupport.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/datatype/SecuritySupport.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/datatype/XMLGregorianCalendar.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/datatype/XMLGregorianCalendar.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/datatype/XMLGregorianCalendar.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/datatype/XMLGregorianCalendar.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/datatype/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/datatype/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/datatype/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/datatype/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/namespace/NamespaceContext.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/namespace/NamespaceContext.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/namespace/NamespaceContext.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/namespace/NamespaceContext.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/namespace/QName.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/namespace/QName.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/namespace/QName.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/namespace/QName.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/namespace/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/namespace/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/namespace/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/namespace/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/parsers/DocumentBuilder.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/parsers/DocumentBuilder.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/parsers/DocumentBuilder.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/parsers/DocumentBuilder.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/parsers/DocumentBuilderFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/parsers/DocumentBuilderFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/parsers/DocumentBuilderFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/parsers/DocumentBuilderFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/parsers/FactoryConfigurationError.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/parsers/FactoryConfigurationError.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/parsers/FactoryConfigurationError.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/parsers/FactoryConfigurationError.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/parsers/FactoryFinder.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/parsers/FactoryFinder.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/parsers/FactoryFinder.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/parsers/FactoryFinder.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/parsers/ParserConfigurationException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/parsers/ParserConfigurationException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/parsers/ParserConfigurationException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/parsers/ParserConfigurationException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/parsers/SAXParser.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/parsers/SAXParser.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/parsers/SAXParser.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/parsers/SAXParser.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/parsers/SAXParserFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/parsers/SAXParserFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/parsers/SAXParserFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/parsers/SAXParserFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/parsers/SecuritySupport.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/parsers/SecuritySupport.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/parsers/SecuritySupport.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/parsers/SecuritySupport.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/parsers/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/parsers/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/parsers/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/parsers/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/EventFilter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/EventFilter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/EventFilter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/EventFilter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/FactoryConfigurationError.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/FactoryConfigurationError.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/FactoryConfigurationError.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/FactoryConfigurationError.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/FactoryFinder.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/FactoryFinder.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/FactoryFinder.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/FactoryFinder.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/Location.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/Location.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/Location.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/Location.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/SecuritySupport.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/SecuritySupport.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/SecuritySupport.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/SecuritySupport.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/StreamFilter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/StreamFilter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/StreamFilter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/StreamFilter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLEventFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLEventFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLEventFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLEventFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLEventReader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLEventReader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLEventReader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLEventReader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLEventWriter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLEventWriter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLEventWriter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLEventWriter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLInputFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLInputFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLInputFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLInputFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLOutputFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLOutputFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLOutputFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLOutputFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLReporter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLReporter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLReporter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLReporter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLResolver.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLResolver.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLResolver.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLResolver.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLStreamConstants.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLStreamConstants.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLStreamConstants.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLStreamConstants.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLStreamException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLStreamException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLStreamException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLStreamException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLStreamReader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLStreamReader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLStreamReader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLStreamReader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLStreamWriter.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLStreamWriter.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLStreamWriter.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/XMLStreamWriter.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/Attribute.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/Attribute.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/events/Attribute.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/Attribute.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/Characters.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/Characters.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/events/Characters.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/Characters.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/Comment.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/Comment.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/events/Comment.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/Comment.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/DTD.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/DTD.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/events/DTD.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/DTD.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/EndDocument.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/EndDocument.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/events/EndDocument.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/EndDocument.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/EndElement.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/EndElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/events/EndElement.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/EndElement.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/EntityDeclaration.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/EntityDeclaration.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/events/EntityDeclaration.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/EntityDeclaration.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/EntityReference.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/EntityReference.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/events/EntityReference.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/EntityReference.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/Namespace.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/Namespace.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/events/Namespace.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/Namespace.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/NotationDeclaration.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/NotationDeclaration.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/events/NotationDeclaration.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/NotationDeclaration.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/ProcessingInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/ProcessingInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/events/ProcessingInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/ProcessingInstruction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/StartDocument.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/StartDocument.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/events/StartDocument.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/StartDocument.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/StartElement.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/StartElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/events/StartElement.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/StartElement.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/XMLEvent.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/XMLEvent.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/events/XMLEvent.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/events/XMLEvent.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/util/EventReaderDelegate.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/util/EventReaderDelegate.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/util/EventReaderDelegate.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/util/EventReaderDelegate.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/util/StreamReaderDelegate.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/util/StreamReaderDelegate.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/util/StreamReaderDelegate.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/util/StreamReaderDelegate.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/util/XMLEventAllocator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/util/XMLEventAllocator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/util/XMLEventAllocator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/util/XMLEventAllocator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/stream/util/XMLEventConsumer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/util/XMLEventConsumer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/stream/util/XMLEventConsumer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/stream/util/XMLEventConsumer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/ErrorListener.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/ErrorListener.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/ErrorListener.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/ErrorListener.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/FactoryFinder.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/FactoryFinder.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/FactoryFinder.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/FactoryFinder.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/OutputKeys.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/OutputKeys.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/OutputKeys.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/OutputKeys.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/Result.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/Result.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/Result.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/Result.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/SecuritySupport.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/SecuritySupport.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/SecuritySupport.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/SecuritySupport.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/Source.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/Source.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/Source.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/Source.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/SourceLocator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/SourceLocator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/SourceLocator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/SourceLocator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/Templates.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/Templates.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/Templates.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/Templates.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/Transformer.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/Transformer.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/Transformer.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/Transformer.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/TransformerConfigurationException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/TransformerConfigurationException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/TransformerConfigurationException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/TransformerConfigurationException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/TransformerException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/TransformerException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/TransformerException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/TransformerException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/TransformerFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/TransformerFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/TransformerFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/TransformerFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/TransformerFactoryConfigurationError.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/TransformerFactoryConfigurationError.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/TransformerFactoryConfigurationError.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/TransformerFactoryConfigurationError.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/URIResolver.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/URIResolver.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/URIResolver.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/URIResolver.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/dom/DOMLocator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/dom/DOMLocator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/dom/DOMLocator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/dom/DOMLocator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/dom/DOMResult.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/dom/DOMResult.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/dom/DOMResult.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/dom/DOMResult.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/dom/DOMSource.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/dom/DOMSource.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/dom/DOMSource.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/dom/DOMSource.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/dom/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/dom/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/dom/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/dom/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/overview.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/overview.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/overview.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/overview.html diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/SAXResult.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/SAXResult.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/SAXResult.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/SAXResult.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/SAXSource.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/SAXSource.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/SAXSource.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/SAXSource.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/SAXTransformerFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/SAXTransformerFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/SAXTransformerFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/SAXTransformerFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/TemplatesHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/TemplatesHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/TemplatesHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/TemplatesHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/TransformerHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/TransformerHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/TransformerHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/TransformerHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/sax/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/stax/StAXResult.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/stax/StAXResult.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/stax/StAXResult.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/stax/StAXResult.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/stax/StAXSource.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/stax/StAXSource.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/stax/StAXSource.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/stax/StAXSource.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/stax/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/stax/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/stax/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/stax/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/stream/StreamResult.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/stream/StreamResult.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/stream/StreamResult.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/stream/StreamResult.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/stream/StreamSource.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/stream/StreamSource.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/stream/StreamSource.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/stream/StreamSource.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/transform/stream/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/stream/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/transform/stream/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/transform/stream/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/validation/Schema.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/validation/Schema.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/validation/Schema.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/validation/Schema.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/validation/SchemaFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/validation/SchemaFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/validation/SchemaFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/validation/SchemaFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/validation/SchemaFactoryConfigurationError.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/validation/SchemaFactoryConfigurationError.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/validation/SchemaFactoryConfigurationError.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/validation/SchemaFactoryConfigurationError.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/validation/SchemaFactoryFinder.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/validation/SchemaFactoryFinder.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/validation/SchemaFactoryFinder.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/validation/SchemaFactoryFinder.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/validation/SchemaFactoryLoader.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/validation/SchemaFactoryLoader.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/validation/SchemaFactoryLoader.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/validation/SchemaFactoryLoader.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/validation/SecuritySupport.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/validation/SecuritySupport.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/validation/SecuritySupport.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/validation/SecuritySupport.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/validation/TypeInfoProvider.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/validation/TypeInfoProvider.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/validation/TypeInfoProvider.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/validation/TypeInfoProvider.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/validation/Validator.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/validation/Validator.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/validation/Validator.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/validation/Validator.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/validation/ValidatorHandler.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/validation/ValidatorHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/validation/ValidatorHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/validation/ValidatorHandler.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/validation/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/validation/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/validation/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/validation/package.html diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/xpath/SecuritySupport.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/SecuritySupport.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/xpath/SecuritySupport.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/SecuritySupport.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPath.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPath.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPath.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPath.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathConstants.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathConstants.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathConstants.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathConstants.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathExpression.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathExpression.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathExpression.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathExpression.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathExpressionException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathExpressionException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathExpressionException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathExpressionException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFactory.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFactory.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFactoryConfigurationException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFactoryConfigurationException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFactoryConfigurationException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFactoryConfigurationException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFactoryFinder.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFactoryFinder.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFactoryFinder.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFactoryFinder.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFunction.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFunction.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFunction.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFunction.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFunctionException.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFunctionException.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFunctionException.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFunctionException.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFunctionResolver.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFunctionResolver.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFunctionResolver.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathFunctionResolver.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathVariableResolver.java b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathVariableResolver.java similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathVariableResolver.java rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/XPathVariableResolver.java diff --git a/build-deps/jaxp/src/main/java/jaxp/xml/xpath/package.html b/composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/jaxp/xml/xpath/package.html rename to composite-builds/build-deps/jaxp/src/main/java/jaxp/xml/xpath/package.html diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/Attr.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/Attr.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/Attr.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/Attr.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/CDATASection.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/CDATASection.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/CDATASection.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/CDATASection.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/CharacterData.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/CharacterData.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/CharacterData.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/CharacterData.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/Comment.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/Comment.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/Comment.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/Comment.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/DOMConfiguration.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/DOMConfiguration.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/DOMConfiguration.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/DOMConfiguration.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/DOMError.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/DOMError.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/DOMError.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/DOMError.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/DOMErrorHandler.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/DOMErrorHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/DOMErrorHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/DOMErrorHandler.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/DOMException.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/DOMException.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/DOMException.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/DOMException.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/DOMImplementation.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/DOMImplementation.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/DOMImplementation.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/DOMImplementation.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/DOMImplementationList.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/DOMImplementationList.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/DOMImplementationList.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/DOMImplementationList.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/DOMImplementationSource.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/DOMImplementationSource.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/DOMImplementationSource.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/DOMImplementationSource.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/DOMLocator.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/DOMLocator.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/DOMLocator.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/DOMLocator.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/DOMStringList.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/DOMStringList.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/DOMStringList.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/DOMStringList.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/Document.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/Document.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/Document.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/Document.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/DocumentFragment.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/DocumentFragment.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/DocumentFragment.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/DocumentFragment.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/DocumentType.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/DocumentType.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/DocumentType.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/DocumentType.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/Element.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/Element.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/Element.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/Element.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/Entity.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/Entity.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/Entity.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/Entity.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/EntityReference.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/EntityReference.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/EntityReference.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/EntityReference.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/NameList.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/NameList.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/NameList.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/NameList.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/NamedNodeMap.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/NamedNodeMap.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/NamedNodeMap.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/NamedNodeMap.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/Node.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/Node.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/Node.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/Node.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/NodeList.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/NodeList.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/NodeList.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/NodeList.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/Notation.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/Notation.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/Notation.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/Notation.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/ProcessingInstruction.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ProcessingInstruction.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/ProcessingInstruction.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ProcessingInstruction.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/Text.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/Text.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/Text.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/Text.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/TypeInfo.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/TypeInfo.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/TypeInfo.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/TypeInfo.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/UserDataHandler.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/UserDataHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/UserDataHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/UserDataHandler.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/bootstrap/DOMImplementationRegistry.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/bootstrap/DOMImplementationRegistry.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/bootstrap/DOMImplementationRegistry.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/bootstrap/DOMImplementationRegistry.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSS2Properties.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSS2Properties.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/css/CSS2Properties.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSS2Properties.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSCharsetRule.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSCharsetRule.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSCharsetRule.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSCharsetRule.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSFontFaceRule.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSFontFaceRule.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSFontFaceRule.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSFontFaceRule.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSImportRule.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSImportRule.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSImportRule.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSImportRule.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSMediaRule.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSMediaRule.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSMediaRule.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSMediaRule.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSPageRule.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSPageRule.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSPageRule.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSPageRule.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSPrimitiveValue.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSPrimitiveValue.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSPrimitiveValue.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSPrimitiveValue.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSRule.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSRule.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSRule.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSRule.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSRuleList.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSRuleList.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSRuleList.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSRuleList.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSStyleDeclaration.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSStyleDeclaration.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSStyleDeclaration.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSStyleDeclaration.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSStyleRule.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSStyleRule.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSStyleRule.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSStyleRule.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSStyleSheet.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSStyleSheet.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSStyleSheet.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSStyleSheet.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSUnknownRule.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSUnknownRule.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSUnknownRule.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSUnknownRule.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSValue.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSValue.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSValue.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSValue.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSValueList.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSValueList.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSValueList.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/CSSValueList.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/css/Counter.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/Counter.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/css/Counter.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/Counter.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/css/DOMImplementationCSS.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/DOMImplementationCSS.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/css/DOMImplementationCSS.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/DOMImplementationCSS.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/css/DocumentCSS.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/DocumentCSS.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/css/DocumentCSS.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/DocumentCSS.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/css/ElementCSSInlineStyle.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/ElementCSSInlineStyle.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/css/ElementCSSInlineStyle.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/ElementCSSInlineStyle.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/css/RGBColor.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/RGBColor.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/css/RGBColor.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/RGBColor.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/css/Rect.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/Rect.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/css/Rect.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/Rect.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/css/ViewCSS.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/ViewCSS.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/css/ViewCSS.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/css/ViewCSS.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/events/DocumentEvent.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/events/DocumentEvent.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/events/DocumentEvent.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/events/DocumentEvent.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/events/Event.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/events/Event.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/events/Event.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/events/Event.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/events/EventException.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/events/EventException.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/events/EventException.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/events/EventException.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/events/EventListener.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/events/EventListener.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/events/EventListener.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/events/EventListener.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/events/EventTarget.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/events/EventTarget.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/events/EventTarget.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/events/EventTarget.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/events/MouseEvent.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/events/MouseEvent.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/events/MouseEvent.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/events/MouseEvent.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/events/MutationEvent.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/events/MutationEvent.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/events/MutationEvent.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/events/MutationEvent.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/events/UIEvent.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/events/UIEvent.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/events/UIEvent.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/events/UIEvent.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLAnchorElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLAnchorElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLAnchorElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLAnchorElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLAppletElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLAppletElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLAppletElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLAppletElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLAreaElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLAreaElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLAreaElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLAreaElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLBRElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLBRElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLBRElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLBRElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLBaseElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLBaseElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLBaseElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLBaseElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLBaseFontElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLBaseFontElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLBaseFontElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLBaseFontElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLBodyElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLBodyElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLBodyElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLBodyElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLButtonElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLButtonElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLButtonElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLButtonElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLCollection.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLCollection.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLCollection.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLCollection.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLDListElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLDListElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLDListElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLDListElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLDOMImplementation.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLDOMImplementation.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLDOMImplementation.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLDOMImplementation.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLDirectoryElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLDirectoryElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLDirectoryElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLDirectoryElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLDivElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLDivElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLDivElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLDivElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLDocument.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLDocument.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLDocument.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLDocument.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLFieldSetElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLFieldSetElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLFieldSetElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLFieldSetElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLFontElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLFontElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLFontElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLFontElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLFormElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLFormElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLFormElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLFormElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLFrameElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLFrameElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLFrameElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLFrameElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLFrameSetElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLFrameSetElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLFrameSetElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLFrameSetElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLHRElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLHRElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLHRElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLHRElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLHeadElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLHeadElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLHeadElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLHeadElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLHeadingElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLHeadingElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLHeadingElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLHeadingElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLHtmlElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLHtmlElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLHtmlElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLHtmlElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLIFrameElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLIFrameElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLIFrameElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLIFrameElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLImageElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLImageElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLImageElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLImageElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLInputElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLInputElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLInputElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLInputElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLIsIndexElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLIsIndexElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLIsIndexElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLIsIndexElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLLIElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLLIElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLLIElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLLIElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLLabelElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLLabelElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLLabelElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLLabelElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLLegendElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLLegendElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLLegendElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLLegendElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLLinkElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLLinkElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLLinkElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLLinkElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLMapElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLMapElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLMapElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLMapElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLMenuElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLMenuElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLMenuElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLMenuElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLMetaElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLMetaElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLMetaElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLMetaElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLModElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLModElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLModElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLModElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLOListElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLOListElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLOListElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLOListElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLObjectElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLObjectElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLObjectElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLObjectElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLOptGroupElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLOptGroupElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLOptGroupElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLOptGroupElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLOptionElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLOptionElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLOptionElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLOptionElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLParagraphElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLParagraphElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLParagraphElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLParagraphElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLParamElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLParamElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLParamElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLParamElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLPreElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLPreElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLPreElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLPreElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLQuoteElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLQuoteElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLQuoteElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLQuoteElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLScriptElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLScriptElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLScriptElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLScriptElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLSelectElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLSelectElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLSelectElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLSelectElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLStyleElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLStyleElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLStyleElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLStyleElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableCaptionElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableCaptionElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableCaptionElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableCaptionElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableCellElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableCellElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableCellElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableCellElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableColElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableColElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableColElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableColElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableRowElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableRowElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableRowElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableRowElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableSectionElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableSectionElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableSectionElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTableSectionElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTextAreaElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTextAreaElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTextAreaElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTextAreaElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTitleElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTitleElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTitleElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLTitleElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLUListElement.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLUListElement.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLUListElement.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/html/HTMLUListElement.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/ls/DOMImplementationLS.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ls/DOMImplementationLS.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/ls/DOMImplementationLS.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ls/DOMImplementationLS.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSException.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSException.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSException.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSException.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSInput.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSInput.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSInput.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSInput.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSLoadEvent.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSLoadEvent.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSLoadEvent.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSLoadEvent.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSOutput.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSOutput.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSOutput.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSOutput.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSParser.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSParser.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSParser.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSParser.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSParserFilter.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSParserFilter.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSParserFilter.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSParserFilter.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSProgressEvent.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSProgressEvent.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSProgressEvent.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSProgressEvent.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSResourceResolver.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSResourceResolver.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSResourceResolver.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSResourceResolver.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSSerializer.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSSerializer.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSSerializer.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSSerializer.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSSerializerFilter.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSSerializerFilter.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSSerializerFilter.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ls/LSSerializerFilter.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/package.html b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/package.html rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/package.html diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/ranges/DocumentRange.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ranges/DocumentRange.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/ranges/DocumentRange.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ranges/DocumentRange.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/ranges/Range.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ranges/Range.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/ranges/Range.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ranges/Range.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/ranges/RangeException.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ranges/RangeException.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/ranges/RangeException.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ranges/RangeException.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/ranges/package.html b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ranges/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/ranges/package.html rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/ranges/package.html diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/stylesheets/DocumentStyle.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/stylesheets/DocumentStyle.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/stylesheets/DocumentStyle.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/stylesheets/DocumentStyle.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/stylesheets/LinkStyle.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/stylesheets/LinkStyle.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/stylesheets/LinkStyle.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/stylesheets/LinkStyle.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/stylesheets/MediaList.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/stylesheets/MediaList.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/stylesheets/MediaList.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/stylesheets/MediaList.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/stylesheets/StyleSheet.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/stylesheets/StyleSheet.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/stylesheets/StyleSheet.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/stylesheets/StyleSheet.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/stylesheets/StyleSheetList.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/stylesheets/StyleSheetList.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/stylesheets/StyleSheetList.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/stylesheets/StyleSheetList.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/traversal/DocumentTraversal.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/traversal/DocumentTraversal.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/traversal/DocumentTraversal.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/traversal/DocumentTraversal.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/traversal/NodeFilter.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/traversal/NodeFilter.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/traversal/NodeFilter.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/traversal/NodeFilter.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/traversal/NodeIterator.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/traversal/NodeIterator.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/traversal/NodeIterator.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/traversal/NodeIterator.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/traversal/TreeWalker.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/traversal/TreeWalker.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/traversal/TreeWalker.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/traversal/TreeWalker.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/views/AbstractView.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/views/AbstractView.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/views/AbstractView.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/views/AbstractView.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/views/DocumentView.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/views/DocumentView.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/views/DocumentView.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/views/DocumentView.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/xpath/COPYRIGHT.html b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/xpath/COPYRIGHT.html similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/xpath/COPYRIGHT.html rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/xpath/COPYRIGHT.html diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathEvaluator.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathEvaluator.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathEvaluator.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathEvaluator.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathException.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathException.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathException.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathException.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathExpression.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathExpression.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathExpression.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathExpression.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathNSResolver.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathNSResolver.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathNSResolver.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathNSResolver.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathNamespace.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathNamespace.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathNamespace.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathNamespace.java diff --git a/build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathResult.java b/composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathResult.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathResult.java rename to composite-builds/build-deps/jaxp/src/main/java/org/w3c/dom/xpath/XPathResult.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/AttributeList.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/AttributeList.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/AttributeList.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/AttributeList.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/Attributes.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/Attributes.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/Attributes.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/Attributes.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/COPYING b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/COPYING similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/COPYING rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/COPYING diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/COPYING.txt b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/COPYING.txt similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/COPYING.txt rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/COPYING.txt diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/ContentHandler.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/ContentHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/ContentHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/ContentHandler.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/DTDHandler.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/DTDHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/DTDHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/DTDHandler.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/DocumentHandler.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/DocumentHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/DocumentHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/DocumentHandler.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/EntityResolver.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/EntityResolver.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/EntityResolver.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/EntityResolver.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/ErrorHandler.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/ErrorHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/ErrorHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/ErrorHandler.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/HandlerBase.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/HandlerBase.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/HandlerBase.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/HandlerBase.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/InputSource.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/InputSource.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/InputSource.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/InputSource.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/Locator.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/Locator.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/Locator.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/Locator.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/Parser.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/Parser.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/Parser.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/Parser.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/SAXException.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/SAXException.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/SAXException.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/SAXException.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/SAXNotRecognizedException.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/SAXNotRecognizedException.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/SAXNotRecognizedException.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/SAXNotRecognizedException.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/SAXNotSupportedException.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/SAXNotSupportedException.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/SAXNotSupportedException.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/SAXNotSupportedException.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/SAXParseException.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/SAXParseException.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/SAXParseException.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/SAXParseException.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/XMLFilter.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/XMLFilter.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/XMLFilter.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/XMLFilter.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/XMLReader.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/XMLReader.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/XMLReader.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/XMLReader.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/ext/Attributes2.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/ext/Attributes2.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/ext/Attributes2.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/ext/Attributes2.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/ext/Attributes2Impl.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/ext/Attributes2Impl.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/ext/Attributes2Impl.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/ext/Attributes2Impl.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/ext/DeclHandler.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/ext/DeclHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/ext/DeclHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/ext/DeclHandler.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/ext/DefaultHandler2.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/ext/DefaultHandler2.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/ext/DefaultHandler2.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/ext/DefaultHandler2.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/ext/EntityResolver2.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/ext/EntityResolver2.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/ext/EntityResolver2.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/ext/EntityResolver2.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/ext/LexicalHandler.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/ext/LexicalHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/ext/LexicalHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/ext/LexicalHandler.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/ext/Locator2.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/ext/Locator2.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/ext/Locator2.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/ext/Locator2.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/ext/Locator2Impl.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/ext/Locator2Impl.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/ext/Locator2Impl.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/ext/Locator2Impl.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/ext/package.html b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/ext/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/ext/package.html rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/ext/package.html diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/helpers/AttributeListImpl.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/AttributeListImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/helpers/AttributeListImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/AttributeListImpl.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/helpers/AttributesImpl.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/AttributesImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/helpers/AttributesImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/AttributesImpl.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/helpers/DefaultHandler.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/DefaultHandler.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/helpers/DefaultHandler.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/DefaultHandler.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/helpers/LocatorImpl.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/LocatorImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/helpers/LocatorImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/LocatorImpl.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/helpers/NamespaceSupport.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/NamespaceSupport.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/helpers/NamespaceSupport.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/NamespaceSupport.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/helpers/NewInstance.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/NewInstance.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/helpers/NewInstance.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/NewInstance.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/helpers/ParserAdapter.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/ParserAdapter.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/helpers/ParserAdapter.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/ParserAdapter.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/helpers/ParserFactory.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/ParserFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/helpers/ParserFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/ParserFactory.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/helpers/SecuritySupport.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/SecuritySupport.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/helpers/SecuritySupport.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/SecuritySupport.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/helpers/XMLFilterImpl.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/XMLFilterImpl.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/helpers/XMLFilterImpl.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/XMLFilterImpl.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/helpers/XMLReaderAdapter.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/XMLReaderAdapter.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/helpers/XMLReaderAdapter.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/XMLReaderAdapter.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/XMLReaderFactory.java diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/helpers/package.html b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/helpers/package.html rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/helpers/package.html diff --git a/build-deps/jaxp/src/main/java/org/xml/sax/package.html b/composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/package.html similarity index 100% rename from build-deps/jaxp/src/main/java/org/xml/sax/package.html rename to composite-builds/build-deps/jaxp/src/main/java/org/xml/sax/package.html diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_de.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_es.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_fr.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_it.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ja.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_ko.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_pt_BR.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_sv.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_CN.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_TW.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_TW.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_TW.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DOMMessages_zh_TW.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_de.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_es.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_es.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_es.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_es.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_fr.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_fr.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_fr.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_fr.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_it.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_it.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_it.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_it.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ja.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ko.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ko.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ko.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_ko.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_pt_BR.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_pt_BR.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_pt_BR.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_pt_BR.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_sv.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_sv.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_sv.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_sv.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_CN.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/DatatypeMessages_zh_TW.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_de.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_es.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_es.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_es.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_es.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_fr.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_fr.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_fr.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_fr.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_it.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_it.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_it.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_it.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ja.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ko.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ko.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ko.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_ko.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_pt_BR.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_pt_BR.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_pt_BR.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_pt_BR.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_sv.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_sv.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_sv.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_sv.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_CN.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_TW.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_TW.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_TW.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/JAXPValidationMessages_zh_TW.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_de.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_es.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_fr.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_it.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ja.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_ko.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_pt_BR.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_sv.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_CN.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/SAXMessages_zh_TW.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_de.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_es.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_fr.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_it.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ja.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_ko.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_pt_BR.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_sv.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_CN.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XIncludeMessages_zh_TW.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_de.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_es.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_fr.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_it.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ja.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_ko.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_pt_BR.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_sv.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_CN.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLMessages_zh_TW.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_de.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_es.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_fr.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_it.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ja.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_ko.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_pt_BR.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_sv.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_CN.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSchemaMessages_zh_TW.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_de.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_es.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_es.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_es.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_es.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_fr.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_fr.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_fr.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_fr.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_it.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_it.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_it.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_it.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ja.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ko.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ko.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ko.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_ko.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_pt_BR.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_pt_BR.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_pt_BR.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_pt_BR.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_sv.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_CN.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_TW.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_TW.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_TW.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XMLSerializerMessages_zh_TW.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_de.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_es.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_fr.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_it.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ja.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_ko.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_pt_BR.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_sv.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_CN.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_TW.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_TW.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_TW.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xerces/internal/impl/msg/XPointerMessages_zh_TW.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/Encodings.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/Encodings.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/Encodings.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/Encodings.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/HTMLEntities.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/HTMLEntities.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/HTMLEntities.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/HTMLEntities.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/XMLEntities.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/XMLEntities.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/XMLEntities.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/XMLEntities.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/output_html.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/output_html.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/output_html.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/output_html.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/output_text.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/output_text.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/output_text.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/output_text.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/output_unknown.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/output_unknown.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/output_unknown.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/output_unknown.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/output_xml.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/output_xml.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/output_xml.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/output_xml.properties diff --git a/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessagers.properties b/composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessagers.properties similarity index 100% rename from build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessagers.properties rename to composite-builds/build-deps/jaxp/src/main/resources/jaxp/sun/org/apache/xml/internal/serializer/utils/SerializerMessagers.properties diff --git a/build-deps/jdk-jdeps/.gitignore b/composite-builds/build-deps/jdk-compiler/.gitignore similarity index 100% rename from build-deps/jdk-jdeps/.gitignore rename to composite-builds/build-deps/jdk-compiler/.gitignore diff --git a/build-deps/jdk-compiler/build.gradle.kts b/composite-builds/build-deps/jdk-compiler/build.gradle.kts similarity index 100% rename from build-deps/jdk-compiler/build.gradle.kts rename to composite-builds/build-deps/jdk-compiler/build.gradle.kts diff --git a/build-deps/jdk-compiler/src/main/java/javac/internal/shellsupport/doc/JavadocFormatter.java b/composite-builds/build-deps/jdk-compiler/src/main/java/javac/internal/shellsupport/doc/JavadocFormatter.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/javac/internal/shellsupport/doc/JavadocFormatter.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/javac/internal/shellsupport/doc/JavadocFormatter.java diff --git a/build-deps/jdk-compiler/src/main/java/javac/internal/shellsupport/doc/JavadocHelper.java b/composite-builds/build-deps/jdk-compiler/src/main/java/javac/internal/shellsupport/doc/JavadocHelper.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/javac/internal/shellsupport/doc/JavadocHelper.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/javac/internal/shellsupport/doc/JavadocHelper.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/AttributeTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/AttributeTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/AttributeTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/AttributeTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/AuthorTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/AuthorTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/AuthorTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/AuthorTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/BlockTagTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/BlockTagTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/BlockTagTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/BlockTagTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/CommentTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/CommentTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/CommentTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/CommentTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DeprecatedTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DeprecatedTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DeprecatedTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DeprecatedTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DocCommentTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DocCommentTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DocCommentTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DocCommentTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DocRootTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DocRootTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DocRootTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DocRootTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DocTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DocTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DocTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DocTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DocTreeVisitor.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DocTreeVisitor.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DocTreeVisitor.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DocTreeVisitor.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DocTypeTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DocTypeTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DocTypeTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/DocTypeTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/EndElementTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/EndElementTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/EndElementTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/EndElementTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/EntityTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/EntityTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/EntityTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/EntityTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ErroneousTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ErroneousTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ErroneousTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ErroneousTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/HiddenTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/HiddenTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/HiddenTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/HiddenTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/IdentifierTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/IdentifierTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/IdentifierTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/IdentifierTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/IndexTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/IndexTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/IndexTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/IndexTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/InheritDocTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/InheritDocTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/InheritDocTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/InheritDocTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/InlineTagTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/InlineTagTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/InlineTagTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/InlineTagTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/LinkTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/LinkTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/LinkTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/LinkTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/LiteralTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/LiteralTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/LiteralTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/LiteralTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ParamTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ParamTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ParamTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ParamTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ProvidesTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ProvidesTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ProvidesTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ProvidesTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ReferenceTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ReferenceTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ReferenceTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ReferenceTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ReturnTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ReturnTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ReturnTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ReturnTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SeeTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SeeTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SeeTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SeeTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SerialDataTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SerialDataTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SerialDataTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SerialDataTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SerialFieldTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SerialFieldTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SerialFieldTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SerialFieldTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SerialTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SerialTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SerialTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SerialTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SinceTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SinceTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SinceTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SinceTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/StartElementTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/StartElementTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/StartElementTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/StartElementTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SummaryTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SummaryTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SummaryTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SummaryTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SystemPropertyTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SystemPropertyTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SystemPropertyTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/SystemPropertyTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/TextTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/TextTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/TextTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/TextTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ThrowsTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ThrowsTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ThrowsTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ThrowsTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/UnknownBlockTagTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/UnknownBlockTagTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/UnknownBlockTagTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/UnknownBlockTagTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/UnknownInlineTagTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/UnknownInlineTagTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/UnknownInlineTagTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/UnknownInlineTagTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/UsesTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/UsesTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/UsesTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/UsesTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ValueTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ValueTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ValueTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/ValueTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/VersionTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/VersionTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/VersionTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/VersionTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/package-info.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/package-info.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/package-info.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/doctree/package-info.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/AnnotatedTypeTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/AnnotatedTypeTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/AnnotatedTypeTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/AnnotatedTypeTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/AnnotationTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/AnnotationTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/AnnotationTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/AnnotationTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ArrayAccessTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ArrayAccessTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ArrayAccessTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ArrayAccessTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ArrayTypeTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ArrayTypeTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ArrayTypeTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ArrayTypeTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/AssertTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/AssertTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/AssertTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/AssertTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/AssignmentTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/AssignmentTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/AssignmentTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/AssignmentTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/BinaryTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/BinaryTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/BinaryTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/BinaryTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/BindingPatternTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/BindingPatternTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/BindingPatternTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/BindingPatternTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/BlockTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/BlockTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/BlockTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/BlockTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/BreakTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/BreakTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/BreakTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/BreakTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/CaseLabelTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/CaseLabelTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/CaseLabelTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/CaseLabelTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/CaseTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/CaseTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/CaseTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/CaseTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/CatchTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/CatchTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/CatchTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/CatchTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ClassTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ClassTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ClassTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ClassTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/CompilationUnitTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/CompilationUnitTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/CompilationUnitTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/CompilationUnitTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/CompoundAssignmentTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/CompoundAssignmentTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/CompoundAssignmentTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/CompoundAssignmentTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ConditionalExpressionTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ConditionalExpressionTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ConditionalExpressionTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ConditionalExpressionTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ContinueTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ContinueTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ContinueTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ContinueTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/DefaultCaseLabelTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/DefaultCaseLabelTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/DefaultCaseLabelTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/DefaultCaseLabelTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/DirectiveTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/DirectiveTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/DirectiveTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/DirectiveTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/DoWhileLoopTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/DoWhileLoopTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/DoWhileLoopTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/DoWhileLoopTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/EmptyStatementTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/EmptyStatementTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/EmptyStatementTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/EmptyStatementTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/EnhancedForLoopTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/EnhancedForLoopTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/EnhancedForLoopTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/EnhancedForLoopTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ErroneousTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ErroneousTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ErroneousTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ErroneousTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ExportsTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ExportsTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ExportsTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ExportsTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ExpressionStatementTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ExpressionStatementTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ExpressionStatementTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ExpressionStatementTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ExpressionTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ExpressionTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ExpressionTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ExpressionTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ForLoopTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ForLoopTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ForLoopTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ForLoopTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/GuardedPatternTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/GuardedPatternTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/GuardedPatternTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/GuardedPatternTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/IdentifierTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/IdentifierTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/IdentifierTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/IdentifierTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/IfTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/IfTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/IfTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/IfTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ImportTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ImportTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ImportTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ImportTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/InstanceOfTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/InstanceOfTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/InstanceOfTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/InstanceOfTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/IntersectionTypeTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/IntersectionTypeTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/IntersectionTypeTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/IntersectionTypeTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/LabeledStatementTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/LabeledStatementTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/LabeledStatementTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/LabeledStatementTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/LambdaExpressionTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/LambdaExpressionTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/LambdaExpressionTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/LambdaExpressionTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/LineMap.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/LineMap.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/LineMap.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/LineMap.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/LiteralTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/LiteralTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/LiteralTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/LiteralTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/MemberReferenceTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/MemberReferenceTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/MemberReferenceTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/MemberReferenceTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/MemberSelectTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/MemberSelectTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/MemberSelectTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/MemberSelectTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/MethodInvocationTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/MethodInvocationTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/MethodInvocationTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/MethodInvocationTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/MethodTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/MethodTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/MethodTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/MethodTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ModifiersTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ModifiersTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ModifiersTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ModifiersTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ModuleTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ModuleTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ModuleTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ModuleTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/NewArrayTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/NewArrayTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/NewArrayTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/NewArrayTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/NewClassTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/NewClassTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/NewClassTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/NewClassTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/OpensTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/OpensTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/OpensTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/OpensTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/PackageTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/PackageTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/PackageTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/PackageTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ParameterizedTypeTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ParameterizedTypeTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ParameterizedTypeTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ParameterizedTypeTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ParenthesizedPatternTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ParenthesizedPatternTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ParenthesizedPatternTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ParenthesizedPatternTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ParenthesizedTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ParenthesizedTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ParenthesizedTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ParenthesizedTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/PatternTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/PatternTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/PatternTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/PatternTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/PrimitiveTypeTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/PrimitiveTypeTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/PrimitiveTypeTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/PrimitiveTypeTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ProvidesTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ProvidesTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ProvidesTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ProvidesTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/RequiresTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/RequiresTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/RequiresTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/RequiresTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ReturnTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ReturnTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ReturnTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ReturnTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/Scope.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/Scope.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/Scope.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/Scope.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/StatementTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/StatementTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/StatementTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/StatementTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/SwitchExpressionTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/SwitchExpressionTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/SwitchExpressionTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/SwitchExpressionTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/SwitchTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/SwitchTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/SwitchTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/SwitchTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/SynchronizedTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/SynchronizedTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/SynchronizedTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/SynchronizedTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ThrowTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ThrowTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ThrowTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/ThrowTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/Tree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/Tree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/Tree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/Tree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/TreeVisitor.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/TreeVisitor.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/TreeVisitor.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/TreeVisitor.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/TryTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/TryTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/TryTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/TryTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/TypeCastTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/TypeCastTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/TypeCastTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/TypeCastTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/TypeParameterTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/TypeParameterTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/TypeParameterTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/TypeParameterTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/UnaryTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/UnaryTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/UnaryTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/UnaryTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/UnionTypeTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/UnionTypeTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/UnionTypeTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/UnionTypeTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/UsesTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/UsesTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/UsesTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/UsesTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/VariableTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/VariableTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/VariableTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/VariableTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/WhileLoopTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/WhileLoopTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/WhileLoopTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/WhileLoopTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/WildcardTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/WildcardTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/WildcardTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/WildcardTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/YieldTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/YieldTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/YieldTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/YieldTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/package-info.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/package-info.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/tree/package-info.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/tree/package-info.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocSourcePositions.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocSourcePositions.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocSourcePositions.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocSourcePositions.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocTreeFactory.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocTreeFactory.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocTreeFactory.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocTreeFactory.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocTreePath.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocTreePath.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocTreePath.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocTreePath.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocTreePathScanner.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocTreePathScanner.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocTreePathScanner.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocTreePathScanner.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocTreeScanner.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocTreeScanner.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocTreeScanner.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocTreeScanner.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocTrees.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocTrees.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocTrees.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/DocTrees.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/util/JavacTask.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/JavacTask.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/util/JavacTask.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/JavacTask.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/util/ParameterNameProvider.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/ParameterNameProvider.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/util/ParameterNameProvider.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/ParameterNameProvider.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/util/Plugin.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/Plugin.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/util/Plugin.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/Plugin.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/util/SimpleDocTreeVisitor.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/SimpleDocTreeVisitor.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/util/SimpleDocTreeVisitor.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/SimpleDocTreeVisitor.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/util/SimpleTreeVisitor.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/SimpleTreeVisitor.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/util/SimpleTreeVisitor.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/SimpleTreeVisitor.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/util/SourcePositions.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/SourcePositions.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/util/SourcePositions.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/SourcePositions.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/util/TaskEvent.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/TaskEvent.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/util/TaskEvent.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/TaskEvent.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/util/TaskListener.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/TaskListener.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/util/TaskListener.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/TaskListener.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/util/TreePath.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/TreePath.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/util/TreePath.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/TreePath.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/util/TreePathScanner.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/TreePathScanner.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/util/TreePathScanner.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/TreePathScanner.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/util/TreeScanner.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/TreeScanner.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/util/TreeScanner.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/TreeScanner.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/util/Trees.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/Trees.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/util/Trees.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/Trees.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/source/util/package-info.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/package-info.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/source/util/package-info.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/source/util/package-info.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/Checker.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/Checker.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/Checker.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/Checker.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/DocLint.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/DocLint.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/DocLint.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/DocLint.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/Entity.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/Entity.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/Entity.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/Entity.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/Env.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/Env.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/Env.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/Env.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/HtmlTag.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/HtmlTag.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/HtmlTag.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/HtmlTag.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/HtmlVersion.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/HtmlVersion.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/HtmlVersion.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/HtmlVersion.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/Messages.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/Messages.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/Messages.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/doclint/Messages.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/Main.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/Main.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/Main.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/Main.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/BasicJavacTask.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/BasicJavacTask.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/BasicJavacTask.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/BasicJavacTask.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/ClassNamesForFileOraculum.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/ClassNamesForFileOraculum.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/ClassNamesForFileOraculum.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/ClassNamesForFileOraculum.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/ClientCodeWrapper.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/ClientCodeWrapper.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/ClientCodeWrapper.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/ClientCodeWrapper.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/DiagnosticFormatter.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/DiagnosticFormatter.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/DiagnosticFormatter.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/DiagnosticFormatter.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/DuplicateClassChecker.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/DuplicateClassChecker.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/DuplicateClassChecker.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/DuplicateClassChecker.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/Entity.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/Entity.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/Entity.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/Entity.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/Formattable.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/Formattable.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/Formattable.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/Formattable.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/JavacScope.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/JavacScope.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/JavacScope.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/JavacScope.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/JavacTaskImpl.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/JavacTaskImpl.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/JavacTaskImpl.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/JavacTaskImpl.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/JavacTaskPool.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/JavacTaskPool.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/JavacTaskPool.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/JavacTaskPool.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/JavacTool.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/JavacTool.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/JavacTool.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/JavacTool.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/JavacTrees.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/JavacTrees.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/JavacTrees.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/JavacTrees.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/Messages.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/Messages.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/Messages.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/Messages.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/MultiTaskListener.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/MultiTaskListener.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/MultiTaskListener.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/MultiTaskListener.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/WrappingJavaFileManager.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/WrappingJavaFileManager.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/WrappingJavaFileManager.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/api/WrappingJavaFileManager.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/AnnoConstruct.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/AnnoConstruct.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/AnnoConstruct.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/AnnoConstruct.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Attribute.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Attribute.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Attribute.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Attribute.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/BoundKind.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/BoundKind.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/BoundKind.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/BoundKind.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/ClassFinder.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/ClassFinder.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/ClassFinder.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/ClassFinder.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/DeferredCompletionFailureHandler.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/DeferredCompletionFailureHandler.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/DeferredCompletionFailureHandler.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/DeferredCompletionFailureHandler.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/DeferredLintHandler.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/DeferredLintHandler.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/DeferredLintHandler.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/DeferredLintHandler.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Directive.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Directive.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Directive.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Directive.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Flags.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Flags.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Flags.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Flags.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Kinds.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Kinds.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Kinds.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Kinds.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Lint.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Lint.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Lint.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Lint.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/MissingInfoHandler.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/MissingInfoHandler.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/MissingInfoHandler.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/MissingInfoHandler.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/ModuleFinder.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/ModuleFinder.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/ModuleFinder.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/ModuleFinder.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Preview.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Preview.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Preview.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Preview.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Printer.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Printer.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Printer.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Printer.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Scope.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Scope.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Scope.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Scope.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Source.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Source.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Source.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Source.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Symbol.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Symbol.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Symbol.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Symbol.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/SymbolMetadata.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/SymbolMetadata.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/SymbolMetadata.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/SymbolMetadata.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Symtab.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Symtab.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Symtab.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Symtab.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/TargetType.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/TargetType.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/TargetType.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/TargetType.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Type.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Type.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Type.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Type.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/TypeAnnotationPosition.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/TypeAnnotationPosition.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/TypeAnnotationPosition.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/TypeAnnotationPosition.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/TypeAnnotations.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/TypeAnnotations.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/TypeAnnotations.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/TypeAnnotations.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/TypeMetadata.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/TypeMetadata.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/TypeMetadata.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/TypeMetadata.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/TypeTag.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/TypeTag.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/TypeTag.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/TypeTag.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Types.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Types.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Types.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/code/Types.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Analyzer.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Analyzer.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Analyzer.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Analyzer.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Annotate.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Annotate.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Annotate.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Annotate.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/ArgumentAttr.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/ArgumentAttr.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/ArgumentAttr.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/ArgumentAttr.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Attr.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Attr.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Attr.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Attr.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/AttrContext.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/AttrContext.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/AttrContext.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/AttrContext.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/AttrContextEnv.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/AttrContextEnv.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/AttrContextEnv.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/AttrContextEnv.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/AttrRecover.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/AttrRecover.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/AttrRecover.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/AttrRecover.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Check.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Check.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Check.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Check.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/CompileStates.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/CompileStates.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/CompileStates.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/CompileStates.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/ConstFold.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/ConstFold.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/ConstFold.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/ConstFold.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/DeferredAttr.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/DeferredAttr.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/DeferredAttr.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/DeferredAttr.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Enter.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Enter.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Enter.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Enter.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Env.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Env.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Env.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Env.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Flow.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Flow.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Flow.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Flow.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Infer.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Infer.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Infer.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Infer.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/InferenceContext.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/InferenceContext.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/InferenceContext.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/InferenceContext.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/LambdaToMethod.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/LambdaToMethod.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/LambdaToMethod.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/LambdaToMethod.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Lower.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Lower.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Lower.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Lower.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/MatchBindingsComputer.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/MatchBindingsComputer.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/MatchBindingsComputer.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/MatchBindingsComputer.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/MemberEnter.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/MemberEnter.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/MemberEnter.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/MemberEnter.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Modules.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Modules.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Modules.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Modules.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Operators.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Operators.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Operators.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Operators.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Repair.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Repair.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Repair.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Repair.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Resolve.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Resolve.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Resolve.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Resolve.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Todo.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Todo.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Todo.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/Todo.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TransPatterns.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TransPatterns.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TransPatterns.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TransPatterns.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TransTypes.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TransTypes.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TransTypes.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TransTypes.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TreeDiffer.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TreeDiffer.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TreeDiffer.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TreeDiffer.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TreeHasher.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TreeHasher.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TreeHasher.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TreeHasher.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TypeEnter.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TypeEnter.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TypeEnter.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TypeEnter.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TypeEnvs.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TypeEnvs.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TypeEnvs.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/comp/TypeEnvs.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/BaseFileManager.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/BaseFileManager.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/BaseFileManager.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/BaseFileManager.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/CacheFSInfo.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/CacheFSInfo.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/CacheFSInfo.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/CacheFSInfo.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/FSInfo.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/FSInfo.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/FSInfo.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/FSInfo.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/JRTIndex.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/JRTIndex.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/JRTIndex.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/JRTIndex.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/JavacFileManager.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/JavacFileManager.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/JavacFileManager.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/JavacFileManager.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/Locations.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/Locations.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/Locations.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/Locations.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/PathFileObject.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/PathFileObject.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/PathFileObject.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/PathFileObject.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/RelativePath.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/RelativePath.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/RelativePath.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/file/RelativePath.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/ByteCodes.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/ByteCodes.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/ByteCodes.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/ByteCodes.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/CRTFlags.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/CRTFlags.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/CRTFlags.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/CRTFlags.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/CRTable.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/CRTable.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/CRTable.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/CRTable.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/ClassFile.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/ClassFile.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/ClassFile.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/ClassFile.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/ClassReader.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/ClassReader.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/ClassReader.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/ClassReader.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/ClassWriter.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/ClassWriter.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/ClassWriter.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/ClassWriter.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/Code.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/Code.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/Code.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/Code.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/Gen.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/Gen.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/Gen.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/Gen.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/Items.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/Items.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/Items.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/Items.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/JNIWriter.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/JNIWriter.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/JNIWriter.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/JNIWriter.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/ModuleNameReader.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/ModuleNameReader.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/ModuleNameReader.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/ModuleNameReader.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/PoolConstant.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/PoolConstant.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/PoolConstant.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/PoolConstant.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/PoolReader.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/PoolReader.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/PoolReader.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/PoolReader.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/PoolWriter.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/PoolWriter.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/PoolWriter.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/PoolWriter.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/Profile.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/Profile.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/Profile.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/Profile.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/StringConcat.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/StringConcat.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/StringConcat.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/StringConcat.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/Target.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/Target.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/Target.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/Target.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/UninitializedType.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/UninitializedType.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/UninitializedType.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/jvm/UninitializedType.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/launcher/Main.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/launcher/Main.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/launcher/Main.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/launcher/Main.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/Arguments.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/Arguments.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/Arguments.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/Arguments.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/CommandLine.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/CommandLine.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/CommandLine.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/CommandLine.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/DelegatingJavaFileManager.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/DelegatingJavaFileManager.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/DelegatingJavaFileManager.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/DelegatingJavaFileManager.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/JavaCompiler.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/JavaCompiler.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/JavaCompiler.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/JavaCompiler.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/JavacToolProvider.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/JavacToolProvider.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/JavacToolProvider.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/JavacToolProvider.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/Main.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/Main.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/Main.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/Main.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/Option.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/Option.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/Option.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/Option.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/OptionHelper.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/OptionHelper.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/OptionHelper.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/main/OptionHelper.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/AnnotationProxyMaker.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/AnnotationProxyMaker.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/AnnotationProxyMaker.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/AnnotationProxyMaker.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/FilteredMemberList.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/FilteredMemberList.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/FilteredMemberList.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/FilteredMemberList.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/JavacElements.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/JavacElements.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/JavacElements.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/JavacElements.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/JavacTypes.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/JavacTypes.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/JavacTypes.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/JavacTypes.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/LazyTreeLoader.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/LazyTreeLoader.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/LazyTreeLoader.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/model/LazyTreeLoader.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/package-info.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/package-info.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/package-info.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/package-info.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/DocCommentParser.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/DocCommentParser.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/DocCommentParser.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/DocCommentParser.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/JavaTokenizer.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/JavaTokenizer.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/JavaTokenizer.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/JavaTokenizer.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/JavacParser.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/JavacParser.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/JavacParser.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/JavacParser.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/JavadocTokenizer.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/JavadocTokenizer.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/JavadocTokenizer.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/JavadocTokenizer.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/LazyDocCommentTable.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/LazyDocCommentTable.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/LazyDocCommentTable.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/LazyDocCommentTable.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/Lexer.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/Lexer.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/Lexer.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/Lexer.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/Parser.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/Parser.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/Parser.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/Parser.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/ParserFactory.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/ParserFactory.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/ParserFactory.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/ParserFactory.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/ReferenceParser.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/ReferenceParser.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/ReferenceParser.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/ReferenceParser.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/Scanner.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/Scanner.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/Scanner.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/Scanner.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/ScannerFactory.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/ScannerFactory.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/ScannerFactory.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/ScannerFactory.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/TextBlockSupport.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/TextBlockSupport.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/TextBlockSupport.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/TextBlockSupport.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/Tokens.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/Tokens.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/Tokens.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/Tokens.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/UnicodeReader.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/UnicodeReader.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/UnicodeReader.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/parser/UnicodeReader.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/platform/JDKPlatformProvider.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/platform/JDKPlatformProvider.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/platform/JDKPlatformProvider.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/platform/JDKPlatformProvider.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/platform/PlatformDescription.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/platform/PlatformDescription.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/platform/PlatformDescription.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/platform/PlatformDescription.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/platform/PlatformProvider.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/platform/PlatformProvider.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/platform/PlatformProvider.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/platform/PlatformProvider.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/platform/PlatformUtils.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/platform/PlatformUtils.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/platform/PlatformUtils.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/platform/PlatformUtils.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/platform/package-info.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/platform/package-info.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/platform/package-info.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/platform/package-info.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/AnnotationProcessingError.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/AnnotationProcessingError.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/AnnotationProcessingError.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/AnnotationProcessingError.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/JavacFiler.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/JavacFiler.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/JavacFiler.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/JavacFiler.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/JavacMessager.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/JavacMessager.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/JavacMessager.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/JavacMessager.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/JavacProcessingEnvironment.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/JavacProcessingEnvironment.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/JavacProcessingEnvironment.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/JavacProcessingEnvironment.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/JavacRoundEnvironment.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/JavacRoundEnvironment.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/JavacRoundEnvironment.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/JavacRoundEnvironment.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/PrintingProcessor.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/PrintingProcessor.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/PrintingProcessor.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/PrintingProcessor.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/ServiceProxy.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/ServiceProxy.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/ServiceProxy.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/processing/ServiceProxy.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/resources/version.properties-template b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/resources/version.properties-template similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/resources/version.properties-template rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/resources/version.properties-template diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/DCTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/DCTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/DCTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/DCTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/DocCommentTable.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/DocCommentTable.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/DocCommentTable.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/DocCommentTable.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/DocPretty.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/DocPretty.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/DocPretty.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/DocPretty.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/DocTreeMaker.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/DocTreeMaker.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/DocTreeMaker.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/DocTreeMaker.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/EndPosTable.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/EndPosTable.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/EndPosTable.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/EndPosTable.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/JCTree.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/JCTree.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/JCTree.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/JCTree.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/Pretty.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/Pretty.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/Pretty.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/Pretty.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/TreeCopier.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/TreeCopier.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/TreeCopier.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/TreeCopier.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/TreeInfo.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/TreeInfo.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/TreeInfo.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/TreeInfo.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/TreeMaker.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/TreeMaker.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/TreeMaker.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/TreeMaker.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/TreeScanner.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/TreeScanner.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/TreeScanner.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/TreeScanner.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/TreeTranslator.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/TreeTranslator.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/TreeTranslator.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/tree/TreeTranslator.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Abort.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Abort.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Abort.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Abort.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/AbstractDiagnosticFormatter.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/AbstractDiagnosticFormatter.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/AbstractDiagnosticFormatter.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/AbstractDiagnosticFormatter.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/AbstractLog.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/AbstractLog.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/AbstractLog.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/AbstractLog.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ArrayUtils.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ArrayUtils.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ArrayUtils.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ArrayUtils.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Assert.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Assert.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Assert.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Assert.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/BasicDiagnosticFormatter.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/BasicDiagnosticFormatter.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/BasicDiagnosticFormatter.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/BasicDiagnosticFormatter.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Bits.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Bits.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Bits.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Bits.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ByteBuffer.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ByteBuffer.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ByteBuffer.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ByteBuffer.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ClientCodeException.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ClientCodeException.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ClientCodeException.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ClientCodeException.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Constants.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Constants.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Constants.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Constants.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Context.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Context.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Context.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Context.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Convert.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Convert.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Convert.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Convert.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/CouplingAbort.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/CouplingAbort.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/CouplingAbort.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/CouplingAbort.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/DefinedBy.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/DefinedBy.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/DefinedBy.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/DefinedBy.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Dependencies.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Dependencies.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Dependencies.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Dependencies.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/DiagnosticSource.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/DiagnosticSource.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/DiagnosticSource.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/DiagnosticSource.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/FatalError.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/FatalError.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/FatalError.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/FatalError.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Filter.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Filter.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Filter.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Filter.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ForwardingDiagnosticFormatter.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ForwardingDiagnosticFormatter.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ForwardingDiagnosticFormatter.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ForwardingDiagnosticFormatter.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/GraphUtils.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/GraphUtils.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/GraphUtils.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/GraphUtils.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/IntHashTable.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/IntHashTable.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/IntHashTable.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/IntHashTable.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Iterators.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Iterators.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Iterators.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Iterators.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/JCDiagnostic.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/JCDiagnostic.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/JCDiagnostic.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/JCDiagnostic.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/JavacMessages.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/JavacMessages.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/JavacMessages.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/JavacMessages.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/LayoutCharacters.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/LayoutCharacters.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/LayoutCharacters.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/LayoutCharacters.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/List.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/List.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/List.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/List.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ListBuffer.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ListBuffer.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ListBuffer.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ListBuffer.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Log.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Log.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Log.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Log.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/MandatoryWarningHandler.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/MandatoryWarningHandler.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/MandatoryWarningHandler.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/MandatoryWarningHandler.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/MatchingUtils.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/MatchingUtils.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/MatchingUtils.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/MatchingUtils.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/MemoryLowAbort.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/MemoryLowAbort.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/MemoryLowAbort.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/MemoryLowAbort.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/MissingPlatformError.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/MissingPlatformError.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/MissingPlatformError.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/MissingPlatformError.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ModuleHelper.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ModuleHelper.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ModuleHelper.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/ModuleHelper.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Name.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Name.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Name.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Name.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Names.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Names.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Names.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Names.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Options.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Options.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Options.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Options.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Pair.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Pair.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Pair.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Pair.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/PlatformUtils.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/PlatformUtils.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/PlatformUtils.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/PlatformUtils.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Position.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Position.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Position.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Position.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/PropagatedException.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/PropagatedException.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/PropagatedException.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/PropagatedException.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/RawDiagnosticFormatter.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/RawDiagnosticFormatter.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/RawDiagnosticFormatter.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/RawDiagnosticFormatter.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/RichDiagnosticFormatter.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/RichDiagnosticFormatter.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/RichDiagnosticFormatter.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/RichDiagnosticFormatter.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/SharedNameTable.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/SharedNameTable.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/SharedNameTable.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/SharedNameTable.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/StringUtils.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/StringUtils.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/StringUtils.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/StringUtils.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/UnsharedNameTable.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/UnsharedNameTable.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/UnsharedNameTable.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/UnsharedNameTable.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Warner.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Warner.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Warner.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/javac/util/Warner.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/AutoFlushWriter.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/AutoFlushWriter.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/AutoFlushWriter.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/AutoFlushWriter.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/BuildState.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/BuildState.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/BuildState.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/BuildState.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/CleanProperties.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/CleanProperties.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/CleanProperties.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/CleanProperties.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/CompileChunk.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/CompileChunk.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/CompileChunk.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/CompileChunk.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/CompileJavaPackages.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/CompileJavaPackages.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/CompileJavaPackages.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/CompileJavaPackages.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/CompileProperties.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/CompileProperties.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/CompileProperties.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/CompileProperties.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/CopyFile.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/CopyFile.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/CopyFile.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/CopyFile.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/JavacState.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/JavacState.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/JavacState.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/JavacState.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Log.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Log.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Log.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Log.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Main.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Main.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Main.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Main.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Module.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Module.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Module.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Module.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Package.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Package.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Package.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Package.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/ProblemException.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/ProblemException.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/ProblemException.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/ProblemException.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/PubApiExtractor.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/PubApiExtractor.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/PubApiExtractor.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/PubApiExtractor.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Source.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Source.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Source.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Source.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Transformer.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Transformer.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Transformer.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Transformer.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Util.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Util.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Util.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/Util.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/client/ClientMain.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/client/ClientMain.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/client/ClientMain.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/client/ClientMain.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/client/PortFileInaccessibleException.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/client/PortFileInaccessibleException.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/client/PortFileInaccessibleException.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/client/PortFileInaccessibleException.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/client/SjavacClient.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/client/SjavacClient.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/client/SjavacClient.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/client/SjavacClient.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/CompilationService.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/CompilationService.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/CompilationService.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/CompilationService.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/FileObjectWithLocation.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/FileObjectWithLocation.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/FileObjectWithLocation.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/FileObjectWithLocation.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/JavaFileObjectWithLocation.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/JavaFileObjectWithLocation.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/JavaFileObjectWithLocation.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/JavaFileObjectWithLocation.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/PathAndPackageVerifier.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/PathAndPackageVerifier.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/PathAndPackageVerifier.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/PathAndPackageVerifier.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/PooledSjavac.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/PooledSjavac.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/PooledSjavac.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/PooledSjavac.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/PubAPIs.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/PubAPIs.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/PubAPIs.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/PubAPIs.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/PubapiVisitor.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/PubapiVisitor.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/PubapiVisitor.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/PubapiVisitor.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/SjavacImpl.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/SjavacImpl.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/SjavacImpl.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/SjavacImpl.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/SmartFileManager.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/SmartFileManager.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/SmartFileManager.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/SmartFileManager.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/SmartFileObject.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/SmartFileObject.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/SmartFileObject.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/SmartFileObject.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/SmartWriter.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/SmartWriter.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/SmartWriter.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/SmartWriter.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/dependencies/NewDependencyCollector.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/dependencies/NewDependencyCollector.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/dependencies/NewDependencyCollector.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/dependencies/NewDependencyCollector.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/dependencies/PublicApiCollector.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/dependencies/PublicApiCollector.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/dependencies/PublicApiCollector.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/comp/dependencies/PublicApiCollector.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/options/ArgumentIterator.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/options/ArgumentIterator.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/options/ArgumentIterator.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/options/ArgumentIterator.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/options/Option.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/options/Option.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/options/Option.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/options/Option.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/options/OptionHelper.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/options/OptionHelper.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/options/OptionHelper.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/options/OptionHelper.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/options/Options.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/options/Options.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/options/Options.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/options/Options.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/options/SourceLocation.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/options/SourceLocation.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/options/SourceLocation.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/options/SourceLocation.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/ArrayTypeDesc.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/ArrayTypeDesc.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/ArrayTypeDesc.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/ArrayTypeDesc.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PrimitiveTypeDesc.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PrimitiveTypeDesc.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PrimitiveTypeDesc.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PrimitiveTypeDesc.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PubApi.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PubApi.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PubApi.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PubApi.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PubApiTypeParam.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PubApiTypeParam.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PubApiTypeParam.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PubApiTypeParam.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PubMethod.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PubMethod.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PubMethod.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PubMethod.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PubType.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PubType.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PubType.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PubType.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PubVar.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PubVar.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PubVar.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/PubVar.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/ReferenceTypeDesc.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/ReferenceTypeDesc.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/ReferenceTypeDesc.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/ReferenceTypeDesc.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/TypeDesc.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/TypeDesc.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/TypeDesc.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/TypeDesc.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/TypeVarTypeDesc.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/TypeVarTypeDesc.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/TypeVarTypeDesc.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/pubapi/TypeVarTypeDesc.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/CompilationSubResult.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/CompilationSubResult.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/CompilationSubResult.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/CompilationSubResult.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/IdleResetSjavac.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/IdleResetSjavac.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/IdleResetSjavac.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/IdleResetSjavac.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/PortFile.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/PortFile.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/PortFile.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/PortFile.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/PortFileMonitor.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/PortFileMonitor.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/PortFileMonitor.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/PortFileMonitor.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/RequestHandler.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/RequestHandler.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/RequestHandler.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/RequestHandler.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/ServerMain.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/ServerMain.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/ServerMain.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/ServerMain.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/Sjavac.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/Sjavac.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/Sjavac.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/Sjavac.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/SjavacServer.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/SjavacServer.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/SjavacServer.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/SjavacServer.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/SysInfo.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/SysInfo.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/SysInfo.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/SysInfo.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/Terminable.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/Terminable.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/Terminable.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/Terminable.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/log/LazyInitFileLog.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/log/LazyInitFileLog.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/log/LazyInitFileLog.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/log/LazyInitFileLog.java diff --git a/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/log/LoggingOutputStream.java b/composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/log/LoggingOutputStream.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/log/LoggingOutputStream.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/openjdk/tools/sjavac/server/log/LoggingOutputStream.java diff --git a/build-deps/jdk-compiler/src/main/java/sun/tools/serialver/SerialVer.java b/composite-builds/build-deps/jdk-compiler/src/main/java/sun/tools/serialver/SerialVer.java similarity index 100% rename from build-deps/jdk-compiler/src/main/java/sun/tools/serialver/SerialVer.java rename to composite-builds/build-deps/jdk-compiler/src/main/java/sun/tools/serialver/SerialVer.java diff --git a/build-deps/jdk-compiler/src/main/resources/javac/internal/shellsupport/doc/resources/javadocformatter.properties b/composite-builds/build-deps/jdk-compiler/src/main/resources/javac/internal/shellsupport/doc/resources/javadocformatter.properties similarity index 100% rename from build-deps/jdk-compiler/src/main/resources/javac/internal/shellsupport/doc/resources/javadocformatter.properties rename to composite-builds/build-deps/jdk-compiler/src/main/resources/javac/internal/shellsupport/doc/resources/javadocformatter.properties diff --git a/build-deps/jdk-compiler/src/main/resources/openjdk/tools/doclint/resources/doclint.properties b/composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/doclint/resources/doclint.properties similarity index 100% rename from build-deps/jdk-compiler/src/main/resources/openjdk/tools/doclint/resources/doclint.properties rename to composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/doclint/resources/doclint.properties diff --git a/build-deps/jdk-compiler/src/main/resources/openjdk/tools/doclint/resources/doclint_ja.properties b/composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/doclint/resources/doclint_ja.properties similarity index 100% rename from build-deps/jdk-compiler/src/main/resources/openjdk/tools/doclint/resources/doclint_ja.properties rename to composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/doclint/resources/doclint_ja.properties diff --git a/build-deps/jdk-compiler/src/main/resources/openjdk/tools/doclint/resources/doclint_zh_CN.properties b/composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/doclint/resources/doclint_zh_CN.properties similarity index 100% rename from build-deps/jdk-compiler/src/main/resources/openjdk/tools/doclint/resources/doclint_zh_CN.properties rename to composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/doclint/resources/doclint_zh_CN.properties diff --git a/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/compiler.properties b/composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/compiler.properties similarity index 100% rename from build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/compiler.properties rename to composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/compiler.properties diff --git a/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/compiler_ja.properties b/composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/compiler_ja.properties similarity index 100% rename from build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/compiler_ja.properties rename to composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/compiler_ja.properties diff --git a/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/compiler_zh_CN.properties b/composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/compiler_zh_CN.properties similarity index 100% rename from build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/compiler_zh_CN.properties rename to composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/compiler_zh_CN.properties diff --git a/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/ct.properties b/composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/ct.properties similarity index 100% rename from build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/ct.properties rename to composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/ct.properties diff --git a/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/javac.properties b/composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/javac.properties similarity index 100% rename from build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/javac.properties rename to composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/javac.properties diff --git a/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/javac_ja.properties b/composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/javac_ja.properties similarity index 100% rename from build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/javac_ja.properties rename to composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/javac_ja.properties diff --git a/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/javac_zh_CN.properties b/composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/javac_zh_CN.properties similarity index 100% rename from build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/javac_zh_CN.properties rename to composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/javac_zh_CN.properties diff --git a/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/launcher.properties b/composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/launcher.properties similarity index 100% rename from build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/launcher.properties rename to composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/launcher.properties diff --git a/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/launcher_ja.properties b/composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/launcher_ja.properties similarity index 100% rename from build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/launcher_ja.properties rename to composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/launcher_ja.properties diff --git a/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/launcher_zh_CN.properties b/composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/launcher_zh_CN.properties similarity index 100% rename from build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/launcher_zh_CN.properties rename to composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/launcher_zh_CN.properties diff --git a/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/legacy.properties b/composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/legacy.properties similarity index 100% rename from build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/legacy.properties rename to composite-builds/build-deps/jdk-compiler/src/main/resources/openjdk/tools/javac/resources/legacy.properties diff --git a/build-deps/jdk-compiler/src/main/resources/sun/tools/serialver/resources/serialver.properties b/composite-builds/build-deps/jdk-compiler/src/main/resources/sun/tools/serialver/resources/serialver.properties similarity index 100% rename from build-deps/jdk-compiler/src/main/resources/sun/tools/serialver/resources/serialver.properties rename to composite-builds/build-deps/jdk-compiler/src/main/resources/sun/tools/serialver/resources/serialver.properties diff --git a/build-deps/jdk-compiler/src/main/resources/sun/tools/serialver/resources/serialver_ja.properties b/composite-builds/build-deps/jdk-compiler/src/main/resources/sun/tools/serialver/resources/serialver_ja.properties similarity index 100% rename from build-deps/jdk-compiler/src/main/resources/sun/tools/serialver/resources/serialver_ja.properties rename to composite-builds/build-deps/jdk-compiler/src/main/resources/sun/tools/serialver/resources/serialver_ja.properties diff --git a/build-deps/jdk-compiler/src/main/resources/sun/tools/serialver/resources/serialver_zh_CN.properties b/composite-builds/build-deps/jdk-compiler/src/main/resources/sun/tools/serialver/resources/serialver_zh_CN.properties similarity index 100% rename from build-deps/jdk-compiler/src/main/resources/sun/tools/serialver/resources/serialver_zh_CN.properties rename to composite-builds/build-deps/jdk-compiler/src/main/resources/sun/tools/serialver/resources/serialver_zh_CN.properties diff --git a/build-deps/jdt/.gitignore b/composite-builds/build-deps/jdk-jdeps/.gitignore similarity index 100% rename from build-deps/jdt/.gitignore rename to composite-builds/build-deps/jdk-jdeps/.gitignore diff --git a/build-deps/jdk-jdeps/build.gradle.kts b/composite-builds/build-deps/jdk-jdeps/build.gradle.kts similarity index 100% rename from build-deps/jdk-jdeps/build.gradle.kts rename to composite-builds/build-deps/jdk-jdeps/build.gradle.kts diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/AccessFlags.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/AccessFlags.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/AccessFlags.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/AccessFlags.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Annotation.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Annotation.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Annotation.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Annotation.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/AnnotationDefault_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/AnnotationDefault_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/AnnotationDefault_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/AnnotationDefault_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/AttributeException.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/AttributeException.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/AttributeException.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/AttributeException.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Attributes.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Attributes.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Attributes.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Attributes.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/BootstrapMethods_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/BootstrapMethods_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/BootstrapMethods_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/BootstrapMethods_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/CharacterRangeTable_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/CharacterRangeTable_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/CharacterRangeTable_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/CharacterRangeTable_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ClassFile.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ClassFile.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ClassFile.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ClassFile.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ClassReader.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ClassReader.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ClassReader.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ClassReader.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ClassTranslator.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ClassTranslator.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ClassTranslator.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ClassTranslator.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ClassWriter.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ClassWriter.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ClassWriter.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ClassWriter.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Code_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Code_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Code_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Code_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/CompilationID_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/CompilationID_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/CompilationID_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/CompilationID_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ConstantPool.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ConstantPool.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ConstantPool.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ConstantPool.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ConstantPoolException.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ConstantPoolException.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ConstantPoolException.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ConstantPoolException.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ConstantValue_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ConstantValue_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ConstantValue_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ConstantValue_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/DefaultAttribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/DefaultAttribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/DefaultAttribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/DefaultAttribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Dependencies.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Dependencies.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Dependencies.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Dependencies.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Dependency.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Dependency.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Dependency.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Dependency.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Deprecated_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Deprecated_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Deprecated_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Deprecated_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Descriptor.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Descriptor.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Descriptor.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Descriptor.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/DescriptorException.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/DescriptorException.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/DescriptorException.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/DescriptorException.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/EnclosingMethod_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/EnclosingMethod_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/EnclosingMethod_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/EnclosingMethod_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Exceptions_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Exceptions_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Exceptions_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Exceptions_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/FatalError.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/FatalError.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/FatalError.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/FatalError.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Field.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Field.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Field.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Field.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/InnerClasses_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/InnerClasses_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/InnerClasses_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/InnerClasses_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Instruction.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Instruction.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Instruction.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Instruction.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/LineNumberTable_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/LineNumberTable_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/LineNumberTable_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/LineNumberTable_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/LocalVariableTable_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/LocalVariableTable_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/LocalVariableTable_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/LocalVariableTable_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/LocalVariableTypeTable_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/LocalVariableTypeTable_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/LocalVariableTypeTable_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/LocalVariableTypeTable_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Method.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Method.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Method.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Method.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/MethodParameters_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/MethodParameters_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/MethodParameters_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/MethodParameters_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ModuleHashes_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ModuleHashes_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ModuleHashes_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ModuleHashes_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ModuleMainClass_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ModuleMainClass_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ModuleMainClass_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ModuleMainClass_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ModulePackages_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ModulePackages_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ModulePackages_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ModulePackages_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ModuleResolution_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ModuleResolution_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ModuleResolution_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ModuleResolution_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ModuleTarget_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ModuleTarget_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ModuleTarget_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ModuleTarget_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Module_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Module_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Module_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Module_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/NestHost_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/NestHost_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/NestHost_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/NestHost_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/NestMembers_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/NestMembers_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/NestMembers_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/NestMembers_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Opcode.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Opcode.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Opcode.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Opcode.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/PermittedSubclasses_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/PermittedSubclasses_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/PermittedSubclasses_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/PermittedSubclasses_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Record_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Record_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Record_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Record_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ReferenceFinder.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ReferenceFinder.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ReferenceFinder.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/ReferenceFinder.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeAnnotations_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeAnnotations_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeAnnotations_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeAnnotations_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeInvisibleAnnotations_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeInvisibleAnnotations_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeInvisibleAnnotations_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeInvisibleAnnotations_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeInvisibleParameterAnnotations_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeParameterAnnotations_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeParameterAnnotations_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeParameterAnnotations_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeParameterAnnotations_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeTypeAnnotations_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeTypeAnnotations_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeTypeAnnotations_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeTypeAnnotations_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeVisibleAnnotations_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeVisibleAnnotations_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeVisibleAnnotations_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeVisibleAnnotations_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeVisibleParameterAnnotations_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Signature.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Signature.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Signature.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Signature.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Signature_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Signature_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Signature_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Signature_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/SourceDebugExtension_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/SourceDebugExtension_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/SourceDebugExtension_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/SourceDebugExtension_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/SourceFile_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/SourceFile_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/SourceFile_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/SourceFile_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/SourceID_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/SourceID_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/SourceID_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/SourceID_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/StackMapTable_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/StackMapTable_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/StackMapTable_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/StackMapTable_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/StackMap_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/StackMap_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/StackMap_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/StackMap_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Synthetic_attribute.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Synthetic_attribute.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Synthetic_attribute.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Synthetic_attribute.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Type.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Type.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Type.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/Type.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/TypeAnnotation.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/TypeAnnotation.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/TypeAnnotation.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/TypeAnnotation.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/package-info.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/package-info.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/package-info.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/classfile/package-info.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/AnnotationWriter.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/AnnotationWriter.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/AnnotationWriter.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/AnnotationWriter.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/AttributeWriter.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/AttributeWriter.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/AttributeWriter.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/AttributeWriter.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/BasicWriter.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/BasicWriter.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/BasicWriter.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/BasicWriter.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/ClassWriter.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/ClassWriter.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/ClassWriter.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/ClassWriter.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/CodeWriter.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/CodeWriter.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/CodeWriter.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/CodeWriter.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/ConstantWriter.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/ConstantWriter.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/ConstantWriter.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/ConstantWriter.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/Context.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/Context.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/Context.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/Context.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/DisassemblerTool.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/DisassemblerTool.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/DisassemblerTool.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/DisassemblerTool.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/InstructionDetailWriter.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/InstructionDetailWriter.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/InstructionDetailWriter.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/InstructionDetailWriter.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/InternalError.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/InternalError.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/InternalError.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/InternalError.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/JavapFileManager.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/JavapFileManager.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/JavapFileManager.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/JavapFileManager.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/JavapTask.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/JavapTask.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/JavapTask.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/JavapTask.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/LocalVariableTableWriter.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/LocalVariableTableWriter.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/LocalVariableTableWriter.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/LocalVariableTableWriter.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/LocalVariableTypeTableWriter.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/LocalVariableTypeTableWriter.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/LocalVariableTypeTableWriter.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/LocalVariableTypeTableWriter.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/Main.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/Main.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/Main.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/Main.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/Messages.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/Messages.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/Messages.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/Messages.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/Options.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/Options.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/Options.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/Options.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/SourceWriter.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/SourceWriter.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/SourceWriter.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/SourceWriter.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/StackMapWriter.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/StackMapWriter.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/StackMapWriter.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/StackMapWriter.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/TryBlockWriter.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/TryBlockWriter.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/TryBlockWriter.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/TryBlockWriter.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/TypeAnnotationWriter.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/TypeAnnotationWriter.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/TypeAnnotationWriter.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/TypeAnnotationWriter.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/package-info.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/package-info.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/package-info.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/package-info.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/resources/version.properties-template b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/resources/version.properties-template similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/resources/version.properties-template rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/javap/resources/version.properties-template diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/CSV.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/CSV.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/CSV.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/CSV.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/CSVParseException.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/CSVParseException.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/CSVParseException.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/CSVParseException.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/DeprDB.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/DeprDB.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/DeprDB.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/DeprDB.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/DeprData.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/DeprData.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/DeprData.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/DeprData.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/LoadProc.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/LoadProc.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/LoadProc.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/LoadProc.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/Main.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/Main.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/Main.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/Main.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/Messages.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/Messages.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/Messages.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/Messages.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/Pretty.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/Pretty.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/Pretty.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/Pretty.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/TraverseProc.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/TraverseProc.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/TraverseProc.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/TraverseProc.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/internals.md b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/internals.md similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/internals.md rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/internals.md diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/readme.md b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/readme.md similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/readme.md rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/readme.md diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/scan/CPEntries.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/scan/CPEntries.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/scan/CPEntries.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/scan/CPEntries.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/scan/CPSelector.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/scan/CPSelector.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/scan/CPSelector.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/scan/CPSelector.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/scan/ClassFinder.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/scan/ClassFinder.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/scan/ClassFinder.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/scan/ClassFinder.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/scan/MethodSig.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/scan/MethodSig.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/scan/MethodSig.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/scan/MethodSig.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/scan/Scan.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/scan/Scan.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/scan/Scan.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeprscan/scan/Scan.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Analyzer.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Analyzer.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Analyzer.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Analyzer.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Archive.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Archive.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Archive.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Archive.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ClassFileReader.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ClassFileReader.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ClassFileReader.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ClassFileReader.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/DependencyFinder.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/DependencyFinder.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/DependencyFinder.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/DependencyFinder.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/DepsAnalyzer.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/DepsAnalyzer.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/DepsAnalyzer.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/DepsAnalyzer.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Graph.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Graph.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Graph.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Graph.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/InverseDepsAnalyzer.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/InverseDepsAnalyzer.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/InverseDepsAnalyzer.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/InverseDepsAnalyzer.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/JdepsConfiguration.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/JdepsConfiguration.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/JdepsConfiguration.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/JdepsConfiguration.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/JdepsFilter.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/JdepsFilter.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/JdepsFilter.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/JdepsFilter.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/JdepsTask.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/JdepsTask.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/JdepsTask.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/JdepsTask.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/JdepsWriter.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/JdepsWriter.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/JdepsWriter.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/JdepsWriter.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Main.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Main.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Main.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Main.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Module.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Module.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Module.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Module.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ModuleAnalyzer.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ModuleAnalyzer.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ModuleAnalyzer.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ModuleAnalyzer.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ModuleDotGraph.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ModuleDotGraph.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ModuleDotGraph.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ModuleDotGraph.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ModuleExportsAnalyzer.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ModuleExportsAnalyzer.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ModuleExportsAnalyzer.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ModuleExportsAnalyzer.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ModuleGraphBuilder.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ModuleGraphBuilder.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ModuleGraphBuilder.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ModuleGraphBuilder.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ModuleInfoBuilder.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ModuleInfoBuilder.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ModuleInfoBuilder.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/ModuleInfoBuilder.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/MultiReleaseException.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/MultiReleaseException.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/MultiReleaseException.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/MultiReleaseException.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Profile.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Profile.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Profile.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/Profile.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/VersionHelper.java b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/VersionHelper.java similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/VersionHelper.java rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/VersionHelper.java diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/resources/jdk8_internals.txt b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/resources/jdk8_internals.txt similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/resources/jdk8_internals.txt rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/resources/jdk8_internals.txt diff --git a/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/resources/version.properties-template b/composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/resources/version.properties-template similarity index 100% rename from build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/resources/version.properties-template rename to composite-builds/build-deps/jdk-jdeps/src/main/java/openjdk/tools/jdeps/resources/version.properties-template diff --git a/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/javap/resources/javap.properties b/composite-builds/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/javap/resources/javap.properties similarity index 100% rename from build-deps/jdk-jdeps/src/main/resources/openjdk/tools/javap/resources/javap.properties rename to composite-builds/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/javap/resources/javap.properties diff --git a/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/javap/resources/javap_ja.properties b/composite-builds/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/javap/resources/javap_ja.properties similarity index 100% rename from build-deps/jdk-jdeps/src/main/resources/openjdk/tools/javap/resources/javap_ja.properties rename to composite-builds/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/javap/resources/javap_ja.properties diff --git a/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/javap/resources/javap_zh_CN.properties b/composite-builds/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/javap/resources/javap_zh_CN.properties similarity index 100% rename from build-deps/jdk-jdeps/src/main/resources/openjdk/tools/javap/resources/javap_zh_CN.properties rename to composite-builds/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/javap/resources/javap_zh_CN.properties diff --git a/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeprscan/resources/jdeprscan.properties b/composite-builds/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeprscan/resources/jdeprscan.properties similarity index 100% rename from build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeprscan/resources/jdeprscan.properties rename to composite-builds/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeprscan/resources/jdeprscan.properties diff --git a/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeprscan/resources/jdeprscan_ja.properties b/composite-builds/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeprscan/resources/jdeprscan_ja.properties similarity index 100% rename from build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeprscan/resources/jdeprscan_ja.properties rename to composite-builds/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeprscan/resources/jdeprscan_ja.properties diff --git a/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeprscan/resources/jdeprscan_zh_CN.properties b/composite-builds/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeprscan/resources/jdeprscan_zh_CN.properties similarity index 100% rename from build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeprscan/resources/jdeprscan_zh_CN.properties rename to composite-builds/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeprscan/resources/jdeprscan_zh_CN.properties diff --git a/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeps/resources/jdeps.properties b/composite-builds/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeps/resources/jdeps.properties similarity index 100% rename from build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeps/resources/jdeps.properties rename to composite-builds/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeps/resources/jdeps.properties diff --git a/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeps/resources/jdeps_ja.properties b/composite-builds/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeps/resources/jdeps_ja.properties similarity index 100% rename from build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeps/resources/jdeps_ja.properties rename to composite-builds/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeps/resources/jdeps_ja.properties diff --git a/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeps/resources/jdeps_zh_CN.properties b/composite-builds/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeps/resources/jdeps_zh_CN.properties similarity index 100% rename from build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeps/resources/jdeps_zh_CN.properties rename to composite-builds/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeps/resources/jdeps_zh_CN.properties diff --git a/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeps/resources/jdkinternals.properties b/composite-builds/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeps/resources/jdkinternals.properties similarity index 100% rename from build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeps/resources/jdkinternals.properties rename to composite-builds/build-deps/jdk-jdeps/src/main/resources/openjdk/tools/jdeps/resources/jdkinternals.properties diff --git a/build-deps/layoutlib-api/.gitignore b/composite-builds/build-deps/jdt/.gitignore similarity index 100% rename from build-deps/layoutlib-api/.gitignore rename to composite-builds/build-deps/jdt/.gitignore diff --git a/build-deps/jdt/build.gradle.kts b/composite-builds/build-deps/jdt/build.gradle.kts similarity index 100% rename from build-deps/jdt/build.gradle.kts rename to composite-builds/build-deps/jdt/build.gradle.kts diff --git a/build-deps/jdt/src/main/java/org/eclipse/jdt/core/Signature.java b/composite-builds/build-deps/jdt/src/main/java/org/eclipse/jdt/core/Signature.java similarity index 100% rename from build-deps/jdt/src/main/java/org/eclipse/jdt/core/Signature.java rename to composite-builds/build-deps/jdt/src/main/java/org/eclipse/jdt/core/Signature.java diff --git a/build-deps/jdt/src/main/java/org/eclipse/jdt/core/compiler/CharOperation.java b/composite-builds/build-deps/jdt/src/main/java/org/eclipse/jdt/core/compiler/CharOperation.java similarity index 100% rename from build-deps/jdt/src/main/java/org/eclipse/jdt/core/compiler/CharOperation.java rename to composite-builds/build-deps/jdt/src/main/java/org/eclipse/jdt/core/compiler/CharOperation.java diff --git a/build-deps/jdt/src/main/java/org/eclipse/jdt/internal/compiler/ast/ASTNode.java b/composite-builds/build-deps/jdt/src/main/java/org/eclipse/jdt/internal/compiler/ast/ASTNode.java similarity index 100% rename from build-deps/jdt/src/main/java/org/eclipse/jdt/internal/compiler/ast/ASTNode.java rename to composite-builds/build-deps/jdt/src/main/java/org/eclipse/jdt/internal/compiler/ast/ASTNode.java diff --git a/build-deps/jdt/src/main/java/org/eclipse/jdt/internal/compiler/classfmt/ClassFileConstants.java b/composite-builds/build-deps/jdt/src/main/java/org/eclipse/jdt/internal/compiler/classfmt/ClassFileConstants.java similarity index 100% rename from build-deps/jdt/src/main/java/org/eclipse/jdt/internal/compiler/classfmt/ClassFileConstants.java rename to composite-builds/build-deps/jdt/src/main/java/org/eclipse/jdt/internal/compiler/classfmt/ClassFileConstants.java diff --git a/build-deps/jdt/src/main/java/org/eclipse/jdt/internal/compiler/parser/ScannerHelper.java b/composite-builds/build-deps/jdt/src/main/java/org/eclipse/jdt/internal/compiler/parser/ScannerHelper.java similarity index 100% rename from build-deps/jdt/src/main/java/org/eclipse/jdt/internal/compiler/parser/ScannerHelper.java rename to composite-builds/build-deps/jdt/src/main/java/org/eclipse/jdt/internal/compiler/parser/ScannerHelper.java diff --git a/build-deps/jdt/src/main/java/org/eclipse/jdt/internal/compiler/util/Util.java b/composite-builds/build-deps/jdt/src/main/java/org/eclipse/jdt/internal/compiler/util/Util.java similarity index 100% rename from build-deps/jdt/src/main/java/org/eclipse/jdt/internal/compiler/util/Util.java rename to composite-builds/build-deps/jdt/src/main/java/org/eclipse/jdt/internal/compiler/util/Util.java diff --git a/build-logic/.gitignore b/composite-builds/build-deps/layoutlib-api/.gitignore similarity index 100% rename from build-logic/.gitignore rename to composite-builds/build-deps/layoutlib-api/.gitignore diff --git a/build-deps/layoutlib-api/build.gradle.kts b/composite-builds/build-deps/layoutlib-api/build.gradle.kts similarity index 100% rename from build-deps/layoutlib-api/build.gradle.kts rename to composite-builds/build-deps/layoutlib-api/build.gradle.kts diff --git a/build-deps/layoutlib-api/gradle.properties b/composite-builds/build-deps/layoutlib-api/gradle.properties similarity index 100% rename from build-deps/layoutlib-api/gradle.properties rename to composite-builds/build-deps/layoutlib-api/gradle.properties diff --git a/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/AndroidConstants.java b/composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/AndroidConstants.java similarity index 100% rename from build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/AndroidConstants.java rename to composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/AndroidConstants.java diff --git a/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/Arity.java b/composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/Arity.java similarity index 100% rename from build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/Arity.java rename to composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/Arity.java diff --git a/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/Density.java b/composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/Density.java similarity index 100% rename from build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/Density.java rename to composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/Density.java diff --git a/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/FolderTypeRelationship.java b/composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/FolderTypeRelationship.java similarity index 100% rename from build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/FolderTypeRelationship.java rename to composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/FolderTypeRelationship.java diff --git a/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/HighDynamicRange.java b/composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/HighDynamicRange.java similarity index 100% rename from build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/HighDynamicRange.java rename to composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/HighDynamicRange.java diff --git a/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/Keyboard.java b/composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/Keyboard.java similarity index 100% rename from build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/Keyboard.java rename to composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/Keyboard.java diff --git a/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/KeyboardState.java b/composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/KeyboardState.java similarity index 100% rename from build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/KeyboardState.java rename to composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/KeyboardState.java diff --git a/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/LayoutDirection.java b/composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/LayoutDirection.java similarity index 100% rename from build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/LayoutDirection.java rename to composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/LayoutDirection.java diff --git a/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/Navigation.java b/composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/Navigation.java similarity index 100% rename from build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/Navigation.java rename to composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/Navigation.java diff --git a/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/NavigationState.java b/composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/NavigationState.java similarity index 100% rename from build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/NavigationState.java rename to composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/NavigationState.java diff --git a/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/NightMode.java b/composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/NightMode.java similarity index 100% rename from build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/NightMode.java rename to composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/NightMode.java diff --git a/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ResourceConstants.java b/composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ResourceConstants.java similarity index 100% rename from build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ResourceConstants.java rename to composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ResourceConstants.java diff --git a/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ResourceEnum.java b/composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ResourceEnum.java similarity index 100% rename from build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ResourceEnum.java rename to composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ResourceEnum.java diff --git a/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ResourceFolderType.java b/composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ResourceFolderType.java similarity index 100% rename from build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ResourceFolderType.java rename to composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ResourceFolderType.java diff --git a/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ResourceType.java b/composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ResourceType.java similarity index 100% rename from build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ResourceType.java rename to composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ResourceType.java diff --git a/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ResourceVisibility.java b/composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ResourceVisibility.java similarity index 100% rename from build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ResourceVisibility.java rename to composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ResourceVisibility.java diff --git a/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ScreenOrientation.java b/composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ScreenOrientation.java similarity index 100% rename from build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ScreenOrientation.java rename to composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ScreenOrientation.java diff --git a/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ScreenRatio.java b/composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ScreenRatio.java similarity index 100% rename from build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ScreenRatio.java rename to composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ScreenRatio.java diff --git a/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ScreenRound.java b/composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ScreenRound.java similarity index 100% rename from build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ScreenRound.java rename to composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ScreenRound.java diff --git a/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ScreenSize.java b/composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ScreenSize.java similarity index 100% rename from build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ScreenSize.java rename to composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/ScreenSize.java diff --git a/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/TouchScreen.java b/composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/TouchScreen.java similarity index 100% rename from build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/TouchScreen.java rename to composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/TouchScreen.java diff --git a/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/UiMode.java b/composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/UiMode.java similarity index 100% rename from build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/UiMode.java rename to composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/UiMode.java diff --git a/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/WideGamutColor.java b/composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/WideGamutColor.java similarity index 100% rename from build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/WideGamutColor.java rename to composite-builds/build-deps/layoutlib-api/src/main/java/com/itsaky/androidide/layoutlib/resources/WideGamutColor.java diff --git a/build-deps/settings.gradle.kts b/composite-builds/build-deps/settings.gradle.kts similarity index 93% rename from build-deps/settings.gradle.kts rename to composite-builds/build-deps/settings.gradle.kts index 8ba71c466..d8e1e31ab 100644 --- a/build-deps/settings.gradle.kts +++ b/composite-builds/build-deps/settings.gradle.kts @@ -37,7 +37,7 @@ dependencyResolutionManagement { versionCatalogs { create("libs") { - from(files("../gradle/libs.versions.toml")) + from(files("../../gradle/libs.versions.toml")) } } } @@ -61,7 +61,7 @@ rootProject.name = "build-deps" gradle.rootProject { // required for setting SDK location for android modules - project.file("../local.properties") + project.file("../../local.properties") .takeIf { it.exists() } ?.copyTo(project.file("local.properties"), overwrite = true) } \ No newline at end of file diff --git a/build-logic/common/.gitignore b/composite-builds/build-logic/.gitignore similarity index 100% rename from build-logic/common/.gitignore rename to composite-builds/build-logic/.gitignore diff --git a/composite-builds/build-logic/.idea/.gitignore b/composite-builds/build-logic/.idea/.gitignore new file mode 100644 index 000000000..26d33521a --- /dev/null +++ b/composite-builds/build-logic/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/composite-builds/build-logic/.idea/compiler.xml b/composite-builds/build-logic/.idea/compiler.xml new file mode 100644 index 000000000..fb7f4a8a4 --- /dev/null +++ b/composite-builds/build-logic/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/composite-builds/build-logic/.idea/gradle.xml b/composite-builds/build-logic/.idea/gradle.xml new file mode 100644 index 000000000..17210e64a --- /dev/null +++ b/composite-builds/build-logic/.idea/gradle.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/composite-builds/build-logic/.idea/kotlinc.xml b/composite-builds/build-logic/.idea/kotlinc.xml new file mode 100644 index 000000000..8d81632f8 --- /dev/null +++ b/composite-builds/build-logic/.idea/kotlinc.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/composite-builds/build-logic/.idea/migrations.xml b/composite-builds/build-logic/.idea/migrations.xml new file mode 100644 index 000000000..f8051a6f9 --- /dev/null +++ b/composite-builds/build-logic/.idea/migrations.xml @@ -0,0 +1,10 @@ + + + + + + \ No newline at end of file diff --git a/composite-builds/build-logic/.idea/misc.xml b/composite-builds/build-logic/.idea/misc.xml new file mode 100644 index 000000000..435c71271 --- /dev/null +++ b/composite-builds/build-logic/.idea/misc.xml @@ -0,0 +1,9 @@ + + + + + + + + \ No newline at end of file diff --git a/build-logic/build.gradle.kts b/composite-builds/build-logic/build.gradle.kts similarity index 100% rename from build-logic/build.gradle.kts rename to composite-builds/build-logic/build.gradle.kts diff --git a/build-logic/properties-parser/.gitignore b/composite-builds/build-logic/common/.gitignore similarity index 100% rename from build-logic/properties-parser/.gitignore rename to composite-builds/build-logic/common/.gitignore diff --git a/build-logic/common/build.gradle.kts b/composite-builds/build-logic/common/build.gradle.kts similarity index 100% rename from build-logic/common/build.gradle.kts rename to composite-builds/build-logic/common/build.gradle.kts diff --git a/build-logic/common/src/main/java/com/itsaky/androidide/build/config/BuildConfig.kt b/composite-builds/build-logic/common/src/main/java/com/itsaky/androidide/build/config/BuildConfig.kt similarity index 100% rename from build-logic/common/src/main/java/com/itsaky/androidide/build/config/BuildConfig.kt rename to composite-builds/build-logic/common/src/main/java/com/itsaky/androidide/build/config/BuildConfig.kt diff --git a/build-logic/common/src/main/java/com/itsaky/androidide/build/config/CI.kt b/composite-builds/build-logic/common/src/main/java/com/itsaky/androidide/build/config/CI.kt similarity index 100% rename from build-logic/common/src/main/java/com/itsaky/androidide/build/config/CI.kt rename to composite-builds/build-logic/common/src/main/java/com/itsaky/androidide/build/config/CI.kt diff --git a/build-logic/common/src/main/java/com/itsaky/androidide/build/config/FDroidConfig.kt b/composite-builds/build-logic/common/src/main/java/com/itsaky/androidide/build/config/FDroidConfig.kt similarity index 100% rename from build-logic/common/src/main/java/com/itsaky/androidide/build/config/FDroidConfig.kt rename to composite-builds/build-logic/common/src/main/java/com/itsaky/androidide/build/config/FDroidConfig.kt diff --git a/build-logic/common/src/main/java/com/itsaky/androidide/build/config/ProjectConfig.kt b/composite-builds/build-logic/common/src/main/java/com/itsaky/androidide/build/config/ProjectConfig.kt similarity index 100% rename from build-logic/common/src/main/java/com/itsaky/androidide/build/config/ProjectConfig.kt rename to composite-builds/build-logic/common/src/main/java/com/itsaky/androidide/build/config/ProjectConfig.kt diff --git a/build-logic/common/src/main/java/com/itsaky/androidide/build/config/VersionUtils.kt b/composite-builds/build-logic/common/src/main/java/com/itsaky/androidide/build/config/VersionUtils.kt similarity index 100% rename from build-logic/common/src/main/java/com/itsaky/androidide/build/config/VersionUtils.kt rename to composite-builds/build-logic/common/src/main/java/com/itsaky/androidide/build/config/VersionUtils.kt diff --git a/build-logic/common/src/main/java/com/itsaky/androidide/build/config/config.kt b/composite-builds/build-logic/common/src/main/java/com/itsaky/androidide/build/config/config.kt similarity index 100% rename from build-logic/common/src/main/java/com/itsaky/androidide/build/config/config.kt rename to composite-builds/build-logic/common/src/main/java/com/itsaky/androidide/build/config/config.kt diff --git a/build-logic/common/src/main/java/com/itsaky/androidide/build/config/utils.kt b/composite-builds/build-logic/common/src/main/java/com/itsaky/androidide/build/config/utils.kt similarity index 100% rename from build-logic/common/src/main/java/com/itsaky/androidide/build/config/utils.kt rename to composite-builds/build-logic/common/src/main/java/com/itsaky/androidide/build/config/utils.kt diff --git a/composite-builds/build-logic/desugaring/.gitignore b/composite-builds/build-logic/desugaring/.gitignore new file mode 100644 index 000000000..42afabfd2 --- /dev/null +++ b/composite-builds/build-logic/desugaring/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/composite-builds/build-logic/desugaring/build.gradle.kts b/composite-builds/build-logic/desugaring/build.gradle.kts new file mode 100644 index 000000000..23c1a58c7 --- /dev/null +++ b/composite-builds/build-logic/desugaring/build.gradle.kts @@ -0,0 +1,41 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +plugins { + `kotlin-dsl` +} + +dependencies { + implementation(gradleApi()) + implementation(libs.composite.desugaringCore) + + compileOnly(libs.android.gradle.plugin) + + testImplementation(libs.tests.junit) + testImplementation(libs.tests.google.truth) +} + +gradlePlugin { + plugins { + create("desugaring") { + id = "com.itsaky.androidide.desugaring" + implementationClass = "com.itsaky.androidide.desugaring.DesugarGradlePlugin" + displayName = "AndroidIDE Method Desugaring Plugin" + description = "Gradle plugin for method desugaring in Android projects." + } + } +} \ No newline at end of file diff --git a/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/DesugarClassVisitor.kt b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/DesugarClassVisitor.kt new file mode 100644 index 000000000..0a0e7b10f --- /dev/null +++ b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/DesugarClassVisitor.kt @@ -0,0 +1,41 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +package com.itsaky.androidide.desugaring + +import com.android.build.api.instrumentation.ClassContext +import org.objectweb.asm.ClassVisitor +import org.objectweb.asm.MethodVisitor + +/** + * [ClassVisitor] implementation for desugaring. + * + * @author Akash Yadav + */ +class DesugarClassVisitor(private val params: DesugarParams, + private val classContext: ClassContext, api: Int, + classVisitor: ClassVisitor +) : ClassVisitor(api, classVisitor) { + + override fun visitMethod(access: Int, name: String?, descriptor: String?, + signature: String?, exceptions: Array? + ): MethodVisitor { + return DesugarMethodVisitor(params, classContext, api, + super.visitMethod(access, name, descriptor, signature, exceptions)) + } +} + diff --git a/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/DesugarClassVisitorFactory.kt b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/DesugarClassVisitorFactory.kt new file mode 100644 index 000000000..069a5ca14 --- /dev/null +++ b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/DesugarClassVisitorFactory.kt @@ -0,0 +1,78 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +package com.itsaky.androidide.desugaring + +import com.android.build.api.instrumentation.AsmClassVisitorFactory +import com.android.build.api.instrumentation.ClassContext +import com.android.build.api.instrumentation.ClassData +import org.objectweb.asm.ClassVisitor +import org.slf4j.LoggerFactory + +/** + * [AsmClassVisitorFactory] implementation for desugaring. + * + * @author Akash Yadav + */ +abstract class DesugarClassVisitorFactory : + AsmClassVisitorFactory { + + companion object { + + private val log = + LoggerFactory.getLogger(DesugarClassVisitorFactory::class.java) + } + + override fun createClassVisitor(classContext: ClassContext, + nextClassVisitor: ClassVisitor + ): ClassVisitor { + val params = parameters.orNull + if (params == null) { + log.warn("Could not find desugaring parameters. Disabling desugaring.") + return nextClassVisitor + } + + return DesugarClassVisitor(params, classContext, + instrumentationContext.apiVersion.get(), nextClassVisitor) + } + + override fun isInstrumentable(classData: ClassData): Boolean { + val params = parameters.orNull + if (params == null) { + log.warn("Could not find desugaring parameters. Disabling desugaring.") + return false + } + + val isEnabled = params.enabled.get().also { isEnabled -> + log.debug("Is desugaring enabled: $isEnabled") + } + + if (!isEnabled) { + return false + } + + val includedPackages = params.includedPackages.get() + if (includedPackages.isNotEmpty()) { + val className = classData.className + if (!includedPackages.any { className.startsWith(it) }) { + return false + } + } + + return true + } +} \ No newline at end of file diff --git a/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/DesugarExtension.kt b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/DesugarExtension.kt new file mode 100644 index 000000000..ffdb79946 --- /dev/null +++ b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/DesugarExtension.kt @@ -0,0 +1,49 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +package com.itsaky.androidide.desugaring + +import com.itsaky.androidide.desugaring.dsl.DesugarReplacementsContainer +import org.gradle.api.Action +import org.gradle.api.provider.Property +import org.gradle.api.tasks.Nested + +/** + * Extension for configuring the [DesugarGradlePlugin] and the desugar process. + * + * @author Akash Yadav + */ +interface DesugarExtension { + + /** + * Whether the desugaring is enabled. Defaults to `true`. + */ + val enabled: Property + + /** + * The method replacement instructions container. + */ + @get:Nested + val replacements: DesugarReplacementsContainer + + /** + * Define the replacement methods for desugaring. + */ + fun replacements(action: Action) { + action.execute(replacements) + } +} \ No newline at end of file diff --git a/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/DesugarGradlePlugin.kt b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/DesugarGradlePlugin.kt new file mode 100644 index 000000000..bd8941ec9 --- /dev/null +++ b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/DesugarGradlePlugin.kt @@ -0,0 +1,55 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +package com.itsaky.androidide.desugaring + +import com.android.build.api.instrumentation.InstrumentationScope.ALL +import com.android.build.api.variant.AndroidComponentsExtension +import com.itsaky.androidide.desugaring.DesugarParams.Companion.setFrom +import org.gradle.api.Plugin +import org.gradle.api.Project +import org.gradle.kotlin.dsl.create + +class DesugarGradlePlugin : Plugin { + + override fun apply(target: Project) { + target.run { + logger.trace("Creating desugaring extension") + val extension = extensions.create("desugaring") + extension.enabled.convention(true) + + val androidComponents = + extensions.findByType(AndroidComponentsExtension::class.java) ?: run { + logger.warn("Could not find androidComponents extension") + return + } + + androidComponents.onVariants { variant -> + logger.debug("Applying desugaring to ${variant.name}") + + variant.instrumentation.transformClassesWith( + DesugarClassVisitorFactory::class.java, ALL) { params -> + params.setFrom(extension) + } + +// variant.runtimeConfiguration.dependencies.add( +// project.dependencies.create("") +// ) + } + } + } +} \ No newline at end of file diff --git a/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/DesugarMethodVisitor.kt b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/DesugarMethodVisitor.kt new file mode 100644 index 000000000..a4453c21a --- /dev/null +++ b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/DesugarMethodVisitor.kt @@ -0,0 +1,135 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +package com.itsaky.androidide.desugaring + +import com.android.build.api.instrumentation.ClassContext +import com.itsaky.androidide.desugaring.dsl.MethodOpcode +import com.itsaky.androidide.desugaring.dsl.ReplaceMethodInsn +import com.itsaky.androidide.desugaring.dsl.ReplaceMethodInsnKey +import org.objectweb.asm.MethodVisitor +import org.slf4j.LoggerFactory + +class DesugarMethodVisitor @JvmOverloads constructor( + private val params: DesugarParams, private val classContext: ClassContext, + api: Int, methodVisitor: MethodVisitor? = null +) : MethodVisitor(api, methodVisitor) { + + companion object { + + private val log = LoggerFactory.getLogger(DesugarMethodVisitor::class.java) + } + + override fun visitMethodInsn(opcode: Int, owner: String?, name: String?, + descriptor: String?, isInterface: Boolean + ) { + val replacement = + findReplacementForClsOrSupercls(opcode, owner, name, descriptor) + if (replacement == null) { + super.visitMethodInsn(opcode, owner, name, descriptor, isInterface) + return + } + + val requireOpcode = replacement.requireOpcode ?: MethodOpcode.ANY + val methodDesc = "${requireOpcode.insnName} ${owner}->${name}${descriptor}" + + val toClass = + replacement.toClass.requireValue("toClass", methodDesc).replace('.', '/') + + val toMethod = replacement.toMethod.requireValue("toMethod", methodDesc) + val toDescriptor = + replacement.toMethodDescriptor.requireValue("toMethodDescriptor", + methodDesc) + val toOpcode = replacement.toOpcode.requireValue("toOpcode", methodDesc) + + log.debug( + "Replacing $methodDesc with ${toOpcode.insnName} ${toClass}->${toMethod}${toDescriptor}") + + super.visitMethodInsn(toOpcode.opcode, toClass, toMethod, toDescriptor, + false) + } + + private fun findReplacementForClsOrSupercls(opcode: Int, owner: String?, + method: String?, + descriptor: String? + ): ReplaceMethodInsn? { + if (owner == null || method == null || descriptor == null) { + return null + } + + // case 1: check if we have a replacement for this class + val thisReplacement = findReplacement(opcode, owner, method, descriptor) + if (thisReplacement != null) { + return thisReplacement + } + + val classData = + classContext.loadClassData(owner.replace('/', '.')) ?: return null + + // case 2: check if we have a replacement for a superclass + for (superclass in classData.superClasses) { + val replacement = + findReplacementForClsOrSupercls(opcode, superclass, method, descriptor) + if (replacement != null) { + return replacement + } + } + + // case 3: check if we have a replacement for an super-interface + for (iface in classData.interfaces) { + val replacement = + findReplacementForClsOrSupercls(opcode, iface, method, descriptor) + if (replacement != null) { + return replacement + } + } + + // case 4: no replacement is available + return null + } + + private fun findReplacement(opcode: Int, owner: String?, method: String?, + descriptor: String? + ): ReplaceMethodInsn? { + val replacements = params.replacements.get() + if (owner == null || method == null || descriptor == null) { + return null + } + + val key = ReplaceMethodInsnKey(owner.replace('/', '.'), method, descriptor) + val replaceMethodInsn = replacements[key] ?: return null + + return replaceMethodInsn.takeIf { + val methodOpcode = it.requireOpcode ?: MethodOpcode.ANY + val methodDescriptor = it.methodDescriptor + + (methodOpcode == MethodOpcode.ANY || methodOpcode.opcode == opcode) && methodDescriptor == descriptor + } + } + + private fun T.requireValue(propName: String, methodDesc: String + ): T { + return this?.let { + if (it is String && it.isBlank()) { + null + } else { + it + } + } ?: throw IllegalArgumentException( + "No value specified for '${propName}' (for method ${methodDesc}).") + } +} \ No newline at end of file diff --git a/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/DesugarParams.kt b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/DesugarParams.kt new file mode 100644 index 000000000..1e5905b45 --- /dev/null +++ b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/DesugarParams.kt @@ -0,0 +1,64 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +package com.itsaky.androidide.desugaring + +import com.android.build.api.instrumentation.InstrumentationParameters +import com.itsaky.androidide.desugaring.dsl.ReplaceMethodInsn +import com.itsaky.androidide.desugaring.dsl.ReplaceMethodInsnKey +import org.gradle.api.provider.MapProperty +import org.gradle.api.provider.Property +import org.gradle.api.provider.SetProperty +import org.gradle.api.tasks.Input + +/** + * Parameters for [DesugarClassVisitorFactory]. + * + * @author Akash Yadav + */ +interface DesugarParams : InstrumentationParameters { + + /** + * Whether the desugaring is enabled. + */ + @get:Input + val enabled: Property + + /** + * The replacement instructions. + */ + @get:Input + val replacements: MapProperty + + @get:Input + val includedPackages: SetProperty + + companion object { + + /** + * Sets [DesugarParams] properties from [DesugarExtension]. + */ + fun DesugarParams.setFrom(extension: DesugarExtension) { + replacements.convention(emptyMap()) + includedPackages.convention(emptySet()) + + enabled.set(extension.enabled) + replacements.set(extension.replacements.instructions) + includedPackages.set(extension.replacements.includePackages) + } + } +} \ No newline at end of file diff --git a/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/dsl/DesugarReplacementsContainer.kt b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/dsl/DesugarReplacementsContainer.kt new file mode 100644 index 000000000..057fcc1cb --- /dev/null +++ b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/dsl/DesugarReplacementsContainer.kt @@ -0,0 +1,130 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +package com.itsaky.androidide.desugaring.dsl + +import com.itsaky.androidide.desugaring.internal.parsing.InsnLexer +import com.itsaky.androidide.desugaring.internal.parsing.InsnParser +import com.itsaky.androidide.desugaring.utils.ReflectionUtils +import org.gradle.api.Action +import org.gradle.api.model.ObjectFactory +import java.io.File +import java.lang.reflect.Method +import java.util.TreeSet +import javax.inject.Inject + +/** + * Defines replacements for desugaring. + * + * @author Akash Yadav + */ +abstract class DesugarReplacementsContainer @Inject constructor( + private val objects: ObjectFactory +) { + + internal val includePackages = TreeSet() + + internal val instructions = + mutableMapOf() + + companion object { + + private val PACKAGE_NAME_REGEX = + Regex("""^[a-z][a-z0-9_]*(\.[a-z][a-z0-9_]*)*${'$'}""") + } + + /** + * Adds the given packages to the list of packages that will be scanned for + * the desugaring process. By default, the list of packages is empty. An empty + * list will include all packages. + */ + fun includePackage(vararg packages: String) { + for (pck in packages) { + if (!PACKAGE_NAME_REGEX.matches(pck)) { + throw IllegalArgumentException("Invalid package name: $pck") + } + + includePackages.add(pck) + } + } + + /** + * Removes the given packages from the list of included packages. + */ + fun removePackage(vararg packages: String) { + includePackages.removeAll(packages.toSet()) + } + + /** + * Adds an instruction to replace the given method. + */ + fun replaceMethod(configure: Action) { + val instruction = objects.newInstance(ReplaceMethodInsn::class.java) + configure.execute(instruction) + addReplaceInsns(instruction) + } + + /** + * Replace usage of [sourceMethod] with the [targetMethod]. + */ + @JvmOverloads + fun replaceMethod( + sourceMethod: Method, + targetMethod: Method, + configure: Action = Action {} + ) { + val instruction = ReplaceMethodInsn.forMethods(sourceMethod, targetMethod).build() + configure.execute(instruction) + if (instruction.requireOpcode == MethodOpcode.INVOKEVIRTUAL + && instruction.toOpcode == MethodOpcode.INVOKESTATIC + ) { + ReflectionUtils.validateVirtualToStaticReplacement(sourceMethod, targetMethod) + } + addReplaceInsns(instruction) + } + + /** + * Load instructions from the given file. + */ + fun loadFromFile(file: File) { + val lexer = InsnLexer(file.readText()) + val parser = InsnParser(lexer) + val insns = parser.parse() + addReplaceInsns(insns) + } + + private fun addReplaceInsns(vararg insns: ReplaceMethodInsn + ) { + addReplaceInsns(insns.asIterable()) + } + + private fun addReplaceInsns(insns: Iterable + ) { + for (insn in insns) { + val className = insn.fromClass.replace('/', '.') + val methodName = insn.methodName + val methodDescriptor = insn.methodDescriptor + + insn.requireOpcode ?: run { + insn.requireOpcode = MethodOpcode.ANY + } + + val key = ReplaceMethodInsnKey(className, methodName, methodDescriptor) + this.instructions[key] = insn + } + } +} \ No newline at end of file diff --git a/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/dsl/MethodOpcode.kt b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/dsl/MethodOpcode.kt new file mode 100644 index 000000000..8317865c2 --- /dev/null +++ b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/dsl/MethodOpcode.kt @@ -0,0 +1,65 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +package com.itsaky.androidide.desugaring.dsl + +import org.objectweb.asm.Opcodes + +/** + * The opcode for method invocation instructions. + * + * @author Akash Yadav + */ +enum class MethodOpcode(val insnName: String, val opcode: Int +) { + + /** + * The opcode for `invokestatic`. + */ + INVOKESTATIC("invoke-static", Opcodes.INVOKESTATIC), + + /** + * The opcode for `invokespecial`. + */ + INVOKESPECIAL("invoke-special", Opcodes.INVOKESPECIAL), + + /** + * The opcode for `invokevirtual`. + */ + INVOKEVIRTUAL("invoke-virtual", Opcodes.INVOKEVIRTUAL), + + /** + * The opcode for `invokeinterface`. + */ + INVOKEINTERFACE("invoke-interface", Opcodes.INVOKEINTERFACE), + + /** + * Any opcode. This is for internal use only. + */ + ANY("invoke-any", 0); + + companion object { + + /** + * Finds the [MethodOpcode] with the given instruction name. + */ + @JvmStatic + fun find(insn: String): MethodOpcode? { + return MethodOpcode.values().find { it.insnName == insn } + } + } +} \ No newline at end of file diff --git a/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/dsl/ReplaceMethodInsn.kt b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/dsl/ReplaceMethodInsn.kt new file mode 100644 index 000000000..09c113f28 --- /dev/null +++ b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/dsl/ReplaceMethodInsn.kt @@ -0,0 +1,210 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +package com.itsaky.androidide.desugaring.dsl + +import com.itsaky.androidide.desugaring.internal.dsl.DefaultReplaceMethodInsn +import com.itsaky.androidide.desugaring.utils.ReflectionUtils +import java.lang.reflect.Method +import java.lang.reflect.Modifier + +/** + * Instruction for replacing usage of a given method. + * + * @author Akash Yadav + */ +interface ReplaceMethodInsn { + + /** + * The owner class name for the method to be replaced. The class name must be + * in the form of a fully qualified name or in the binary name format. + */ + var fromClass: String + + /** + * The name of the method to be replaced. + */ + var methodName: String + + /** + * The descriptor of the method to be replaced. This is the method signature + * as it appears in the bytecode. + */ + var methodDescriptor: String + + /** + * The opcode for the method to be replaced. If this is specified, then the + * opcode for the invoked method will be checked against this and the invocation + * will only be replaced of the opcode matches. + * + * This is optional. By default, the invocation will always be replaced. + */ + var requireOpcode: MethodOpcode? + + /** + * The owner class name for the method which will replace the [methodName]. + * The class name must be in the form of a fully qualified name or in the + * binary name format. + */ + var toClass: String + + /** + * The name of the method in [toClass] which will replace the [methodName]. + */ + var toMethod: String + + /** + * The descriptor of the method in [toClass] which will replace the [methodName]. + */ + var toMethodDescriptor: String + + /** + * The opcode for invoking [toMethod] in [toClass]. + */ + var toOpcode: MethodOpcode + + class Builder { + + @JvmField + var fromClass: String = "" + + @JvmField + var methodName: String = "" + + @JvmField + var methodDescriptor: String = "" + + @JvmField + var requireOpcode: MethodOpcode? = null + + @JvmField + var toClass: String = "" + + @JvmField + var toMethod: String = "" + + @JvmField + var toMethodDescriptor: String = "" + + @JvmField + var toOpcode: MethodOpcode = MethodOpcode.ANY + + fun fromMethod(method: Method) = apply { + fromClass(method.declaringClass) + methodName(method.name) + methodDescriptor(ReflectionUtils.describe(method)) + + if (Modifier.isStatic(method.modifiers)) { + requireOpcode(MethodOpcode.INVOKESTATIC) + } else { + requireOpcode(MethodOpcode.INVOKEVIRTUAL) + } + } + + fun fromClass(fromClass: String) = apply { + this.fromClass = fromClass + } + + fun fromClass(klass: Class<*>): Builder { + if (klass.isArray || klass.isPrimitive) { + throw UnsupportedOperationException( + "Array and primitive types are not supported for desugaring") + } + + return fromClass(klass.name) + } + + fun methodName(methodName: String) = apply { + this.methodName = methodName + } + + fun methodDescriptor(methodDescriptor: String) = apply { + this.methodDescriptor = methodDescriptor + } + + fun requireOpcode(requireOpcode: MethodOpcode) = apply { + this.requireOpcode = requireOpcode + } + + fun toClass(toClass: String) = apply { + this.toClass = toClass + } + + fun toClass(klass: Class<*>): Builder { + if (klass.isArray || klass.isPrimitive) { + throw UnsupportedOperationException( + "Array and primitive types are not supported for desugaring") + } + + return toClass(klass.name) + } + + fun toMethod(toMethod: String) = apply { + this.toMethod = toMethod + } + + fun toMethodDescriptor(toMethodDescriptor: String) = apply { + this.toMethodDescriptor = toMethodDescriptor + } + + fun toMethod(method: Method) = apply { + toClass(method.declaringClass) + toMethod(method.name) + toMethodDescriptor(ReflectionUtils.describe(method)) + + if (Modifier.isStatic(method.modifiers)) { + toOpcode(MethodOpcode.INVOKESTATIC) + } else { + toOpcode(MethodOpcode.INVOKEVIRTUAL) + } + } + + fun toOpcode(toOpcode: MethodOpcode) = apply { + this.toOpcode = toOpcode + } + + fun build(): DefaultReplaceMethodInsn { + require(fromClass.isNotBlank()) { "fromClass cannot be blank." } + require(methodName.isNotBlank()) { "methodName cannot be blank." } + require( + methodDescriptor.isNotBlank()) { "methodDescriptor cannot be blank." } + require(toClass.isNotBlank()) { "toClass cannot be blank." } + require(toMethod.isNotBlank()) { "toMethod cannot be blank." } + require( + toMethodDescriptor.isNotBlank()) { "toMethodDescriptor cannot be blank." } + require(toOpcode != MethodOpcode.ANY) { "toOpcode cannot be ANY." } + + return DefaultReplaceMethodInsn(fromClass, methodName, methodDescriptor, + requireOpcode, toClass, toMethod, toMethodDescriptor, toOpcode) + } + } + + companion object { + + @JvmStatic + fun builder(): Builder = Builder() + + /** + * Creates a [Builder] for the given source and target method. + */ + @JvmStatic + fun forMethods(fromMethod: Method, toMethod: Method + ): Builder { + return builder().fromMethod(fromMethod).toMethod(toMethod) + } + } +} \ No newline at end of file diff --git a/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/dsl/ReplaceMethodInsnKey.kt b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/dsl/ReplaceMethodInsnKey.kt new file mode 100644 index 000000000..c4324696e --- /dev/null +++ b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/dsl/ReplaceMethodInsnKey.kt @@ -0,0 +1,29 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +package com.itsaky.androidide.desugaring.dsl + +/** + * Key for storing [ReplaceMethodInsnKey] instances in a map. + * + * @author Akash Yadav + */ +data class ReplaceMethodInsnKey( + val className: String, + val methodName: String, + val methodDescriptor: String +) diff --git a/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/internal/dsl/DefaultReplaceMethodInsn.kt b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/internal/dsl/DefaultReplaceMethodInsn.kt new file mode 100644 index 000000000..45117ad7f --- /dev/null +++ b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/internal/dsl/DefaultReplaceMethodInsn.kt @@ -0,0 +1,22 @@ +package com.itsaky.androidide.desugaring.internal.dsl + +import com.itsaky.androidide.desugaring.dsl.MethodOpcode +import com.itsaky.androidide.desugaring.dsl.ReplaceMethodInsn +import java.io.Serializable + +/** + * @author Akash Yadav + */ +data class DefaultReplaceMethodInsn(override var fromClass: String, + override var methodName: String, + override var methodDescriptor: String, + override var requireOpcode: MethodOpcode?, + override var toClass: String, + override var toMethod: String, + override var toMethodDescriptor: String, + override var toOpcode: MethodOpcode +) : ReplaceMethodInsn, Serializable { + + @JvmField + val serialVersionUID = 1L +} \ No newline at end of file diff --git a/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/internal/parsing/InsnLexer.kt b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/internal/parsing/InsnLexer.kt new file mode 100644 index 000000000..1423d877d --- /dev/null +++ b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/internal/parsing/InsnLexer.kt @@ -0,0 +1,215 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +package com.itsaky.androidide.desugaring.internal.parsing + +/** + * Lexer implementation to tokenize the input for [InsnParser]. + * + * @author Akash Yadav + */ +internal class InsnLexer( + private val input: CharSequence +) { + + private val currentWord = StringBuilder(64) + private var position = 0 + private var line = 0 + private var column = 0 + + /** + * Returns all tokens from the input. + */ + fun all(): List { + val tokens = mutableListOf() + while (true) { + val token = nextToken() + if (token.isEof()) { + break + } + tokens.add(token) + } + return tokens + } + + fun peek() : Token { + val pos = this.position + val line = this.line + val column = this.column + + val next = nextToken() + + this.position = pos + this.line = line + this.column = column + + return next + } + + /** + * Returns the next token from the input. + */ + fun nextToken(): Token { + currentWord.clear() + + var isIdentifier = false + + while (true) { + + val char = peekInput() + if (char == null) { + if (isIdentifier) { + // EOF while reading an identifier + return token(TokenType.IDENTIFIER, currentWord.toString()) + } + + return Token.EOF + } + + if (isIdentifier && !Character.isJavaIdentifierPart(char)) { + return token(TokenType.IDENTIFIER, currentWord.toString()) + } + + // advance to next character + advance() + + val schar = char.toString() + + if (isWhitespace(char)) { + // ignore whitespace + continue + } + + when (char) { + '/' -> return token(TokenType.SLASH, schar) + '-' -> return token(TokenType.HYPHEN, schar) + '>' -> return token(TokenType.RANGULAR, schar) + '(' -> return token(TokenType.LPAR, schar) + ')' -> return token(TokenType.RPAR, schar) + '[' -> return token(TokenType.LBRAC, schar) + '=' -> return token(TokenType.EQUALS, schar) + ';' -> return token(TokenType.SEMICOLON, schar) + + // skip comments starting with the '#' character + '#' -> { + skipUntil(::isNewLine) + continue + } + + '\n' -> { + line += 1 + column = 0 + continue + } + + '\r' -> continue + } + + if (Character.isJavaIdentifierStart(char) && !isIdentifier) { + currentWord.append(char) + isIdentifier = true + continue + } + + if (Character.isJavaIdentifierPart(char) && isIdentifier) { + currentWord.append(char) + continue + } + + return token(TokenType.UNKNOWN, schar) + } + } + + private fun token(type: TokenType, value: String): Token { + val index = position - value.length + val column = column - value.length + + check(index >= 0) { "Invalid lexer state - index < 0" } + check(column >= 0) { "Invalid lexer state - column < 0" } + + return Token(line, column, index, type, value) + } + + private fun advance(): Char? { + if (position >= input.length) { + return null + } + + return input[position++].also { + ++column + } + } + + private fun peekInput(): Char? { + if (position >= input.length) { + return null + } + + return input[position] + } + + private fun isWhitespace(char: Char): Boolean { + return char == ' ' || char == '\t' + } + + private fun isNewLine(char: Char): Boolean { + return char == '\n' || char == '\r' + } + + private inline fun skipUntil(predicate: (char: Char) -> Boolean) { + while (true) { + val peek = peekInput() ?: break + if (predicate(peek)) { + break + } + + advance() + } + } + + data class Token( + val line: Int, + val column: Int, + val index: Int, + val type: TokenType, + val text: String + ) { + + companion object { + + @JvmField + val EOF = Token(-1, -1, -1, TokenType.EOF, "") + } + + fun isEof() = type == TokenType.EOF + + fun errDesc() = "token $type at line $line, column $column: $text" + } + + enum class TokenType { IDENTIFIER, + LPAR, + RPAR, + LBRAC, + SLASH, + SEMICOLON, + EQUALS, + RANGULAR, + HYPHEN, + UNKNOWN, + EOF + } +} \ No newline at end of file diff --git a/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/internal/parsing/InsnParser.kt b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/internal/parsing/InsnParser.kt new file mode 100644 index 000000000..32a5faedc --- /dev/null +++ b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/internal/parsing/InsnParser.kt @@ -0,0 +1,255 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +package com.itsaky.androidide.desugaring.internal.parsing + +import com.itsaky.androidide.desugaring.dsl.MethodOpcode +import com.itsaky.androidide.desugaring.dsl.ReplaceMethodInsn +import com.itsaky.androidide.desugaring.internal.parsing.InsnLexer.Token +import com.itsaky.androidide.desugaring.internal.parsing.InsnLexer.TokenType + +/** + * A parser implementation to parse method invocation instructions. + * + * @author Akash Yadav + */ +internal class InsnParser( + private val lexer: InsnLexer +) { + + private val cName = StringBuilder(128) + private val md = StringBuilder(128) + + /** + * Parse the input and return a list of [ReplaceMethodInsn]. + */ + fun parse(): List { + val inss = mutableListOf() + while (true) { + inss.add(nextInsn() ?: break) + } + return inss + } + + private fun nextInsn(): ReplaceMethodInsn? { + if (peekToken().type == TokenType.EOF) { + return null + } + + val opcode = acceptOpcode() + val fromClass = acceptClassName() + accept(TokenType.HYPHEN) + accept(TokenType.RANGULAR) + val methodName = accept(TokenType.IDENTIFIER).text + val methodDescriptor = acceptMethodDescriptor() + + accept(TokenType.EQUALS) + accept(TokenType.RANGULAR) + + val toOpcode = acceptOpcode() + val toClass = acceptClassName() + accept(TokenType.HYPHEN) + accept(TokenType.RANGULAR) + val toMethod = accept(TokenType.IDENTIFIER).text + val toDescriptor = acceptMethodDescriptor() + + accept(TokenType.SEMICOLON) + accept(TokenType.SEMICOLON) + + return ReplaceMethodInsn.builder() + .requireOpcode(opcode) + .fromClass(fromClass) + .methodName(methodName) + .methodDescriptor(methodDescriptor) + .toOpcode(toOpcode) + .toClass(toClass) + .toMethod(toMethod) + .toMethodDescriptor(toDescriptor) + .build() + } + + private fun acceptOpcode(): MethodOpcode { + val invoke = accept(TokenType.IDENTIFIER) + val hyphen = accept(TokenType.HYPHEN) + val op = accept(TokenType.IDENTIFIER) + + val opcode = MethodOpcode.find("${invoke.text}${hyphen.text}${op.text}") + checkNotNull(opcode, + "Unknown opcode ${invoke.text}${hyphen.text}${op.text}") + return opcode!! + } + + private fun acceptClassName(binaryName: Boolean = false): String { + cName.setLength(0) + + var isFirst = true + while (true) { + val token = nextToken() + + if (token.type == TokenType.EOF) { + throw ParseException("Unexpected EOF while parsing class name") + } + + if (token.type == TokenType.IDENTIFIER) { + if (isFirst) { + if (token.text[0] != 'L') { + throw ParseException( + "Invalid class name: ${token.text} (${token.errDesc()})") + } + if (binaryName) { + cName.append(token.text) + } else { + cName.append(token.text.substring(1)) + } + isFirst = false + } else { + cName.append(token.text) + } + continue + } + + if (token.type == TokenType.SLASH) { + cName.append(if (binaryName) token.text else '.') + continue + } + + if (token.type == TokenType.SEMICOLON) { + if (binaryName) { + cName.append(token.text) + } + break + } + + throw ParseException( + "Error parsing class name. Unexpected ${token.errDesc()}") + } + + return cName.toString() + } + + private fun acceptMethodDescriptor(): String { + md.setLength(0) + + md.append(accept(tokenType = TokenType.LPAR).text) + + // we could simply append everything between the LPAR and RPAR + // but we need to validate the parameter types + while (true) { + val token = peekToken() + + if (token.type == TokenType.RPAR) { + // end of method descriptor + md.append(accept(TokenType.RPAR).text) + break + } + + if (token.text[0] == 'L') { + md.append(acceptClassName(binaryName = true)) + } else { + for (char in token.text) { + when (char) { + '[', + 'V', + 'Z', + 'C', + 'B', + 'S', + 'I', + 'J', + 'F', + 'D' -> continue + else -> throw ParseException("Invalid parameter type: ${token.errDesc()}") + } + } + + md.append(accept(tokenType = token.type).text) + } + } + + // the return type + var token = peekToken() + + // in case the method returns a multi-dimensional array + while (token.type == TokenType.LBRAC) { + md.append(accept(tokenType = TokenType.LBRAC).text) + token = peekToken() + } + + if (token.type == TokenType.IDENTIFIER) { + when (token.text[0]) { + 'L' -> md.append(acceptClassName(binaryName = true)) + 'V', + 'Z', + 'C', + 'B', + 'S', + 'I', + 'J', + 'F', + 'D' -> md.append(accept(tokenType = TokenType.IDENTIFIER).text) + else -> throw ParseException("Invalid return type: ${token.errDesc()}") + } + } else { + throw ParseException("Invalid return type: ${token.errDesc()}") + } + + return md.toString() + } + + /** + * Advance to the next token and check if it has the given expected token type. + */ + private fun accept(tokenType: TokenType): Token { + val token = nextToken() + if (token.type == TokenType.EOF) { + throw ParseException("Unexpected EOF while parsing") + } + + checkType(token, tokenType) + return token + } + + /** + * Advance to the next token. + */ + private fun nextToken(): Token { + return lexer.nextToken() + } + + /** + * Peek at the next token. + */ + private fun peekToken(): Token { + return lexer.peek() + } + + private fun checkNotNull(token: Any?, message: String) { + if (token == null) { + throw ParseException(message) + } + } + + private fun checkType(token: Token, type: TokenType) { + if (token.type == type) { + return + } + + throw ParseException("Unexpected ${token.errDesc()}, expected: $type") + } + + class ParseException(message: String) : RuntimeException(message) +} \ No newline at end of file diff --git a/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/utils/JavaIOReplacements.kt b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/utils/JavaIOReplacements.kt new file mode 100644 index 000000000..577a639e9 --- /dev/null +++ b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/utils/JavaIOReplacements.kt @@ -0,0 +1,63 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +package com.itsaky.androidide.desugaring.utils + +import com.itsaky.androidide.desugaring.core.java.io.DesugarInputStream +import com.itsaky.androidide.desugaring.dsl.DesugarReplacementsContainer +import java.io.InputStream +import kotlin.reflect.jvm.javaMethod + +/** + * Replacements for the `java.io` package. + * + * @author Akash Yadav + */ +object JavaIOReplacements { + + /** + * Apply replacements for the `java.io` package. + */ + fun DesugarReplacementsContainer.applyJavaIOReplacements() { + replaceMethod( + InputStream::class.java.getDeclaredMethod("readNBytes", Int::class.java), + DesugarInputStream::class.java.getDeclaredMethod("readNBytes", + InputStream::class.java, Int::class.java) + ) + + replaceMethod( + InputStream::class.java.getDeclaredMethod( + "readNBytes", + ByteArray::class.java, + Int::class.java, + Int::class.java + ), + DesugarInputStream::class.java.getDeclaredMethod( + "readNBytes", + InputStream::class.java, + ByteArray::class.java, + Int::class.java, + Int::class.java + ) + ) + + replaceMethod( + InputStream::readAllBytes.javaMethod!!, + DesugarInputStream::readAllBytes.javaMethod!! + ) + } +} \ No newline at end of file diff --git a/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/utils/ReflectionUtils.kt b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/utils/ReflectionUtils.kt new file mode 100644 index 000000000..15b780fb4 --- /dev/null +++ b/composite-builds/build-logic/desugaring/src/main/java/com/itsaky/androidide/desugaring/utils/ReflectionUtils.kt @@ -0,0 +1,88 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +package com.itsaky.androidide.desugaring.utils + +import java.lang.reflect.Method +import java.lang.reflect.Modifier + +/** + * Utility methods for reflective accesses. + * + * @author Akash Yadav + */ +object ReflectionUtils { + + /** + * Returns the descriptor for the given method. + */ + @JvmStatic + fun describe(method: Method): String { + val desc = StringBuilder(64) + desc.append('(') + for (paramType in method.parameterTypes) { + desc.append(describe(paramType)) + } + desc.append(')') + if (method.returnType != Void.TYPE) { + desc.append(describe(method.returnType)) + } else { + desc.append("V") + } + return desc.toString() + } + + /** + * Returns the binary name of the given class. + */ + fun describe(clazz: Class<*>): String { + if (clazz.isArray) { + // clazz.name returns the binary name + return clazz.name.replace('.', '/') + } + + return when (clazz) { + Byte::class.java -> "B" + Short::class.java -> "S" + Char::class.java -> "C" + Int::class.java -> "I" + Long::class.java -> "J" + Float::class.java -> "F" + Double::class.java -> "D" + Boolean::class.java -> "Z" + else -> "L${clazz.name.replace('.', '/')};" + } + } + + fun validateVirtualToStaticReplacement(source: Method, target: Method) { + if (Modifier.isStatic(source.modifiers)) { + throw IllegalArgumentException("Source method is static") + } + + if (!Modifier.isStatic(target.modifiers)) { + throw IllegalArgumentException("Target method is not static") + } + + if (target.parameterTypes.isEmpty()) { + throw IllegalArgumentException("Target method has no parameters") + } + + if (!target.parameterTypes[0].equals(source.declaringClass)) { + throw IllegalArgumentException("Target method's first parameter type must be source method's declaring class") + } + } +} \ No newline at end of file diff --git a/composite-builds/build-logic/desugaring/src/test/java/com/itsaky/androidide/desugaring/parsing/InsnLexerTest.kt b/composite-builds/build-logic/desugaring/src/test/java/com/itsaky/androidide/desugaring/parsing/InsnLexerTest.kt new file mode 100644 index 000000000..b08e6b0b7 --- /dev/null +++ b/composite-builds/build-logic/desugaring/src/test/java/com/itsaky/androidide/desugaring/parsing/InsnLexerTest.kt @@ -0,0 +1,150 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +package com.itsaky.androidide.desugaring.parsing + +import com.google.common.truth.Truth.assertThat +import com.itsaky.androidide.desugaring.internal.parsing.InsnLexer +import com.itsaky.androidide.desugaring.internal.parsing.InsnLexer.Token +import com.itsaky.androidide.desugaring.internal.parsing.InsnLexer.TokenType +import com.itsaky.androidide.desugaring.internal.parsing.InsnParser +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.JUnit4 + +/** + * Tests for the [InsnParser]. + * + * @author Akash Yadav + */ +@RunWith(JUnit4::class) +class InsnLexerTest { + + @Test + fun `tokenizes empty input`() { + val lexer = InsnLexer("") + assertThat(lexer.all()).isEmpty() + } + + @Test + fun `tokenizes single identifier`() { + val lexer = InsnLexer("myIdentifier") + assertThat(lexer.all()).containsExactly( + Token(0, 0, 0, TokenType.IDENTIFIER, "myIdentifier")) + } + + @Test + fun `tokenizes multiple identifiers`() { + val lexer = InsnLexer("if else for") + assertThat(lexer.all()).containsExactly( + Token(0, 0, 0, TokenType.IDENTIFIER, "if"), + Token(0, 3, 3, TokenType.IDENTIFIER, "else"), + Token(0, 8, 8, TokenType.IDENTIFIER, "for")) + } + + @Test + fun `tokenizes known symbols`() { + val lexer = InsnLexer("()[/;=>-") + assertThat(lexer.all()).containsExactly( + Token(0, 0, 0, TokenType.LPAR, "("), + Token(0, 1, 1, TokenType.RPAR, ")"), + Token(0, 2, 2, TokenType.LBRAC, "["), + Token(0, 3, 3, TokenType.SLASH, "/"), + Token(0, 4, 4, TokenType.SEMICOLON, ";"), + Token(0, 5, 5, TokenType.EQUALS, "="), + Token(0, 6, 6, TokenType.RANGULAR, ">"), + Token(0, 7, 7, TokenType.HYPHEN, "-"), + ) + } + + @Test + fun `ignores whitespaces`() { + val lexer = InsnLexer(" \t ") + assertThat(lexer.all()).isEmpty() + } + + @Test + fun `skips comments`() { + val lexer = InsnLexer("# This is a comment\nname") + assertThat(lexer.all()).containsExactly( + Token(1, 0, 20, TokenType.IDENTIFIER, "name"), + ) + } + + @Test + fun `tracks lines, columns and indices`() { + val lexer = InsnLexer("foo\nbar\nbaz") + assertThat(lexer.all()).containsExactly( + Token(0, 0, 0, TokenType.IDENTIFIER, "foo"), + Token(1, 0, 4, TokenType.IDENTIFIER, "bar"), + Token(2, 0, 8, TokenType.IDENTIFIER, "baz"), + ) + } + + @Test + fun `handles unknown characters`() { + val lexer = InsnLexer("foo@bar") + assertThat(lexer.all()).containsExactly( + Token(0, 0, 0, TokenType.IDENTIFIER, "foo"), + Token(0, 3, 3, TokenType.UNKNOWN, "@"), + Token(0, 4, 4, TokenType.IDENTIFIER, "bar"), + ) + } + + @Test + fun `test simple method invocation instruction tokenization`() { + val instruction = """ + invoke-virtual Ljava/io/InputStream;->readNBytes(I)[B + => + invoke-static Lcom/itsaky/androidide/desugaring/sample/java/io/DesugaredInputStream;->readNBytes([Ljava/io/InputStream;I)V + ;; + """.trimIndent() + + val lexer = InsnLexer(instruction) + val tokens = lexer.all() + + assertThat(tokens).isNotEmpty() + assertThat( + tokens.find { it.type == TokenType.UNKNOWN || it == Token.EOF }).isNull() + } + + @Test + fun `test tokenization for simple instruction with comments`() { + val instruction = + "# comment\ninvoke-static Lcom/itsaky/androidide/desugaring/sample/java/io/DesugaredInputStream;->readNBytes([Ljava/io/InputStream;I)V" + + val lexer = InsnLexer(instruction) + val tokens = lexer.all() + + assertThat(tokens).isNotEmpty() + assertThat( + tokens.find { it.type == TokenType.UNKNOWN || it == Token.EOF }).isNull() + } + + @Test + fun `test tokenization for simple instruction with comments and CRLF line terminator`() { + val instruction = + "# comment\r\ninvoke-static Lcom/itsaky/androidide/desugaring/sample/java/io/DesugaredInputStream;->readNBytes([Ljava/io/InputStream;I)V" + + val lexer = InsnLexer(instruction) + val tokens = lexer.all() + + assertThat(tokens).isNotEmpty() + assertThat( + tokens.find { it.type == TokenType.UNKNOWN || it == Token.EOF }).isNull() + } +} \ No newline at end of file diff --git a/composite-builds/build-logic/desugaring/src/test/java/com/itsaky/androidide/desugaring/parsing/InsnParserTest.kt b/composite-builds/build-logic/desugaring/src/test/java/com/itsaky/androidide/desugaring/parsing/InsnParserTest.kt new file mode 100644 index 000000000..9b1175daf --- /dev/null +++ b/composite-builds/build-logic/desugaring/src/test/java/com/itsaky/androidide/desugaring/parsing/InsnParserTest.kt @@ -0,0 +1,340 @@ +package com.itsaky.androidide.desugaring.parsing + +import com.google.common.truth.Truth.assertThat +import com.itsaky.androidide.desugaring.dsl.MethodOpcode +import com.itsaky.androidide.desugaring.internal.parsing.InsnLexer +import com.itsaky.androidide.desugaring.internal.parsing.InsnParser +import com.itsaky.androidide.desugaring.internal.parsing.InsnParser.ParseException +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.JUnit4 + +/** + * @author Akash Yadav + */ +@RunWith(JUnit4::class) +class InsnParserTest { + + @Test + fun `test empty input`() { + val insnStr = "" + val parser = InsnParser(InsnLexer(insnStr)) + val insns = parser.parse() + + assertThat(insns).isEmpty() + } + + @Test + fun `test basic types`() { + val insnStr = """ + invoke-virtual Ljava/lang/String;->length()I + => + invoke-static Lcom/itsaky/androidide/desugaring/sample/java/lang/DesugaredString;->length(Ljava/lang/String;)I + ;; + """.trimIndent() + + val parser = InsnParser(InsnLexer(insnStr)) + val insns = parser.parse() + + assertThat(insns[0].methodDescriptor).isEqualTo("()I") + assertThat(insns[0].toMethodDescriptor).isEqualTo("(Ljava/lang/String;)I") + + val insnStr2 = """ + invoke-virtual Ljava/lang/String;->charAt(I)C + => + invoke-static Lcom/itsaky/androidide/desugaring/sample/java/lang/DesugaredString;->charAt(Ljava/lang/String;I)C + ;; + """.trimIndent() + + val parser2 = InsnParser(InsnLexer(insnStr2)) + val insns2 = parser2.parse() + + assertThat(insns2[0].methodDescriptor).isEqualTo("(I)C") + assertThat(insns2[0].toMethodDescriptor).isEqualTo("(Ljava/lang/String;I)C") + } + + @Test + fun `test reference types`() { + val insnStr = """ + invoke-virtual Ljava/lang/Object;->clone()Ljava/lang/Object; + => + invoke-static Lcom/itsaky/androidide/desugaring/sample/java/lang/DesugaredObject;->clone(Ljava/lang/Object;)Ljava/lang/Object; + ;; + """.trimIndent() + + val parser = InsnParser(InsnLexer(insnStr)) + val insns = parser.parse() + + assertThat(insns[0].methodDescriptor).isEqualTo("()Ljava/lang/Object;") + assertThat(insns[0].toMethodDescriptor).isEqualTo("(Ljava/lang/Object;)Ljava/lang/Object;") + + val insnStr2 = """ + invoke-virtual Ljava/lang/String;->concat(Ljava/lang/String;)Ljava/lang/String; + => + invoke-static Lcom/itsaky/androidide/desugaring/sample/java/lang/DesugaredString;->concat(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ;; + """.trimIndent() + + val parser2 = InsnParser(InsnLexer(insnStr2)) + val insns2 = parser2.parse() + + assertThat(insns2[0].methodDescriptor).isEqualTo("(Ljava/lang/String;)Ljava/lang/String;") + assertThat(insns2[0].toMethodDescriptor).isEqualTo("(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String;") + } + + @Test + fun `test single-dimensional arrays`() { + val insnStr = """ + invoke-virtual Ljava/lang/String;->someArr()[I + => + invoke-static Lcom/itsaky/androidide/desugaring/sample/java/lang/DesugaredArrays;->someArr([I)I + ;; + """.trimIndent() + + val parser = InsnParser(InsnLexer(insnStr)) + val insns = parser.parse() + + assertThat(insns[0].methodDescriptor).isEqualTo("()[I") + assertThat(insns[0].toMethodDescriptor).isEqualTo("([I)I") + + val insnStr2 = """ + invoke-static Ljava/util/Arrays;->sort([I)V + => + invoke-static Lcom/itsaky/androidide/desugaring/sample/java/util/DesugaredArrays;->sort([I)V + ;; + """.trimIndent() + + val parser2 = InsnParser(InsnLexer(insnStr2)) + val insns2 = parser2.parse() + + assertThat(insns2[0].methodDescriptor).isEqualTo("([I)V") + assertThat(insns2[0].toMethodDescriptor).isEqualTo("([I)V") + } + + @Test + fun `test multi-dimensional arrays`() { + val insnStr = """ + invoke-virtual Ljava/lang/String;->length()I + => + invoke-static Lcom/itsaky/androidide/desugaring/sample/java/lang/DesugaredArrays;->length([[I)I + ;; + """.trimIndent() + + val parser = InsnParser(InsnLexer(insnStr)) + val insns = parser.parse() + + assertThat(insns[0].methodDescriptor).isEqualTo("()I") + assertThat(insns[0].toMethodDescriptor).isEqualTo("([[I)I") + + val insnStr2 = """ + invoke-static Ljava/util/Arrays;->deepEquals([[I)V + => + invoke-static Lcom/itsaky/androidide/desugaring/sample/java/util/DesugaredArrays;->deepEquals([[I)V + ;; + """.trimIndent() + + val parser2 = InsnParser(InsnLexer(insnStr2)) + val insns2 = parser2.parse() + + assertThat(insns2[0].methodDescriptor).isEqualTo("([[I)V") + assertThat(insns2[0].toMethodDescriptor).isEqualTo("([[I)V") + } + + @Test + fun `test array of reference types`() { + val insnStr = """ + invoke-virtual Ljava/lang/String;->clone()Ljava/lang/Object; + => + invoke-static Lcom/itsaky/androidide/desugaring/sample/java/lang/DesugaredObject;->clone([Ljava/lang/String;)Ljava/lang/Object; + ;; + """.trimIndent() + + val parser = InsnParser(InsnLexer(insnStr)) + val insns = parser.parse() + + assertThat(insns[0].methodDescriptor).isEqualTo("()Ljava/lang/Object;") + assertThat(insns[0].toMethodDescriptor).isEqualTo("([Ljava/lang/String;)Ljava/lang/Object;") + + val insnStr2 = """ + invoke-static Ljava/util/Arrays;->asList([Ljava/lang/String;)Ljava/util/List; + => + invoke-static Lcom/itsaky/androidide/desugaring/sample/java/util/DesugaredArrays;->asList([Ljava/lang/String;)Ljava/util/List; + ;; + """.trimIndent() + + val parser2 = InsnParser(InsnLexer(insnStr2)) + val insns2 = parser2.parse() + + assertThat(insns2[0].methodDescriptor).isEqualTo("([Ljava/lang/String;)Ljava/util/List;") + assertThat(insns2[0].toMethodDescriptor).isEqualTo("([Ljava/lang/String;)Ljava/util/List;") + } + + @Test + fun `test primitive arrays as method parameters`() { + val insnStr = """ + invoke-static Ljava/lang/Math;->max([I)I + => + invoke-static Lcom/itsaky/androidide/desugaring/sample/java/lang/DesugaredMath;->max([I)I + ;; + """.trimIndent() + + val parser = InsnParser(InsnLexer(insnStr)) + val insns = parser.parse() + + assertThat(insns[0].methodDescriptor).isEqualTo("([I)I") + assertThat(insns[0].toMethodDescriptor).isEqualTo("([I)I") + + val insnStr2 = """ + invoke-virtual Ljava/lang/String;->toCharArray()[C + => + invoke-static Lcom/itsaky/androidide/desugaring/sample/java/lang/DesugaredString;->toCharArray(Ljava/lang/String;)[C + ;; + """.trimIndent() + + val parser2 = InsnParser(InsnLexer(insnStr2)) + val insns2 = parser2.parse() + + assertThat(insns2[0].methodDescriptor).isEqualTo("()[C") + assertThat(insns2[0].toMethodDescriptor).isEqualTo("(Ljava/lang/String;)[C") + } + + + @Test + fun `test invalid opcode`() { + val insnStr = """ + invalid-opcode Ljava/lang/Object;->toString()Ljava/lang/String; + => + invoke-static Ljava/lang/Object;->toString()Ljava/lang/String; + ;; + """.trimIndent() + + val parser = InsnParser(InsnLexer(insnStr)) + assertThrows { parser.parse() } + } + + @Test + fun `test invalid class name`() { + val insnStr = """ + invoke-virtual LInvalid.ClassName;->invalidMethod()V + => + invoke-static LSomeOther..Class;->validMethod()V + ;; + """.trimIndent() + + val parser = InsnParser(InsnLexer(insnStr)) + assertThrows { parser.parse() } + } + + @Test + fun `test invalid method descriptor`() { + val insnStr = """ + invoke-virtual Ljava/lang/Object;->toString(InvalidDesc)V + => + invoke-static Ljava/lang/Object;->toString()Ljava/lang/String; + ;; + """.trimIndent() + + val parser = InsnParser(InsnLexer(insnStr)) + assertThrows { parser.parse() } + } + + @Test + fun `test missing semicolons`() { + val insnStr = """ + invoke-virtual Ljava/lang/Object;->toString()Ljava/lang/String; + => + invoke-static Ljava/lang/Object;->toString()Ljava/lang/String; + """.trimIndent() + + val parser = InsnParser(InsnLexer(insnStr)) + assertThrows { parser.parse() } + } + + @Test + fun `test extra semicolons`() { + val insnStr = """ + invoke-virtual Ljava/lang/Object;->toString()Ljava/lang/String;; + => + invoke-static Ljava/lang/Object;->toString()Ljava/lang/String;; + ;; + """.trimIndent() + + val parser = InsnParser(InsnLexer(insnStr)) + assertThrows { parser.parse() } + } + + @Test + fun `test simple instruction parse`() { + val insnStr = """ + invoke-virtual Ljava/io/InputStream;->readNBytes(I)[B + => + invoke-static Lcom/itsaky/androidide/desugaring/sample/java/io/DesugaredInputStream;->readNBytes(Ljava/io/InputStream;I)V + ;; + """.trimIndent() + + val parser = InsnParser(InsnLexer(insnStr)) + val insns = parser.parse() + + assertThat(insns).isNotNull() + assertThat(insns).hasSize(1) + + val insn = insns[0] + + assertThat(insn).isNotNull() + assertThat(insn.requireOpcode).isEqualTo(MethodOpcode.INVOKEVIRTUAL) + assertThat(insn.fromClass).isEqualTo("java.io.InputStream") + assertThat(insn.methodName).isEqualTo("readNBytes") + assertThat(insn.methodDescriptor).isEqualTo("(I)[B") + assertThat(insn.toOpcode).isEqualTo(MethodOpcode.INVOKESTATIC) + assertThat(insn.toClass).isEqualTo( + "com.itsaky.androidide.desugaring.sample.java.io.DesugaredInputStream") + assertThat(insn.toMethod).isEqualTo("readNBytes") + assertThat(insn.toMethodDescriptor).isEqualTo("(Ljava/io/InputStream;I)V") + } + + @Test + fun `test parsing multiple instructions`() { + val insnStr = """ + invoke-virtual Ljava/io/InputStream;->readNBytes(I)[B + => + invoke-static Lcom/itsaky/androidide/desugaring/sample/java/io/DesugaredInputStream;->readNBytes([Ljava/io/InputStream;I)V + ;; + invoke-static Ljava/lang/Math;->random()D + => + invoke-static Lcom/itsaky/androidide/desugaring/sample/java/util/DesugaredMath;->random()D + ;; + """.trimIndent() + + val parser = InsnParser(InsnLexer(insnStr)) + val insns = parser.parse() + + assertThat(insns).hasSize(2) + + insns[0].also { insn -> + assertThat(insn).isNotNull() + assertThat(insn.requireOpcode).isEqualTo(MethodOpcode.INVOKEVIRTUAL) + assertThat(insn.fromClass).isEqualTo("java.io.InputStream") + assertThat(insn.methodName).isEqualTo("readNBytes") + assertThat(insn.methodDescriptor).isEqualTo("(I)[B") + assertThat(insn.toOpcode).isEqualTo(MethodOpcode.INVOKESTATIC) + assertThat(insn.toClass).isEqualTo( + "com.itsaky.androidide.desugaring.sample.java.io.DesugaredInputStream") + assertThat(insn.toMethod).isEqualTo("readNBytes") + assertThat(insn.toMethodDescriptor).isEqualTo( + "([Ljava/io/InputStream;I)V") + } + + insns[1].also { insn -> + assertThat(insn).isNotNull() + assertThat(insn.requireOpcode).isEqualTo(MethodOpcode.INVOKESTATIC) + assertThat(insn.fromClass).isEqualTo("java.lang.Math") + assertThat(insn.methodName).isEqualTo("random") + assertThat(insn.methodDescriptor).isEqualTo("()D") + assertThat(insn.toOpcode).isEqualTo(MethodOpcode.INVOKESTATIC) + assertThat(insn.toClass).isEqualTo( + "com.itsaky.androidide.desugaring.sample.java.util.DesugaredMath") + assertThat(insn.toMethod).isEqualTo("random") + assertThat(insn.toMethodDescriptor).isEqualTo("()D") + } + } +} diff --git a/composite-builds/build-logic/desugaring/src/test/java/com/itsaky/androidide/desugaring/parsing/utilExts.kt b/composite-builds/build-logic/desugaring/src/test/java/com/itsaky/androidide/desugaring/parsing/utilExts.kt new file mode 100644 index 000000000..6d5b4acd1 --- /dev/null +++ b/composite-builds/build-logic/desugaring/src/test/java/com/itsaky/androidide/desugaring/parsing/utilExts.kt @@ -0,0 +1,5 @@ +package com.itsaky.androidide.desugaring.parsing + +internal inline fun assertThrows(crossinline throwingAction: () -> Unit) { + org.junit.Assert.assertThrows(ExceptionT::class.java) { throwingAction() } +} \ No newline at end of file diff --git a/composite-builds/build-logic/desugaring/src/test/java/com/itsaky/androidide/desugaring/utils/Methods.java b/composite-builds/build-logic/desugaring/src/test/java/com/itsaky/androidide/desugaring/utils/Methods.java new file mode 100644 index 000000000..f54ab8197 --- /dev/null +++ b/composite-builds/build-logic/desugaring/src/test/java/com/itsaky/androidide/desugaring/utils/Methods.java @@ -0,0 +1,78 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +package com.itsaky.androidide.desugaring.utils; + +/** + * @author Akash Yadav + */ +@SuppressWarnings("unused") +public class Methods { + + public static void primitive(byte a, short b, int c, long d, float e, double f, char g, boolean h + ) { + } + + public static void array(byte[] a, short[] b, int[] c, long[] d, float[] e, double[] f, char[] g, + boolean[] h + ) { + } + + public static void nested(byte[][] a, short[][] b, int[][] c, long[][] d, float[][] e, + double[][] f, char[][] g, boolean[][] h + ) { + } + + public static void references(Byte a, Short b, Integer c, Long d, Float e, Double f, Character g, + Boolean h + ) { + } + + public static void referenceArrays(Byte[] a, Short[] b, Integer[] c, Long[] d, Float[] e, + Double[] f, Character[] g, Boolean[] h + ) { + } + + public static void referenceNested(Byte[][] a, Short[][] b, Integer[][] c, Long[][] d, + Float[][] e, Double[][] f, Character[][] g, Boolean[][] h + ) { + } + + public static byte returnsPrimitive() { + return 0; + } + + public static byte[] returnsArray() { + return null; + } + + public static byte[][] returnsNested() { + return null; + } + + public static Byte returnsReference() { + return null; + } + + public static Byte[] returnsReferenceArray() { + return null; + } + + public static Byte[][] returnsReferenceNested() { + return null; + } +} diff --git a/composite-builds/build-logic/desugaring/src/test/java/com/itsaky/androidide/desugaring/utils/ReflectionUtilsTest.kt b/composite-builds/build-logic/desugaring/src/test/java/com/itsaky/androidide/desugaring/utils/ReflectionUtilsTest.kt new file mode 100644 index 000000000..c54a36981 --- /dev/null +++ b/composite-builds/build-logic/desugaring/src/test/java/com/itsaky/androidide/desugaring/utils/ReflectionUtilsTest.kt @@ -0,0 +1,95 @@ +/* + * This file is part of AndroidIDE. + * + * AndroidIDE is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * AndroidIDE is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with AndroidIDE. If not, see . + */ + +package com.itsaky.androidide.desugaring.utils + +import com.google.common.truth.Truth.assertThat +import org.junit.Test +import org.junit.runner.RunWith +import org.junit.runners.JUnit4 +import kotlin.reflect.jvm.javaMethod + +/** + * @author Akash Yadav + */ +@RunWith(JUnit4::class) +class ReflectionUtilsTest { + + @Test + fun `test primitive type descriptions`() { + assertThat(ReflectionUtils.describe(Methods::primitive.javaMethod!!)).isEqualTo( + "(BSIJFDCZ)V") + assertThat( + ReflectionUtils.describe(Methods::returnsPrimitive.javaMethod!!)).isEqualTo( + "()B") + } + + @Test + fun `test primitive array descriptions`() { + assertThat(ReflectionUtils.describe(Methods::array.javaMethod!!)).isEqualTo( + "([B[S[I[J[F[D[C[Z)V") + assertThat(ReflectionUtils.describe(Methods::nested.javaMethod!!)).isEqualTo( + "([[B[[S[[I[[J[[F[[D[[C[[Z)V") + } + + @Test + fun `test primitive array return type descriptions`() { + assertThat( + ReflectionUtils.describe(Methods::returnsArray.javaMethod!!)).isEqualTo( + "()[B") + assertThat( + ReflectionUtils.describe(Methods::returnsNested.javaMethod!!)).isEqualTo( + "()[[B") + } + + @Test + fun `test object type return type descriptions`() { + assertThat( + ReflectionUtils.describe(Methods::returnsReference.javaMethod!!)).isEqualTo( + "()Ljava/lang/Byte;") + } + + @Test + fun `test object array return type descriptions`() { + assertThat(ReflectionUtils.describe( + Methods::returnsReferenceArray.javaMethod!!)).isEqualTo( + "()[Ljava/lang/Byte;") + assertThat(ReflectionUtils.describe( + Methods::returnsReferenceNested.javaMethod!!)).isEqualTo( + "()[[Ljava/lang/Byte;") + } + + @Test + fun `test object type descriptions`() { + assertThat( + ReflectionUtils.describe(Methods::references.javaMethod!!)).isEqualTo( + "(Ljava/lang/Byte;Ljava/lang/Short;Ljava/lang/Integer;Ljava/lang/Long;Ljava/lang/Float;Ljava/lang/Double;Ljava/lang/Character;Ljava/lang/Boolean;)V") + assertThat( + ReflectionUtils.describe(Methods::returnsReference.javaMethod!!)).isEqualTo( + "()Ljava/lang/Byte;") + } + + @Test + fun `test object array descriptions`() { + assertThat( + ReflectionUtils.describe(Methods::referenceArrays.javaMethod!!)).isEqualTo( + "([Ljava/lang/Byte;[Ljava/lang/Short;[Ljava/lang/Integer;[Ljava/lang/Long;[Ljava/lang/Float;[Ljava/lang/Double;[Ljava/lang/Character;[Ljava/lang/Boolean;)V") + assertThat( + ReflectionUtils.describe(Methods::referenceNested.javaMethod!!)).isEqualTo( + "([[Ljava/lang/Byte;[[Ljava/lang/Short;[[Ljava/lang/Integer;[[Ljava/lang/Long;[[Ljava/lang/Float;[[Ljava/lang/Double;[[Ljava/lang/Character;[[Ljava/lang/Boolean;)V") + } +} \ No newline at end of file diff --git a/build-logic/gradle.properties b/composite-builds/build-logic/gradle.properties similarity index 100% rename from build-logic/gradle.properties rename to composite-builds/build-logic/gradle.properties diff --git a/build-logic/gradle/wrapper/gradle-wrapper.jar b/composite-builds/build-logic/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from build-logic/gradle/wrapper/gradle-wrapper.jar rename to composite-builds/build-logic/gradle/wrapper/gradle-wrapper.jar diff --git a/build-logic/gradle/wrapper/gradle-wrapper.properties b/composite-builds/build-logic/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from build-logic/gradle/wrapper/gradle-wrapper.properties rename to composite-builds/build-logic/gradle/wrapper/gradle-wrapper.properties diff --git a/build-logic/plugins/.gitignore b/composite-builds/build-logic/plugins/.gitignore similarity index 100% rename from build-logic/plugins/.gitignore rename to composite-builds/build-logic/plugins/.gitignore diff --git a/build-logic/plugins/build.gradle.kts b/composite-builds/build-logic/plugins/build.gradle.kts similarity index 97% rename from build-logic/plugins/build.gradle.kts rename to composite-builds/build-logic/plugins/build.gradle.kts index 5de9fc832..71f4e164a 100644 --- a/build-logic/plugins/build.gradle.kts +++ b/composite-builds/build-logic/plugins/build.gradle.kts @@ -33,6 +33,7 @@ tasks.withType { dependencies { implementation(projects.buildLogic.common) + implementation(projects.buildLogic.desugaring) implementation(projects.buildLogic.propertiesParser) implementation("com.android.tools.build:gradle:${libs.versions.agp.asProvider().get()}") diff --git a/build-logic/plugins/src/main/java/build-logic.root-project.gradle.kts b/composite-builds/build-logic/plugins/src/main/java/build-logic.root-project.gradle.kts similarity index 100% rename from build-logic/plugins/src/main/java/build-logic.root-project.gradle.kts rename to composite-builds/build-logic/plugins/src/main/java/build-logic.root-project.gradle.kts diff --git a/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/AndroidIDEAssetsPlugin.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/AndroidIDEAssetsPlugin.kt similarity index 100% rename from build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/AndroidIDEAssetsPlugin.kt rename to composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/AndroidIDEAssetsPlugin.kt diff --git a/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/AndroidIDEPlugin.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/AndroidIDEPlugin.kt similarity index 100% rename from build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/AndroidIDEPlugin.kt rename to composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/AndroidIDEPlugin.kt diff --git a/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/LexerGeneratorPlugin.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/LexerGeneratorPlugin.kt similarity index 100% rename from build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/LexerGeneratorPlugin.kt rename to composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/LexerGeneratorPlugin.kt diff --git a/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/PropertiesParserPlugin.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/PropertiesParserPlugin.kt similarity index 100% rename from build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/PropertiesParserPlugin.kt rename to composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/PropertiesParserPlugin.kt diff --git a/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/SigningConfigPlugin.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/SigningConfigPlugin.kt similarity index 100% rename from build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/SigningConfigPlugin.kt rename to composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/SigningConfigPlugin.kt diff --git a/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/TerminalBootstrapPackagesPlugin.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/TerminalBootstrapPackagesPlugin.kt similarity index 100% rename from build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/TerminalBootstrapPackagesPlugin.kt rename to composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/TerminalBootstrapPackagesPlugin.kt diff --git a/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/AndroidModuleConf.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/AndroidModuleConf.kt similarity index 95% rename from build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/AndroidModuleConf.kt rename to composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/AndroidModuleConf.kt index 9f1a8d27f..9e77824f8 100644 --- a/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/AndroidModuleConf.kt +++ b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/AndroidModuleConf.kt @@ -29,7 +29,8 @@ import com.itsaky.androidide.build.config.isFDroidBuild import com.itsaky.androidide.build.config.projectVersionCode import com.itsaky.androidide.plugins.util.SdkUtils.getAndroidJar import org.gradle.api.Project -import org.gradle.api.artifacts.Dependency +import org.gradle.api.artifacts.MinimalExternalModuleDependency +import org.gradle.api.provider.Provider /** * ABIs for which the product flavors will be created. @@ -44,7 +45,7 @@ internal val flavorsAbis = mapOf("armeabi-v7a" to 1, "arm64-v8a" to 2, "x86_64" private val disableCoreLibDesugaringForModules = arrayOf(":logsender", ":logger") fun Project.configureAndroidModule( - coreLibDesugDep: Dependency + coreLibDesugDep: Provider ) { assert( plugins.hasPlugin("com.android.application") || plugins.hasPlugin("com.android.library")) { @@ -188,14 +189,12 @@ fun Project.configureAndroidModule( } private fun Project.configureCoreLibDesugaring(baseExtension: BaseExtension, - coreLibDesugDep: Dependency) { + coreLibDesugDep: Provider) { val coreLibDesugaringEnabled = project.path !in disableCoreLibDesugaringForModules baseExtension.compileOptions.isCoreLibraryDesugaringEnabled = coreLibDesugaringEnabled if (coreLibDesugaringEnabled) { - configurations.getByName("coreLibraryDesugaring").apply { - dependencies.add(coreLibDesugDep) - } + project.dependencies.add("coreLibraryDesugaring", coreLibDesugDep) } } \ No newline at end of file diff --git a/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/JavaModuleConf.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/JavaModuleConf.kt similarity index 100% rename from build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/JavaModuleConf.kt rename to composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/JavaModuleConf.kt diff --git a/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/MavenPublishConf.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/MavenPublishConf.kt similarity index 100% rename from build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/MavenPublishConf.kt rename to composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/conf/MavenPublishConf.kt diff --git a/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/AddAndroidJarToAssetsTask.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/AddAndroidJarToAssetsTask.kt similarity index 100% rename from build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/AddAndroidJarToAssetsTask.kt rename to composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/AddAndroidJarToAssetsTask.kt diff --git a/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/AddFileToAssetsTask.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/AddFileToAssetsTask.kt similarity index 100% rename from build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/AddFileToAssetsTask.kt rename to composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/AddFileToAssetsTask.kt diff --git a/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/GenerateInitScriptTask.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/GenerateInitScriptTask.kt similarity index 100% rename from build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/GenerateInitScriptTask.kt rename to composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/GenerateInitScriptTask.kt diff --git a/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/GradleVersionResolver.java b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/GradleVersionResolver.java similarity index 100% rename from build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/GradleVersionResolver.java rename to composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/GradleVersionResolver.java diff --git a/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/GradleWrapperGeneratorTask.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/GradleWrapperGeneratorTask.kt similarity index 100% rename from build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/GradleWrapperGeneratorTask.kt rename to composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/GradleWrapperGeneratorTask.kt diff --git a/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/IDEWrapperGenerator.java b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/IDEWrapperGenerator.java similarity index 100% rename from build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/IDEWrapperGenerator.java rename to composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/IDEWrapperGenerator.java diff --git a/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/SetupAapt2Task.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/SetupAapt2Task.kt similarity index 100% rename from build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/SetupAapt2Task.kt rename to composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/SetupAapt2Task.kt diff --git a/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/internal/WrapperDefaults.java b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/internal/WrapperDefaults.java similarity index 100% rename from build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/internal/WrapperDefaults.java rename to composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/internal/WrapperDefaults.java diff --git a/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/internal/WrapperGenerator.java b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/internal/WrapperGenerator.java similarity index 100% rename from build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/internal/WrapperGenerator.java rename to composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/tasks/internal/WrapperGenerator.java diff --git a/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/util/DownloadUtils.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/util/DownloadUtils.kt similarity index 100% rename from build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/util/DownloadUtils.kt rename to composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/util/DownloadUtils.kt diff --git a/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/util/ELFUtils.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/util/ELFUtils.kt similarity index 100% rename from build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/util/ELFUtils.kt rename to composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/util/ELFUtils.kt diff --git a/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/util/SdkUtils.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/util/SdkUtils.kt similarity index 100% rename from build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/util/SdkUtils.kt rename to composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/util/SdkUtils.kt diff --git a/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/util/SigningKeyUtils.kt b/composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/util/SigningKeyUtils.kt similarity index 100% rename from build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/util/SigningKeyUtils.kt rename to composite-builds/build-logic/plugins/src/main/java/com/itsaky/androidide/plugins/util/SigningKeyUtils.kt diff --git a/composite-builds/build-logic/properties-parser/.gitignore b/composite-builds/build-logic/properties-parser/.gitignore new file mode 100644 index 000000000..42afabfd2 --- /dev/null +++ b/composite-builds/build-logic/properties-parser/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/build-logic/properties-parser/build.gradle.kts b/composite-builds/build-logic/properties-parser/build.gradle.kts similarity index 100% rename from build-logic/properties-parser/build.gradle.kts rename to composite-builds/build-logic/properties-parser/build.gradle.kts diff --git a/build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/PropertiesParser.java b/composite-builds/build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/PropertiesParser.java similarity index 100% rename from build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/PropertiesParser.java rename to composite-builds/build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/PropertiesParser.java diff --git a/build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/gen/ClassGenerator.java b/composite-builds/build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/gen/ClassGenerator.java similarity index 100% rename from build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/gen/ClassGenerator.java rename to composite-builds/build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/gen/ClassGenerator.java diff --git a/build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/parser/Message.java b/composite-builds/build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/parser/Message.java similarity index 100% rename from build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/parser/Message.java rename to composite-builds/build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/parser/Message.java diff --git a/build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/parser/MessageFile.java b/composite-builds/build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/parser/MessageFile.java similarity index 100% rename from build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/parser/MessageFile.java rename to composite-builds/build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/parser/MessageFile.java diff --git a/build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/parser/MessageInfo.java b/composite-builds/build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/parser/MessageInfo.java similarity index 100% rename from build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/parser/MessageInfo.java rename to composite-builds/build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/parser/MessageInfo.java diff --git a/build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/parser/MessageLine.java b/composite-builds/build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/parser/MessageLine.java similarity index 100% rename from build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/parser/MessageLine.java rename to composite-builds/build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/parser/MessageLine.java diff --git a/build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/parser/MessageType.java b/composite-builds/build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/parser/MessageType.java similarity index 100% rename from build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/parser/MessageType.java rename to composite-builds/build-logic/properties-parser/src/main/java/com/itsaky/androidide/build/propparser/parser/MessageType.java diff --git a/build-logic/settings.gradle.kts b/composite-builds/build-logic/settings.gradle.kts similarity index 77% rename from build-logic/settings.gradle.kts rename to composite-builds/build-logic/settings.gradle.kts index 7c01c9c9f..35869809f 100644 --- a/build-logic/settings.gradle.kts +++ b/composite-builds/build-logic/settings.gradle.kts @@ -20,19 +20,30 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") dependencyResolutionManagement { + + includeBuild("../build-deps-common") { + dependencySubstitution { + substitute(module("com.itsaky.androidide.build:desugaring-core")) + .using(project(":desugaring-core")) + } + } + repositories { google() mavenCentral() } + versionCatalogs { create("libs") { - from(files("../gradle/libs.versions.toml")) + from(files("../../gradle/libs.versions.toml")) } } } include( ":common", + ":desugaring", + ":desugaring-core", ":plugins", ":properties-parser" ) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d21b04bc2..2d4413484 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -22,6 +22,7 @@ maven-publish-plugin = "0.27.0" # Dependencies in composite build composite-appintro = { module = "com.itsaky.androidide.build:appintro" } +composite-desugaringCore = { module = "com.itsaky.androidide.build:desugaring-core" } composite-fuzzysearch = { module ="com.itsaky.androidide.build:fuzzysearch" } composite-googleJavaFormat = { module ="com.itsaky.androidide.build:google-java-format" } composite-javaCompiler = { module ="com.itsaky.androidide.build:java-compiler" } @@ -85,7 +86,7 @@ androidx-animated_vectors = { module = "androidx.vectordrawable:vectordrawable-a androidx-core = { module = "androidx.core:core", version = "1.12.0" } androidx-core-ktx = { module = "androidx.core:core-ktx", version = "1.12.0" } androidx-fragment_ktx = { module = "androidx.fragment:fragment-ktx", version = "1.6.2" } -androidx-lib_desugaring = { module = "com.android.tools:desugar_jdk_libs", version = "2.0.4" } +androidx-libDesugaring = { module = "com.android.tools:desugar_jdk_libs", version = "2.0.4" } androidx-splashscreen = { module = "androidx.core:core-splashscreen", version = "1.0.1" } androidx-transition = { module = "androidx.transition:transition-ktx", version = "1.4.1" } androidx-nav-fragment = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "androidx-navigation" } @@ -151,6 +152,7 @@ tooling-gradleApi = { module = "com.itsaky.androidide.gradle:gradle-tooling-api" tooling-slf4j = { module = "org.slf4j:slf4j-api", version = "2.0.12" } # Classpaths +android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "agp" } kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } nav-safe-args-gradle-plugin = { module = "androidx.navigation:navigation-safe-args-gradle-plugin", version.ref = "androidx-navigation" } maven-publish = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "maven-publish-plugin" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 902970712..5be6dd5a3 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -20,7 +20,10 @@ enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") pluginManagement { - includeBuild("build-logic") + includeBuild("composite-builds/build-logic") { + name = "build-logic" + } + repositories { gradlePluginPortal() google() @@ -29,22 +32,34 @@ pluginManagement { } dependencyResolutionManagement { - includeBuild("build-deps") { - dependencySubstitution { - for (module in arrayOf( - "appintro", - "fuzzysearch", - "google-java-format", - "java-compiler", - "javac", - "javapoet", - "jaxp", - "jdk-compiler", - "jdk-jdeps", - "jdt", - "layoutlib-api" - )) { - substitute(module("com.itsaky.androidide.build:$module")).using(project(":$module")) + val dependencySubstitutions = mapOf( + "build-deps" to arrayOf( + "appintro", + "fuzzysearch", + "google-java-format", + "java-compiler", + "javac", + "javapoet", + "jaxp", + "jdk-compiler", + "jdk-jdeps", + "jdt", + "layoutlib-api" + ), + + "build-deps-common" to arrayOf( + "desugaring-core" + ) + ) + + for ((build, modules) in dependencySubstitutions) { + includeBuild("composite-builds/${build}") { + this.name = "build" + dependencySubstitution { + for (module in modules) { + substitute(module("com.itsaky.androidide.build:${module}")) + .using(project(":${module}")) + } } } }