From 4a743b53713a15cb61dc29ed8f2679b3e92a13bb Mon Sep 17 00:00:00 2001 From: Sebastian Schuberth Date: Tue, 7 Mar 2023 18:53:45 +0100 Subject: [PATCH] build(Gradle): Move the Gradle package manager to its own plugin project This continues the effort started in be4bb69 to move plugin implementations, here for the Gradle package manager. See [1] for more context. This temporarily adds the `gradle-package-manager` project as a `funTest`-dependency because the `PubFunTest` relies on it. This will be addressed when also moving the Pub package manager plugin. [1]: https://github.com/oss-review-toolkit/ort/issues/6602 Signed-off-by: Sebastian Schuberth --- analyzer/build.gradle.kts | 3 +- ...viewtoolkit.analyzer.PackageManagerFactory | 1 - ...dencies-expected-result-with-curations.yml | 22 ++++---- cli/src/funTest/kotlin/OrtMainFunTest.kt | 2 +- plugins/package-managers/build.gradle.kts | 1 + .../package-managers/gradle/build.gradle.kts | 48 ++++++++++++++++++ ...dle-android-cyclic-expected-output-app.yml | 4 +- .../gradle-android-cyclic/.gitignore | 0 .../gradle-android-cyclic/app/build.gradle | 0 .../app/src/main/AndroidManifest.xml | 0 .../gradle-android-cyclic/build.gradle | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../synthetic/gradle-android-cyclic/gradlew | 0 .../gradle-android-cyclic/gradlew.bat | 0 .../gradle-android-cyclic/lib/build.gradle | 0 .../lib/src/main/AndroidManifest.xml | 0 .../gradle-android-cyclic/settings.gradle | 0 .../gradle-android-expected-output-app.yml | 4 +- .../gradle-android-expected-output-lib.yml | 4 +- .../gradle-android-expected-output-root.yml | 4 +- .../synthetic/gradle-android/.gitignore | 0 .../synthetic/gradle-android/app/build.gradle | 0 .../app/src/main/AndroidManifest.xml | 0 .../drawable-v24/ic_launcher_foreground.xml | 0 .../res/drawable/ic_launcher_background.xml | 0 .../app/src/main/res/layout/activity_main.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-hdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher_round.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin .../app/src/main/res/values/colors.xml | 0 .../app/src/main/res/values/strings.xml | 0 .../app/src/main/res/values/styles.xml | 0 .../synthetic/gradle-android/build.gradle | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../projects/synthetic/gradle-android/gradlew | 0 .../synthetic/gradle-android/gradlew.bat | 0 .../synthetic/gradle-android/lib/build.gradle | 0 .../lib/src/main/AndroidManifest.xml | 0 .../synthetic/gradle-android/settings.gradle | 0 .../synthetic/gradle-bom-expected-output.yml | 4 +- .../projects/synthetic/gradle-bom/.gitignore | 0 .../synthetic/gradle-bom/build.gradle | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../projects/synthetic/gradle-bom/gradlew | 0 .../projects/synthetic/gradle-bom/gradlew.bat | 0 .../synthetic/gradle-bom/settings.gradle | 0 .../gradle-composite-expected-output.yml | 4 +- .../project1/build.gradle.kts | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../gradle-composite/project1/gradlew | 0 .../gradle-composite/project1/gradlew.bat | 0 .../project1/settings.gradle.kts | 0 .../project2/build.gradle.kts | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../gradle-composite/project2/gradlew | 0 .../gradle-composite/project2/gradlew.bat | 0 .../project2/settings.gradle.kts | 0 .../project2/sub/build.gradle.kts | 0 .../gradle-expected-output-app-2.14.yml | 4 +- .../gradle-expected-output-app-3.4.yml | 4 +- .../synthetic/gradle-expected-output-app.yml | 4 +- ...radle-expected-output-lib-without-repo.yml | 4 +- .../synthetic/gradle-expected-output-lib.yml | 4 +- .../synthetic/gradle-expected-output-root.yml | 4 +- ...gradle-expected-output-scopes-excludes.yml | 4 +- ...le-expected-output-unsupported-version.yml | 4 +- .../gradle-library-expected-output-app.yml | 4 +- .../gradle-library-expected-output-lib.yml | 4 +- .../gradle-library-expected-output-root.yml | 4 +- .../synthetic/gradle-library/.gitignore | 0 .../synthetic/gradle-library/app/build.gradle | 0 .../synthetic/gradle-library/build.gradle | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../projects/synthetic/gradle-library/gradlew | 0 .../synthetic/gradle-library/gradlew.bat | 0 .../synthetic/gradle-library/lib/build.gradle | 0 .../synthetic/gradle-library/settings.gradle | 0 .../gradle-unsupported-version/.gitignore | 0 .../gradle-unsupported-version/build.gradle | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../gradle-unsupported-version/gradlew | 0 .../gradle-unsupported-version/gradlew.bat | 0 .../settings.gradle | 0 .../projects/synthetic/gradle/.gitignore | 0 .../assets/projects/synthetic/gradle/.ort.yml | 2 +- .../synthetic/gradle/app/build.gradle | 0 .../projects/synthetic/gradle/build.gradle | 0 .../gradle/gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../assets/projects/synthetic/gradle/gradlew | 0 .../projects/synthetic/gradle/gradlew.bat | 0 .../gradle/lib-without-repo/build.gradle | 0 .../synthetic/gradle/lib/build.gradle | 0 .../projects/synthetic/gradle/settings.gradle | 0 ...lti-kotlin-project-expected-output-cli.yml | 4 +- ...ti-kotlin-project-expected-output-core.yml | 4 +- ...ti-kotlin-project-expected-output-root.yml | 4 +- .../synthetic/multi-kotlin-project/README.md | 0 .../multi-kotlin-project/build.gradle.kts | 0 .../multi-kotlin-project/cli/build.gradle.kts | 0 .../cli/src/main/kotlin/cli/Main.kt | 0 .../core/build.gradle.kts | 0 .../core/src/main/kotlin/core/DeepThought.kt | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../synthetic/multi-kotlin-project/gradlew | 0 .../multi-kotlin-project/gradlew.bat | 0 .../multi-kotlin-project/settings.gradle.kts | 0 .../funTest/kotlin}/GradleAndroidFunTest.kt | 3 +- .../src/funTest/kotlin}/GradleBomFunTest.kt | 3 +- .../funTest/kotlin}/GradleCompositeFunTest.kt | 3 +- .../src/funTest/kotlin}/GradleFunTest.kt | 3 +- .../kotlin}/GradleKotlinScriptFunTest.kt | 3 +- .../funTest/kotlin}/GradleLibraryFunTest.kt | 3 +- .../gradle/src/main/kotlin}/Gradle.kt | 6 +-- .../kotlin}/utils/GradleDependencyHandler.kt | 4 +- .../src/main/kotlin}/utils/GradleSupport.kt | 0 ...viewtoolkit.analyzer.PackageManagerFactory | 1 + .../gradle/src/main/resources}/init.gradle | 0 .../utils/GradleDependencyHandlerTest.kt | 4 +- settings.gradle.kts | 2 + 137 files changed, 127 insertions(+), 67 deletions(-) create mode 100644 plugins/package-managers/gradle/build.gradle.kts rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android-cyclic-expected-output-app.yml (99%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android-cyclic/.gitignore (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android-cyclic/app/build.gradle (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android-cyclic/app/src/main/AndroidManifest.xml (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android-cyclic/build.gradle (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android-cyclic/gradle/wrapper/gradle-wrapper.jar (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android-cyclic/gradle/wrapper/gradle-wrapper.properties (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android-cyclic/gradlew (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android-cyclic/gradlew.bat (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android-cyclic/lib/build.gradle (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android-cyclic/lib/src/main/AndroidManifest.xml (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android-cyclic/settings.gradle (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android-expected-output-app.yml (99%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android-expected-output-lib.yml (98%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android-expected-output-root.yml (61%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/.gitignore (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/app/build.gradle (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/AndroidManifest.xml (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/drawable/ic_launcher_background.xml (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/layout/activity_main.xml (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/values/colors.xml (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/values/strings.xml (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/values/styles.xml (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/build.gradle (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/gradle/wrapper/gradle-wrapper.jar (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/gradle/wrapper/gradle-wrapper.properties (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/gradlew (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/gradlew.bat (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/lib/build.gradle (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/lib/src/main/AndroidManifest.xml (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-android/settings.gradle (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-bom-expected-output.yml (95%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-bom/.gitignore (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-bom/build.gradle (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-bom/gradle/wrapper/gradle-wrapper.jar (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-bom/gradle/wrapper/gradle-wrapper.properties (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-bom/gradlew (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-bom/gradlew.bat (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-bom/settings.gradle (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-composite-expected-output.yml (89%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-composite/project1/build.gradle.kts (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-composite/project1/gradle/wrapper/gradle-wrapper.jar (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-composite/project1/gradle/wrapper/gradle-wrapper.properties (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-composite/project1/gradlew (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-composite/project1/gradlew.bat (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-composite/project1/settings.gradle.kts (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-composite/project2/build.gradle.kts (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-composite/project2/gradle/wrapper/gradle-wrapper.jar (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-composite/project2/gradle/wrapper/gradle-wrapper.properties (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-composite/project2/gradlew (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-composite/project2/gradlew.bat (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-composite/project2/settings.gradle.kts (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-composite/project2/sub/build.gradle.kts (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-expected-output-app-2.14.yml (96%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-expected-output-app-3.4.yml (96%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-expected-output-app.yml (96%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-expected-output-lib-without-repo.yml (91%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-expected-output-lib.yml (97%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-expected-output-root.yml (59%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-expected-output-scopes-excludes.yml (96%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-expected-output-unsupported-version.yml (65%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-library-expected-output-app.yml (96%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-library-expected-output-lib.yml (97%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-library-expected-output-root.yml (57%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-library/.gitignore (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-library/app/build.gradle (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-library/build.gradle (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-library/gradle/wrapper/gradle-wrapper.jar (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-library/gradle/wrapper/gradle-wrapper.properties (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-library/gradlew (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-library/gradlew.bat (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-library/lib/build.gradle (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-library/settings.gradle (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-unsupported-version/.gitignore (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-unsupported-version/build.gradle (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-unsupported-version/gradle/wrapper/gradle-wrapper.jar (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-unsupported-version/gradle/wrapper/gradle-wrapper.properties (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-unsupported-version/gradlew (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-unsupported-version/gradlew.bat (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle-unsupported-version/settings.gradle (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle/.gitignore (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle/.ort.yml (85%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle/app/build.gradle (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle/build.gradle (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle/gradle/wrapper/gradle-wrapper.jar (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle/gradle/wrapper/gradle-wrapper.properties (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle/gradlew (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle/gradlew.bat (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle/lib-without-repo/build.gradle (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle/lib/build.gradle (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/gradle/settings.gradle (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-cli.yml (99%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-core.yml (98%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-root.yml (59%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/multi-kotlin-project/README.md (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/multi-kotlin-project/build.gradle.kts (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/multi-kotlin-project/cli/build.gradle.kts (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/multi-kotlin-project/cli/src/main/kotlin/cli/Main.kt (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/multi-kotlin-project/core/build.gradle.kts (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/multi-kotlin-project/core/src/main/kotlin/core/DeepThought.kt (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/multi-kotlin-project/gradle/wrapper/gradle-wrapper.jar (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/multi-kotlin-project/gradle/wrapper/gradle-wrapper.properties (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/multi-kotlin-project/gradlew (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/multi-kotlin-project/gradlew.bat (100%) rename {analyzer => plugins/package-managers/gradle}/src/funTest/assets/projects/synthetic/multi-kotlin-project/settings.gradle.kts (100%) rename {analyzer/src/funTest/kotlin/managers => plugins/package-managers/gradle/src/funTest/kotlin}/GradleAndroidFunTest.kt (97%) rename {analyzer/src/funTest/kotlin/managers => plugins/package-managers/gradle/src/funTest/kotlin}/GradleBomFunTest.kt (94%) rename {analyzer/src/funTest/kotlin/managers => plugins/package-managers/gradle/src/funTest/kotlin}/GradleCompositeFunTest.kt (94%) rename {analyzer/src/funTest/kotlin/managers => plugins/package-managers/gradle/src/funTest/kotlin}/GradleFunTest.kt (98%) rename {analyzer/src/funTest/kotlin/managers => plugins/package-managers/gradle/src/funTest/kotlin}/GradleKotlinScriptFunTest.kt (96%) rename {analyzer/src/funTest/kotlin/managers => plugins/package-managers/gradle/src/funTest/kotlin}/GradleLibraryFunTest.kt (96%) rename {analyzer/src/main/kotlin/managers => plugins/package-managers/gradle/src/main/kotlin}/Gradle.kt (98%) rename {analyzer/src/main/kotlin/managers => plugins/package-managers/gradle/src/main/kotlin}/utils/GradleDependencyHandler.kt (96%) rename {analyzer/src/main/kotlin/managers => plugins/package-managers/gradle/src/main/kotlin}/utils/GradleSupport.kt (100%) create mode 100644 plugins/package-managers/gradle/src/main/resources/META-INF/services/org.ossreviewtoolkit.analyzer.PackageManagerFactory rename {analyzer/src/main/resources/scripts => plugins/package-managers/gradle/src/main/resources}/init.gradle (100%) rename {analyzer/src/test/kotlin/managers => plugins/package-managers/gradle/src/test/kotlin}/utils/GradleDependencyHandlerTest.kt (99%) diff --git a/analyzer/build.gradle.kts b/analyzer/build.gradle.kts index 36c7d3aed8fd..dd7bed3a1b43 100644 --- a/analyzer/build.gradle.kts +++ b/analyzer/build.gradle.kts @@ -42,7 +42,6 @@ dependencies { implementation(project(":utils:ort-utils")) implementation(project(":utils:spdx-utils")) - implementation("org.gradle:gradle-tooling-api:${gradle.gradleVersion}") implementation(libs.bundles.maven) // The classes from the maven-resolver dependencies are not used directly but initialized by the Plexus IoC @@ -61,6 +60,8 @@ dependencies { } } + funTestImplementation(project(":plugins:package-managers:gradle-package-manager")) + testImplementation(libs.mockk) testImplementation(libs.wiremock) diff --git a/analyzer/src/main/resources/META-INF/services/org.ossreviewtoolkit.analyzer.PackageManagerFactory b/analyzer/src/main/resources/META-INF/services/org.ossreviewtoolkit.analyzer.PackageManagerFactory index 92930a528799..0612c5b28962 100644 --- a/analyzer/src/main/resources/META-INF/services/org.ossreviewtoolkit.analyzer.PackageManagerFactory +++ b/analyzer/src/main/resources/META-INF/services/org.ossreviewtoolkit.analyzer.PackageManagerFactory @@ -8,7 +8,6 @@ org.ossreviewtoolkit.analyzer.managers.Conan$Factory org.ossreviewtoolkit.analyzer.managers.DotNet$Factory org.ossreviewtoolkit.analyzer.managers.GoDep$Factory org.ossreviewtoolkit.analyzer.managers.GoMod$Factory -org.ossreviewtoolkit.analyzer.managers.Gradle$Factory org.ossreviewtoolkit.analyzer.managers.Maven$Factory org.ossreviewtoolkit.analyzer.managers.Npm$Factory org.ossreviewtoolkit.analyzer.managers.NuGet$Factory diff --git a/cli/src/funTest/assets/gradle-all-dependencies-expected-result-with-curations.yml b/cli/src/funTest/assets/gradle-all-dependencies-expected-result-with-curations.yml index de6d5c0c1806..51db3d95ef08 100644 --- a/cli/src/funTest/assets/gradle-all-dependencies-expected-result-with-curations.yml +++ b/cli/src/funTest/assets/gradle-all-dependencies-expected-result-with-curations.yml @@ -4,16 +4,16 @@ repository: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/gradle" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle" vcs_processed: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/gradle" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle" config: excludes: paths: - - pattern: "analyzer/src/funTest/assets/projects/synthetic/gradle/lib-without-repo/build.gradle" + - pattern: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/lib-without-repo/build.gradle" reason: "OPTIONAL_COMPONENT_OF" comment: "Project not delivered." scopes: @@ -54,7 +54,7 @@ analyzer: result: projects: - id: "Gradle::Gradle-Example:" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle/build.gradle" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/build.gradle" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -66,11 +66,11 @@ analyzer: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/gradle" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle" homepage_url: "" scopes: [] - id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle/app/build.gradle" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/app/build.gradle" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -82,7 +82,7 @@ analyzer: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/gradle/app" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/app" homepage_url: "" scopes: - name: "compileClasspath" @@ -112,7 +112,7 @@ analyzer: - id: "Maven:org.apache.commons:commons-lang3:3.5" - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1" - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle/lib/build.gradle" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/lib/build.gradle" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -124,7 +124,7 @@ analyzer: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/gradle/lib" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/lib" homepage_url: "" scopes: - name: "compileClasspath" @@ -158,7 +158,7 @@ analyzer: - id: "Maven:org.apache.commons:commons-lang3:3.5" - id: "Maven:org.apache.struts:struts2-assembly:2.5.14.1" - id: "Gradle:org.ossreviewtoolkit.gradle.example:lib-without-repo:1.0.0" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle/lib-without-repo/build.gradle" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/lib-without-repo/build.gradle" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -170,7 +170,7 @@ analyzer: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/gradle/lib-without-repo" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/lib-without-repo" homepage_url: "" scopes: - name: "compileClasspath" diff --git a/cli/src/funTest/kotlin/OrtMainFunTest.kt b/cli/src/funTest/kotlin/OrtMainFunTest.kt index 64cff8439955..346f55e5e890 100644 --- a/cli/src/funTest/kotlin/OrtMainFunTest.kt +++ b/cli/src/funTest/kotlin/OrtMainFunTest.kt @@ -56,7 +56,7 @@ import org.ossreviewtoolkit.utils.test.shouldNotBeNull * A test for the main entry point of the application. */ class OrtMainFunTest : StringSpec() { - private val projectDir = File("../analyzer/src/funTest/assets/projects/synthetic") + private val projectDir = File("../plugins/package-managers/gradle/src/funTest/assets/projects/synthetic") private val vcsDir = VersionControlSystem.forDirectory(projectDir)!! private val vcsUrl = vcsDir.getRemoteUrl() private val vcsRevision = vcsDir.getRevision() diff --git a/plugins/package-managers/build.gradle.kts b/plugins/package-managers/build.gradle.kts index 842cc7a68f06..79c8a707f44a 100644 --- a/plugins/package-managers/build.gradle.kts +++ b/plugins/package-managers/build.gradle.kts @@ -28,6 +28,7 @@ javaPlatform { } dependencies { + api(project(":plugins:package-managers:gradle-package-manager")) api(project(":plugins:package-managers:python-package-manager")) } diff --git a/plugins/package-managers/gradle/build.gradle.kts b/plugins/package-managers/gradle/build.gradle.kts new file mode 100644 index 000000000000..ee40657d3a3d --- /dev/null +++ b/plugins/package-managers/gradle/build.gradle.kts @@ -0,0 +1,48 @@ +/* + * Copyright (C) 2023 The ORT Project Authors (see ) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * License-Filename: LICENSE + */ + +plugins { + // Apply core plugins. + `java-library` +} + +repositories { + exclusiveContent { + forRepository { + maven("https://repo.gradle.org/gradle/libs-releases/") + } + + filter { + includeGroup("org.gradle") + } + } +} + +dependencies { + api(project(":analyzer")) + + implementation(project(":downloader")) + + implementation("org.gradle:gradle-tooling-api:${gradle.gradleVersion}") + implementation(libs.bundles.maven) + + funTestImplementation(testFixtures(project(":analyzer"))) + + testImplementation(libs.mockk) +} diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic-expected-output-app.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic-expected-output-app.yml similarity index 99% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic-expected-output-app.yml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic-expected-output-app.yml index b16d0bac46b8..70a56c5d3840 100644 --- a/analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic-expected-output-app.yml +++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic-expected-output-app.yml @@ -3,7 +3,7 @@ project_results: : - project: id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/app/build.gradle" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/app/build.gradle" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -15,7 +15,7 @@ project_results: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/app" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/app" homepage_url: "" scope_names: - "amazonDemoDebugAndroidTestCompileClasspath" diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/.gitignore b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/.gitignore similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/.gitignore rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/.gitignore diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/app/build.gradle b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/app/build.gradle similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/app/build.gradle rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/app/build.gradle diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/app/src/main/AndroidManifest.xml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/app/src/main/AndroidManifest.xml similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/app/src/main/AndroidManifest.xml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/app/src/main/AndroidManifest.xml diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/build.gradle b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/build.gradle similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/build.gradle rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/build.gradle diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/gradle/wrapper/gradle-wrapper.jar b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/gradle/wrapper/gradle-wrapper.jar rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/gradle/wrapper/gradle-wrapper.jar diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/gradle/wrapper/gradle-wrapper.properties b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/gradle/wrapper/gradle-wrapper.properties rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/gradle/wrapper/gradle-wrapper.properties diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/gradlew b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/gradlew similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/gradlew rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/gradlew diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/gradlew.bat b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/gradlew.bat similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/gradlew.bat rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/gradlew.bat diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/lib/build.gradle b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/lib/build.gradle similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/lib/build.gradle rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/lib/build.gradle diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/lib/src/main/AndroidManifest.xml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/lib/src/main/AndroidManifest.xml similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/lib/src/main/AndroidManifest.xml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/lib/src/main/AndroidManifest.xml diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/settings.gradle b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/settings.gradle similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android-cyclic/settings.gradle rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-cyclic/settings.gradle diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android-expected-output-app.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-expected-output-app.yml similarity index 99% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android-expected-output-app.yml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-expected-output-app.yml index 8a9b6e8e765e..524eaf928284 100644 --- a/analyzer/src/funTest/assets/projects/synthetic/gradle-android-expected-output-app.yml +++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-expected-output-app.yml @@ -1,7 +1,7 @@ --- project: id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/build.gradle" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/build.gradle" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -13,7 +13,7 @@ project: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/gradle-android/app" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app" homepage_url: "" scopes: - name: "amazonDemoDebugAndroidTestCompileClasspath" diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android-expected-output-lib.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-expected-output-lib.yml similarity index 98% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android-expected-output-lib.yml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-expected-output-lib.yml index 5394e292d8eb..dc581ae99e6d 100644 --- a/analyzer/src/funTest/assets/projects/synthetic/gradle-android-expected-output-lib.yml +++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-expected-output-lib.yml @@ -1,7 +1,7 @@ --- project: id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle-android/lib/build.gradle" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/lib/build.gradle" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -13,7 +13,7 @@ project: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/gradle-android/lib" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/lib" homepage_url: "" scopes: - name: "demoDebugAndroidTestCompileClasspath" diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android-expected-output-root.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-expected-output-root.yml similarity index 61% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android-expected-output-root.yml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-expected-output-root.yml index 7f5749fe76a6..140e1ffb4774 100644 --- a/analyzer/src/funTest/assets/projects/synthetic/gradle-android-expected-output-root.yml +++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android-expected-output-root.yml @@ -1,7 +1,7 @@ --- project: id: "Gradle:org.ossreviewtoolkit.gradle.example:Gradle-Android-Example:1.0.0" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle-android/build.gradle" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/build.gradle" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -13,7 +13,7 @@ project: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/gradle-android" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android" homepage_url: "" scopes: [] packages: [] diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/.gitignore b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/.gitignore similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/.gitignore rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/.gitignore diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/build.gradle b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/build.gradle similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/build.gradle rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/build.gradle diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/AndroidManifest.xml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/AndroidManifest.xml similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/AndroidManifest.xml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/AndroidManifest.xml diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/drawable/ic_launcher_background.xml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/drawable/ic_launcher_background.xml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/drawable/ic_launcher_background.xml diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/layout/activity_main.xml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/layout/activity_main.xml similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/layout/activity_main.xml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/layout/activity_main.xml diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/values/colors.xml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/values/colors.xml similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/values/colors.xml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/values/colors.xml diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/values/strings.xml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/values/strings.xml similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/values/strings.xml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/values/strings.xml diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/values/styles.xml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/values/styles.xml similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/values/styles.xml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/app/src/main/res/values/styles.xml diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/build.gradle b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/build.gradle similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/build.gradle rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/build.gradle diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/gradle/wrapper/gradle-wrapper.jar b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/gradle/wrapper/gradle-wrapper.jar rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/gradle/wrapper/gradle-wrapper.jar diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/gradle/wrapper/gradle-wrapper.properties b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/gradle/wrapper/gradle-wrapper.properties rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/gradle/wrapper/gradle-wrapper.properties diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/gradlew b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/gradlew similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/gradlew rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/gradlew diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/gradlew.bat b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/gradlew.bat similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/gradlew.bat rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/gradlew.bat diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/lib/build.gradle b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/lib/build.gradle similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/lib/build.gradle rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/lib/build.gradle diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/lib/src/main/AndroidManifest.xml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/lib/src/main/AndroidManifest.xml similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/lib/src/main/AndroidManifest.xml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/lib/src/main/AndroidManifest.xml diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-android/settings.gradle b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/settings.gradle similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-android/settings.gradle rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-android/settings.gradle diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-bom-expected-output.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom-expected-output.yml similarity index 95% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-bom-expected-output.yml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom-expected-output.yml index f66b79969d41..13f174650832 100644 --- a/analyzer/src/funTest/assets/projects/synthetic/gradle-bom-expected-output.yml +++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom-expected-output.yml @@ -1,7 +1,7 @@ --- project: id: "Gradle:org.ossreviewtoolkit.gradle.example:Gradle-BOM-Example:1.0.0" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle-bom/build.gradle" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom/build.gradle" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -13,7 +13,7 @@ project: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/gradle-bom" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom" homepage_url: "" scopes: - name: "compileClasspath" diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-bom/.gitignore b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom/.gitignore similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-bom/.gitignore rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom/.gitignore diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-bom/build.gradle b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom/build.gradle similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-bom/build.gradle rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom/build.gradle diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-bom/gradle/wrapper/gradle-wrapper.jar b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-bom/gradle/wrapper/gradle-wrapper.jar rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom/gradle/wrapper/gradle-wrapper.jar diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-bom/gradle/wrapper/gradle-wrapper.properties b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-bom/gradle/wrapper/gradle-wrapper.properties rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom/gradle/wrapper/gradle-wrapper.properties diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-bom/gradlew b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom/gradlew similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-bom/gradlew rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom/gradlew diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-bom/gradlew.bat b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom/gradlew.bat similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-bom/gradlew.bat rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom/gradlew.bat diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-bom/settings.gradle b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom/settings.gradle similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-bom/settings.gradle rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-bom/settings.gradle diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-composite-expected-output.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite-expected-output.yml similarity index 89% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-composite-expected-output.yml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite-expected-output.yml index cb4ddd31240f..784c76db88ce 100644 --- a/analyzer/src/funTest/assets/projects/synthetic/gradle-composite-expected-output.yml +++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite-expected-output.yml @@ -1,7 +1,7 @@ --- project: id: "Gradle:org.ossreviewtoolkit.gradle.composite.example:my.project1:1.0.0" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project1/build.gradle.kts" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project1/build.gradle.kts" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -13,7 +13,7 @@ project: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project1" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project1" homepage_url: "" scopes: - name: "compileClasspath" diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project1/build.gradle.kts b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project1/build.gradle.kts similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project1/build.gradle.kts rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project1/build.gradle.kts diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project1/gradle/wrapper/gradle-wrapper.jar b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project1/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project1/gradle/wrapper/gradle-wrapper.jar rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project1/gradle/wrapper/gradle-wrapper.jar diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project1/gradle/wrapper/gradle-wrapper.properties b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project1/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project1/gradle/wrapper/gradle-wrapper.properties rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project1/gradle/wrapper/gradle-wrapper.properties diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project1/gradlew b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project1/gradlew similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project1/gradlew rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project1/gradlew diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project1/gradlew.bat b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project1/gradlew.bat similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project1/gradlew.bat rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project1/gradlew.bat diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project1/settings.gradle.kts b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project1/settings.gradle.kts similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project1/settings.gradle.kts rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project1/settings.gradle.kts diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project2/build.gradle.kts b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project2/build.gradle.kts similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project2/build.gradle.kts rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project2/build.gradle.kts diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project2/gradle/wrapper/gradle-wrapper.jar b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project2/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project2/gradle/wrapper/gradle-wrapper.jar rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project2/gradle/wrapper/gradle-wrapper.jar diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project2/gradle/wrapper/gradle-wrapper.properties b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project2/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project2/gradle/wrapper/gradle-wrapper.properties rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project2/gradle/wrapper/gradle-wrapper.properties diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project2/gradlew b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project2/gradlew similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project2/gradlew rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project2/gradlew diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project2/gradlew.bat b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project2/gradlew.bat similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project2/gradlew.bat rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project2/gradlew.bat diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project2/settings.gradle.kts b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project2/settings.gradle.kts similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project2/settings.gradle.kts rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project2/settings.gradle.kts diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project2/sub/build.gradle.kts b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project2/sub/build.gradle.kts similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-composite/project2/sub/build.gradle.kts rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-composite/project2/sub/build.gradle.kts diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-app-2.14.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-app-2.14.yml similarity index 96% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-app-2.14.yml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-app-2.14.yml index 1df307a3c886..01e7fd2af62a 100644 --- a/analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-app-2.14.yml +++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-app-2.14.yml @@ -1,7 +1,7 @@ --- project: id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle/app/build.gradle" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/app/build.gradle" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -13,7 +13,7 @@ project: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/gradle/app" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/app" homepage_url: "" scopes: - name: "compile" diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-app-3.4.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-app-3.4.yml similarity index 96% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-app-3.4.yml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-app-3.4.yml index 9d38ec83d296..628dd6ed6a67 100644 --- a/analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-app-3.4.yml +++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-app-3.4.yml @@ -1,7 +1,7 @@ --- project: id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle/app/build.gradle" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/app/build.gradle" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -13,7 +13,7 @@ project: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/gradle/app" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/app" homepage_url: "" scopes: - name: "compile" diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-app.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-app.yml similarity index 96% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-app.yml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-app.yml index 15f5ba78bb9e..df768049750c 100644 --- a/analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-app.yml +++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-app.yml @@ -1,7 +1,7 @@ --- project: id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle/app/build.gradle" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/app/build.gradle" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -13,7 +13,7 @@ project: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/gradle/app" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/app" homepage_url: "" scopes: - name: "compileClasspath" diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-lib-without-repo.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-lib-without-repo.yml similarity index 91% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-lib-without-repo.yml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-lib-without-repo.yml index 4749ee27212b..007bfcc4a24e 100644 --- a/analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-lib-without-repo.yml +++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-lib-without-repo.yml @@ -1,7 +1,7 @@ --- project: id: "Gradle:org.ossreviewtoolkit.gradle.example:lib-without-repo:1.0.0" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle/lib-without-repo/build.gradle" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/lib-without-repo/build.gradle" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -13,7 +13,7 @@ project: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/gradle/lib-without-repo" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/lib-without-repo" homepage_url: "" scopes: - name: "compileClasspath" diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-lib.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-lib.yml similarity index 97% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-lib.yml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-lib.yml index d38f45a55fb0..1acf661eb71d 100644 --- a/analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-lib.yml +++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-lib.yml @@ -1,7 +1,7 @@ --- project: id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle/lib/build.gradle" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/lib/build.gradle" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -13,7 +13,7 @@ project: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/gradle/lib" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/lib" homepage_url: "" scopes: - name: "compileClasspath" diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-root.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-root.yml similarity index 59% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-root.yml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-root.yml index 84666f85b1ab..a3b15165c301 100644 --- a/analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-root.yml +++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-root.yml @@ -1,7 +1,7 @@ --- project: id: "Gradle::Gradle-Example:" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle/build.gradle" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/build.gradle" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -13,7 +13,7 @@ project: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/gradle" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle" homepage_url: "" scopes: [] packages: [] diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-scopes-excludes.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-scopes-excludes.yml similarity index 96% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-scopes-excludes.yml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-scopes-excludes.yml index 0e45f9eb4387..c1f94f7a2b2e 100644 --- a/analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-scopes-excludes.yml +++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-scopes-excludes.yml @@ -1,7 +1,7 @@ --- project: id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle/app/build.gradle" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/app/build.gradle" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -13,7 +13,7 @@ project: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/gradle/app" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/app" homepage_url: "" scopes: - name: "compileClasspath" diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-unsupported-version.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-unsupported-version.yml similarity index 65% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-unsupported-version.yml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-unsupported-version.yml index 6eeebee28980..cccaa13d5d56 100644 --- a/analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-unsupported-version.yml +++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-expected-output-unsupported-version.yml @@ -1,7 +1,7 @@ --- project: id: "Gradle:org.ossreviewtoolkit.gradle.example:gradle-unsupported-version:1.0.0" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle-unsupported-version/build.gradle" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-unsupported-version/build.gradle" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -13,7 +13,7 @@ project: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/gradle-unsupported-version" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-unsupported-version" homepage_url: "" scopes: [] packages: [] diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-library-expected-output-app.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library-expected-output-app.yml similarity index 96% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-library-expected-output-app.yml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library-expected-output-app.yml index cc5c815e94b1..933f8e3370d4 100644 --- a/analyzer/src/funTest/assets/projects/synthetic/gradle-library-expected-output-app.yml +++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library-expected-output-app.yml @@ -1,7 +1,7 @@ --- project: id: "Gradle:org.ossreviewtoolkit.gradle.example:app:1.0.0" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle-library/app/build.gradle" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/app/build.gradle" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -13,7 +13,7 @@ project: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/gradle-library/app" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/app" homepage_url: "" scopes: - name: "compileClasspath" diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-library-expected-output-lib.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library-expected-output-lib.yml similarity index 97% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-library-expected-output-lib.yml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library-expected-output-lib.yml index db2166cdf0d4..6f4b3124932f 100644 --- a/analyzer/src/funTest/assets/projects/synthetic/gradle-library-expected-output-lib.yml +++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library-expected-output-lib.yml @@ -1,7 +1,7 @@ --- project: id: "Gradle:org.ossreviewtoolkit.gradle.example:lib:1.0.0" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle-library/lib/build.gradle" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/lib/build.gradle" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -13,7 +13,7 @@ project: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/gradle-library/lib" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/lib" homepage_url: "" scopes: - name: "compileClasspath" diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-library-expected-output-root.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library-expected-output-root.yml similarity index 57% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-library-expected-output-root.yml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library-expected-output-root.yml index 28fdc38a963d..689d38d42bff 100644 --- a/analyzer/src/funTest/assets/projects/synthetic/gradle-library-expected-output-root.yml +++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library-expected-output-root.yml @@ -1,7 +1,7 @@ --- project: id: "Gradle::Gradle-Example:" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/gradle-library/build.gradle" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/build.gradle" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -13,7 +13,7 @@ project: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/gradle-library" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library" homepage_url: "" scopes: [] packages: [] diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-library/.gitignore b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/.gitignore similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-library/.gitignore rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/.gitignore diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-library/app/build.gradle b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/app/build.gradle similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-library/app/build.gradle rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/app/build.gradle diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-library/build.gradle b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/build.gradle similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-library/build.gradle rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/build.gradle diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-library/gradle/wrapper/gradle-wrapper.jar b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-library/gradle/wrapper/gradle-wrapper.jar rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/gradle/wrapper/gradle-wrapper.jar diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-library/gradle/wrapper/gradle-wrapper.properties b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-library/gradle/wrapper/gradle-wrapper.properties rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/gradle/wrapper/gradle-wrapper.properties diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-library/gradlew b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/gradlew similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-library/gradlew rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/gradlew diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-library/gradlew.bat b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/gradlew.bat similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-library/gradlew.bat rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/gradlew.bat diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-library/lib/build.gradle b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/lib/build.gradle similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-library/lib/build.gradle rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/lib/build.gradle diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-library/settings.gradle b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/settings.gradle similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-library/settings.gradle rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-library/settings.gradle diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-unsupported-version/.gitignore b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-unsupported-version/.gitignore similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-unsupported-version/.gitignore rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-unsupported-version/.gitignore diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-unsupported-version/build.gradle b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-unsupported-version/build.gradle similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-unsupported-version/build.gradle rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-unsupported-version/build.gradle diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-unsupported-version/gradle/wrapper/gradle-wrapper.jar b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-unsupported-version/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-unsupported-version/gradle/wrapper/gradle-wrapper.jar rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-unsupported-version/gradle/wrapper/gradle-wrapper.jar diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-unsupported-version/gradle/wrapper/gradle-wrapper.properties b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-unsupported-version/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-unsupported-version/gradle/wrapper/gradle-wrapper.properties rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-unsupported-version/gradle/wrapper/gradle-wrapper.properties diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-unsupported-version/gradlew b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-unsupported-version/gradlew similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-unsupported-version/gradlew rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-unsupported-version/gradlew diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-unsupported-version/gradlew.bat b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-unsupported-version/gradlew.bat similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-unsupported-version/gradlew.bat rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-unsupported-version/gradlew.bat diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle-unsupported-version/settings.gradle b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-unsupported-version/settings.gradle similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle-unsupported-version/settings.gradle rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle-unsupported-version/settings.gradle diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle/.gitignore b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/.gitignore similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle/.gitignore rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/.gitignore diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle/.ort.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/.ort.yml similarity index 85% rename from analyzer/src/funTest/assets/projects/synthetic/gradle/.ort.yml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/.ort.yml index 7215cc13f3f9..a72a29875b85 100644 --- a/analyzer/src/funTest/assets/projects/synthetic/gradle/.ort.yml +++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/.ort.yml @@ -1,7 +1,7 @@ # Test repository configuration file. excludes: paths: - - pattern: "analyzer/src/funTest/assets/projects/synthetic/gradle/lib-without-repo/build.gradle" + - pattern: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/lib-without-repo/build.gradle" reason: "OPTIONAL_COMPONENT_OF" comment: "Project not delivered." scopes: diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle/app/build.gradle b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/app/build.gradle similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle/app/build.gradle rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/app/build.gradle diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle/build.gradle b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/build.gradle similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle/build.gradle rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/build.gradle diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle/gradle/wrapper/gradle-wrapper.jar b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle/gradle/wrapper/gradle-wrapper.jar rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/gradle/wrapper/gradle-wrapper.jar diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle/gradle/wrapper/gradle-wrapper.properties b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle/gradle/wrapper/gradle-wrapper.properties rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/gradle/wrapper/gradle-wrapper.properties diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle/gradlew b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/gradlew similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle/gradlew rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/gradlew diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle/gradlew.bat b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/gradlew.bat similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle/gradlew.bat rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/gradlew.bat diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle/lib-without-repo/build.gradle b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/lib-without-repo/build.gradle similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle/lib-without-repo/build.gradle rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/lib-without-repo/build.gradle diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle/lib/build.gradle b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/lib/build.gradle similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle/lib/build.gradle rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/lib/build.gradle diff --git a/analyzer/src/funTest/assets/projects/synthetic/gradle/settings.gradle b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/settings.gradle similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/gradle/settings.gradle rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/gradle/settings.gradle diff --git a/analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-cli.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-cli.yml similarity index 99% rename from analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-cli.yml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-cli.yml index 96093724447c..aac0e462c984 100644 --- a/analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-cli.yml +++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-cli.yml @@ -1,7 +1,7 @@ --- project: id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:cli:1.0" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/cli/build.gradle.kts" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/cli/build.gradle.kts" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -13,7 +13,7 @@ project: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/cli" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/cli" homepage_url: "" scopes: - name: "compileClasspath" diff --git a/analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-core.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-core.yml similarity index 98% rename from analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-core.yml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-core.yml index d713fcb4e1fe..99fee1dcbaa8 100644 --- a/analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-core.yml +++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-core.yml @@ -1,7 +1,7 @@ --- project: id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:core:1.0" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/core/build.gradle.kts" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/core/build.gradle.kts" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -13,7 +13,7 @@ project: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/core" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/core" homepage_url: "" scopes: - name: "compileClasspath" diff --git a/analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-root.yml b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-root.yml similarity index 59% rename from analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-root.yml rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-root.yml index 0a26effa3b62..696af417d484 100644 --- a/analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-root.yml +++ b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project-expected-output-root.yml @@ -1,7 +1,7 @@ --- project: id: "Gradle:org.gradle.kotlin.dsl.samples.multiproject:multi-kotlin-project:1.0" - definition_file_path: "analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/build.gradle.kts" + definition_file_path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/build.gradle.kts" declared_licenses: [] declared_licenses_processed: {} vcs: @@ -13,7 +13,7 @@ project: type: "Git" url: "" revision: "" - path: "analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project" + path: "plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project" homepage_url: "" scopes: [] packages: [] diff --git a/analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/README.md b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/README.md similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/README.md rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/README.md diff --git a/analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/build.gradle.kts b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/build.gradle.kts similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/build.gradle.kts rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/build.gradle.kts diff --git a/analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/cli/build.gradle.kts b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/cli/build.gradle.kts similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/cli/build.gradle.kts rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/cli/build.gradle.kts diff --git a/analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/cli/src/main/kotlin/cli/Main.kt b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/cli/src/main/kotlin/cli/Main.kt similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/cli/src/main/kotlin/cli/Main.kt rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/cli/src/main/kotlin/cli/Main.kt diff --git a/analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/core/build.gradle.kts b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/core/build.gradle.kts similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/core/build.gradle.kts rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/core/build.gradle.kts diff --git a/analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/core/src/main/kotlin/core/DeepThought.kt b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/core/src/main/kotlin/core/DeepThought.kt similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/core/src/main/kotlin/core/DeepThought.kt rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/core/src/main/kotlin/core/DeepThought.kt diff --git a/analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/gradle/wrapper/gradle-wrapper.jar b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/gradle/wrapper/gradle-wrapper.jar rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/gradle/wrapper/gradle-wrapper.jar diff --git a/analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/gradle/wrapper/gradle-wrapper.properties b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/gradle/wrapper/gradle-wrapper.properties rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/gradle/wrapper/gradle-wrapper.properties diff --git a/analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/gradlew b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/gradlew similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/gradlew rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/gradlew diff --git a/analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/gradlew.bat b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/gradlew.bat similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/gradlew.bat rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/gradlew.bat diff --git a/analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/settings.gradle.kts b/plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/settings.gradle.kts similarity index 100% rename from analyzer/src/funTest/assets/projects/synthetic/multi-kotlin-project/settings.gradle.kts rename to plugins/package-managers/gradle/src/funTest/assets/projects/synthetic/multi-kotlin-project/settings.gradle.kts diff --git a/analyzer/src/funTest/kotlin/managers/GradleAndroidFunTest.kt b/plugins/package-managers/gradle/src/funTest/kotlin/GradleAndroidFunTest.kt similarity index 97% rename from analyzer/src/funTest/kotlin/managers/GradleAndroidFunTest.kt rename to plugins/package-managers/gradle/src/funTest/kotlin/GradleAndroidFunTest.kt index 1fcd546520ee..569ad0a0e20e 100644 --- a/analyzer/src/funTest/kotlin/managers/GradleAndroidFunTest.kt +++ b/plugins/package-managers/gradle/src/funTest/kotlin/GradleAndroidFunTest.kt @@ -17,11 +17,12 @@ * License-Filename: LICENSE */ -package org.ossreviewtoolkit.analyzer.managers +package org.ossreviewtoolkit.plugins.packagemanagers.gradle import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.shouldBe +import org.ossreviewtoolkit.analyzer.managers.resolveSingleProject import org.ossreviewtoolkit.downloader.VersionControlSystem import org.ossreviewtoolkit.model.config.AnalyzerConfiguration import org.ossreviewtoolkit.model.config.RepositoryConfiguration diff --git a/analyzer/src/funTest/kotlin/managers/GradleBomFunTest.kt b/plugins/package-managers/gradle/src/funTest/kotlin/GradleBomFunTest.kt similarity index 94% rename from analyzer/src/funTest/kotlin/managers/GradleBomFunTest.kt rename to plugins/package-managers/gradle/src/funTest/kotlin/GradleBomFunTest.kt index 7ef81da91c92..94227aa314dc 100644 --- a/analyzer/src/funTest/kotlin/managers/GradleBomFunTest.kt +++ b/plugins/package-managers/gradle/src/funTest/kotlin/GradleBomFunTest.kt @@ -17,11 +17,12 @@ * License-Filename: LICENSE */ -package org.ossreviewtoolkit.analyzer.managers +package org.ossreviewtoolkit.plugins.packagemanagers.gradle import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.shouldBe +import org.ossreviewtoolkit.analyzer.managers.resolveSingleProject import org.ossreviewtoolkit.downloader.VersionControlSystem import org.ossreviewtoolkit.model.config.AnalyzerConfiguration import org.ossreviewtoolkit.model.config.RepositoryConfiguration diff --git a/analyzer/src/funTest/kotlin/managers/GradleCompositeFunTest.kt b/plugins/package-managers/gradle/src/funTest/kotlin/GradleCompositeFunTest.kt similarity index 94% rename from analyzer/src/funTest/kotlin/managers/GradleCompositeFunTest.kt rename to plugins/package-managers/gradle/src/funTest/kotlin/GradleCompositeFunTest.kt index c701b09982cf..26bc593a1782 100644 --- a/analyzer/src/funTest/kotlin/managers/GradleCompositeFunTest.kt +++ b/plugins/package-managers/gradle/src/funTest/kotlin/GradleCompositeFunTest.kt @@ -17,11 +17,12 @@ * License-Filename: LICENSE */ -package org.ossreviewtoolkit.analyzer.managers +package org.ossreviewtoolkit.plugins.packagemanagers.gradle import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.shouldBe +import org.ossreviewtoolkit.analyzer.managers.resolveSingleProject import org.ossreviewtoolkit.downloader.VersionControlSystem import org.ossreviewtoolkit.model.config.AnalyzerConfiguration import org.ossreviewtoolkit.model.config.RepositoryConfiguration diff --git a/analyzer/src/funTest/kotlin/managers/GradleFunTest.kt b/plugins/package-managers/gradle/src/funTest/kotlin/GradleFunTest.kt similarity index 98% rename from analyzer/src/funTest/kotlin/managers/GradleFunTest.kt rename to plugins/package-managers/gradle/src/funTest/kotlin/GradleFunTest.kt index 40395d4d5004..58400d72948e 100644 --- a/analyzer/src/funTest/kotlin/managers/GradleFunTest.kt +++ b/plugins/package-managers/gradle/src/funTest/kotlin/GradleFunTest.kt @@ -17,7 +17,7 @@ * License-Filename: LICENSE */ -package org.ossreviewtoolkit.analyzer.managers +package org.ossreviewtoolkit.plugins.packagemanagers.gradle import io.kotest.core.spec.Spec import io.kotest.core.spec.style.StringSpec @@ -27,6 +27,7 @@ import io.kotest.data.row import io.kotest.data.table import io.kotest.matchers.shouldBe +import org.ossreviewtoolkit.analyzer.managers.resolveSingleProject import org.ossreviewtoolkit.downloader.VersionControlSystem import org.ossreviewtoolkit.downloader.vcs.Git import org.ossreviewtoolkit.model.config.AnalyzerConfiguration diff --git a/analyzer/src/funTest/kotlin/managers/GradleKotlinScriptFunTest.kt b/plugins/package-managers/gradle/src/funTest/kotlin/GradleKotlinScriptFunTest.kt similarity index 96% rename from analyzer/src/funTest/kotlin/managers/GradleKotlinScriptFunTest.kt rename to plugins/package-managers/gradle/src/funTest/kotlin/GradleKotlinScriptFunTest.kt index f0ee6c062383..6c0a26e339f3 100644 --- a/analyzer/src/funTest/kotlin/managers/GradleKotlinScriptFunTest.kt +++ b/plugins/package-managers/gradle/src/funTest/kotlin/GradleKotlinScriptFunTest.kt @@ -17,11 +17,12 @@ * License-Filename: LICENSE */ -package org.ossreviewtoolkit.analyzer.managers +package org.ossreviewtoolkit.plugins.packagemanagers.gradle import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.shouldBe +import org.ossreviewtoolkit.analyzer.managers.resolveSingleProject import org.ossreviewtoolkit.downloader.VersionControlSystem import org.ossreviewtoolkit.model.config.AnalyzerConfiguration import org.ossreviewtoolkit.model.config.RepositoryConfiguration diff --git a/analyzer/src/funTest/kotlin/managers/GradleLibraryFunTest.kt b/plugins/package-managers/gradle/src/funTest/kotlin/GradleLibraryFunTest.kt similarity index 96% rename from analyzer/src/funTest/kotlin/managers/GradleLibraryFunTest.kt rename to plugins/package-managers/gradle/src/funTest/kotlin/GradleLibraryFunTest.kt index 427ebb666202..061283c27916 100644 --- a/analyzer/src/funTest/kotlin/managers/GradleLibraryFunTest.kt +++ b/plugins/package-managers/gradle/src/funTest/kotlin/GradleLibraryFunTest.kt @@ -17,11 +17,12 @@ * License-Filename: LICENSE */ -package org.ossreviewtoolkit.analyzer.managers +package org.ossreviewtoolkit.plugins.packagemanagers.gradle import io.kotest.core.spec.style.StringSpec import io.kotest.matchers.shouldBe +import org.ossreviewtoolkit.analyzer.managers.resolveSingleProject import org.ossreviewtoolkit.downloader.VersionControlSystem import org.ossreviewtoolkit.model.config.AnalyzerConfiguration import org.ossreviewtoolkit.model.config.RepositoryConfiguration diff --git a/analyzer/src/main/kotlin/managers/Gradle.kt b/plugins/package-managers/gradle/src/main/kotlin/Gradle.kt similarity index 98% rename from analyzer/src/main/kotlin/managers/Gradle.kt rename to plugins/package-managers/gradle/src/main/kotlin/Gradle.kt index f7e4914082dd..ac990c5ce4da 100644 --- a/analyzer/src/main/kotlin/managers/Gradle.kt +++ b/plugins/package-managers/gradle/src/main/kotlin/Gradle.kt @@ -17,7 +17,7 @@ * License-Filename: LICENSE */ -package org.ossreviewtoolkit.analyzer.managers +package org.ossreviewtoolkit.plugins.packagemanagers.gradle import DependencyTreeModel @@ -40,7 +40,6 @@ import org.gradle.tooling.internal.consumer.DefaultGradleConnector import org.ossreviewtoolkit.analyzer.AbstractPackageManagerFactory import org.ossreviewtoolkit.analyzer.PackageManager import org.ossreviewtoolkit.analyzer.PackageManagerResult -import org.ossreviewtoolkit.analyzer.managers.utils.GradleDependencyHandler import org.ossreviewtoolkit.analyzer.managers.utils.MavenSupport import org.ossreviewtoolkit.analyzer.managers.utils.identifier import org.ossreviewtoolkit.downloader.VersionControlSystem @@ -56,6 +55,7 @@ import org.ossreviewtoolkit.model.config.PackageManagerConfiguration import org.ossreviewtoolkit.model.config.RepositoryConfiguration import org.ossreviewtoolkit.model.createAndLogIssue import org.ossreviewtoolkit.model.utils.DependencyGraphBuilder +import org.ossreviewtoolkit.plugins.packagemanagers.gradle.utils.GradleDependencyHandler import org.ossreviewtoolkit.utils.common.Os import org.ossreviewtoolkit.utils.common.splitOnWhitespace import org.ossreviewtoolkit.utils.common.temporaryProperties @@ -205,7 +205,7 @@ class Gradle( return temporaryProperties("user.dir" to rootProjectDir.path) { gradleConnection.use { connection -> val initScriptFile = createOrtTempFile("init", ".gradle") - initScriptFile.writeBytes(javaClass.getResource("/scripts/init.gradle").readBytes()) + initScriptFile.writeBytes(javaClass.getResource("/init.gradle").readBytes()) val stdout = ByteArrayOutputStream() val stderr = ByteArrayOutputStream() diff --git a/analyzer/src/main/kotlin/managers/utils/GradleDependencyHandler.kt b/plugins/package-managers/gradle/src/main/kotlin/utils/GradleDependencyHandler.kt similarity index 96% rename from analyzer/src/main/kotlin/managers/utils/GradleDependencyHandler.kt rename to plugins/package-managers/gradle/src/main/kotlin/utils/GradleDependencyHandler.kt index 01c0a39d2275..f0505c78b72e 100644 --- a/analyzer/src/main/kotlin/managers/utils/GradleDependencyHandler.kt +++ b/plugins/package-managers/gradle/src/main/kotlin/utils/GradleDependencyHandler.kt @@ -17,7 +17,7 @@ * License-Filename: LICENSE */ -package org.ossreviewtoolkit.analyzer.managers.utils +package org.ossreviewtoolkit.plugins.packagemanagers.gradle.utils import Dependency @@ -28,6 +28,8 @@ import org.eclipse.aether.RepositoryException import org.eclipse.aether.artifact.DefaultArtifact import org.eclipse.aether.repository.RemoteRepository +import org.ossreviewtoolkit.analyzer.managers.utils.MavenSupport +import org.ossreviewtoolkit.analyzer.managers.utils.identifier import org.ossreviewtoolkit.model.Identifier import org.ossreviewtoolkit.model.Issue import org.ossreviewtoolkit.model.Package diff --git a/analyzer/src/main/kotlin/managers/utils/GradleSupport.kt b/plugins/package-managers/gradle/src/main/kotlin/utils/GradleSupport.kt similarity index 100% rename from analyzer/src/main/kotlin/managers/utils/GradleSupport.kt rename to plugins/package-managers/gradle/src/main/kotlin/utils/GradleSupport.kt diff --git a/plugins/package-managers/gradle/src/main/resources/META-INF/services/org.ossreviewtoolkit.analyzer.PackageManagerFactory b/plugins/package-managers/gradle/src/main/resources/META-INF/services/org.ossreviewtoolkit.analyzer.PackageManagerFactory new file mode 100644 index 000000000000..869a7edd5291 --- /dev/null +++ b/plugins/package-managers/gradle/src/main/resources/META-INF/services/org.ossreviewtoolkit.analyzer.PackageManagerFactory @@ -0,0 +1 @@ +org.ossreviewtoolkit.plugins.packagemanagers.gradle.Gradle$Factory diff --git a/analyzer/src/main/resources/scripts/init.gradle b/plugins/package-managers/gradle/src/main/resources/init.gradle similarity index 100% rename from analyzer/src/main/resources/scripts/init.gradle rename to plugins/package-managers/gradle/src/main/resources/init.gradle diff --git a/analyzer/src/test/kotlin/managers/utils/GradleDependencyHandlerTest.kt b/plugins/package-managers/gradle/src/test/kotlin/utils/GradleDependencyHandlerTest.kt similarity index 99% rename from analyzer/src/test/kotlin/managers/utils/GradleDependencyHandlerTest.kt rename to plugins/package-managers/gradle/src/test/kotlin/utils/GradleDependencyHandlerTest.kt index 7d4ad5ee6ffb..5953669685d9 100644 --- a/analyzer/src/test/kotlin/managers/utils/GradleDependencyHandlerTest.kt +++ b/plugins/package-managers/gradle/src/test/kotlin/utils/GradleDependencyHandlerTest.kt @@ -17,7 +17,7 @@ * License-Filename: LICENSE */ -package org.ossreviewtoolkit.analyzer.managers.utils +package org.ossreviewtoolkit.plugins.packagemanagers.gradle.utils import Dependency @@ -48,7 +48,7 @@ import org.apache.maven.project.ProjectBuildingException import org.eclipse.aether.artifact.DefaultArtifact import org.eclipse.aether.repository.RemoteRepository -import org.ossreviewtoolkit.analyzer.managers.Gradle +import org.ossreviewtoolkit.analyzer.managers.utils.MavenSupport import org.ossreviewtoolkit.model.Identifier import org.ossreviewtoolkit.model.Issue import org.ossreviewtoolkit.model.Package diff --git a/settings.gradle.kts b/settings.gradle.kts index 8632b9ad1979..0cf8550847f7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -45,6 +45,7 @@ include(":plugins:package-curation-providers:file") include(":plugins:package-curation-providers:ort-config") include(":plugins:package-curation-providers:sw360") include(":plugins:package-managers") +include(":plugins:package-managers:gradle") include(":plugins:package-managers:python") include(":reporter") include(":reporter-web-app") @@ -70,6 +71,7 @@ project(":plugins:package-curation-providers:file").name = "file-package-curatio project(":plugins:package-curation-providers:ort-config").name = "ort-config-package-curation-provider" project(":plugins:package-curation-providers:sw360").name = "sw360-package-curation-provider" +project(":plugins:package-managers:gradle").name = "gradle-package-manager" project(":plugins:package-managers:python").name = "python-package-manager" project(":utils:common").name = "common-utils"