Skip to content
Permalink
Browse files

Introduce a VcsType class used by both VcsInfo and VersionControlSystem

This avoids the string comparison issues regarding the capitalization.

Signed-off-by: Sebastian Schuberth <sebastian.schuberth@bosch-si.com>
  • Loading branch information...
sschuberth committed Jul 4, 2019
1 parent e257d58 commit c5d3d3964e8ef16a1daff12925b6fbf5cab8a3c3
Showing with 2,195 additions and 2,056 deletions.
  1. +9 −9 analyzer/src/funTest/assets/projects/external/directories-expected-output.yml
  2. +2 −2 analyzer/src/funTest/assets/projects/external/example-python-flask-expected-output.yml
  3. +505 −505 analyzer/src/funTest/assets/projects/external/git-repo-expected-output.yml
  4. +6 −6 analyzer/src/funTest/assets/projects/external/godep-expected-output.yml
  5. +62 −62 analyzer/src/funTest/assets/projects/external/jgnash-core-expected-output.yml
  6. +6 −6 analyzer/src/funTest/assets/projects/external/jgnash-expected-output.yml
  7. +15 −15 analyzer/src/funTest/assets/projects/external/multi-kotlin-project-expected-output-cli.yml
  8. +15 −15 analyzer/src/funTest/assets/projects/external/multi-kotlin-project-expected-output-core.yml
  9. +7 −7 analyzer/src/funTest/assets/projects/external/multi-kotlin-project-expected-output-root.yml
  10. +13 −13 analyzer/src/funTest/assets/projects/external/qmstr-expected-output.yml
  11. +135 −135 analyzer/src/funTest/assets/projects/external/quickcheck-state-machine-expected-output-win32.yml
  12. +133 −133 analyzer/src/funTest/assets/projects/external/quickcheck-state-machine-expected-output.yml
  13. +65 −65 analyzer/src/funTest/assets/projects/external/sbt-multi-project-example-expected-output.yml
  14. +5 −5 analyzer/src/funTest/assets/projects/external/spdx-tools-python-expected-output.yml
  15. +10 −10 analyzer/src/funTest/assets/projects/external/sprig-expected-output.yml
  16. +5 −5 analyzer/src/funTest/assets/projects/synthetic/bower-expected-output.yml
  17. +20 −20 analyzer/src/funTest/assets/projects/synthetic/bundler-expected-output-gemspec.yml
  18. +12 −12 analyzer/src/funTest/assets/projects/synthetic/bundler-expected-output-lockfile.yml
  19. +1 −1 analyzer/src/funTest/assets/projects/synthetic/dotnet-expected-output.yml
  20. +15 −15 .../src/funTest/assets/projects/synthetic/gradle-all-dependencies-expected-result-with-curations.yml
  21. +15 −15 analyzer/src/funTest/assets/projects/synthetic/gradle-all-dependencies-expected-result.yml
  22. +17 −17 analyzer/src/funTest/assets/projects/synthetic/gradle-android-expected-output-app.yml
  23. +9 −9 analyzer/src/funTest/assets/projects/synthetic/gradle-android-expected-output-lib.yml
  24. +1 −1 analyzer/src/funTest/assets/projects/synthetic/gradle-android-expected-output-root.yml
  25. +7 −7 analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-app-2.14.yml
  26. +7 −7 analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-app-3.4.yml
  27. +7 −7 analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-app.yml
  28. +1 −1 analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-lib-without-repo.yml
  29. +11 −11 analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-lib.yml
  30. +1 −1 analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-root.yml
  31. +1 −1 analyzer/src/funTest/assets/projects/synthetic/gradle-expected-output-unsupported-version.yml
  32. +7 −7 analyzer/src/funTest/assets/projects/synthetic/gradle-library-expected-output-app.yml
  33. +11 −11 analyzer/src/funTest/assets/projects/synthetic/gradle-library-expected-output-lib.yml
  34. +1 −1 analyzer/src/funTest/assets/projects/synthetic/gradle-library-expected-output-root.yml
  35. +9 −9 analyzer/src/funTest/assets/projects/synthetic/maven-expected-output-app.yml
  36. +9 −9 analyzer/src/funTest/assets/projects/synthetic/maven-expected-output-lib.yml
  37. +1 −1 analyzer/src/funTest/assets/projects/synthetic/maven-expected-output-root.yml
  38. +1 −1 analyzer/src/funTest/assets/projects/synthetic/maven-parent-expected-output-root.yml
  39. +238 −238 analyzer/src/funTest/assets/projects/synthetic/npm-babel-expected-output.yml
  40. +1 −1 analyzer/src/funTest/assets/projects/synthetic/npm-expected-output-no-lockfile.yml
  41. +73 −73 analyzer/src/funTest/assets/projects/synthetic/npm-expected-output.yml
  42. +288 −288 analyzer/src/funTest/assets/projects/synthetic/npm-version-urls-expected-output.yml
  43. +1 −1 analyzer/src/funTest/assets/projects/synthetic/nuget-expected-output.yml
  44. +1 −1 analyzer/src/funTest/assets/projects/synthetic/php-composer-expected-output-no-deps.yml
  45. +1 −1 analyzer/src/funTest/assets/projects/synthetic/php-composer-expected-output-with-provide.yml
  46. +1 −1 analyzer/src/funTest/assets/projects/synthetic/php-composer-expected-output-with-replace.yml
  47. +75 −75 analyzer/src/funTest/assets/projects/synthetic/php-composer-expected-output.yml
  48. +5 −5 analyzer/src/funTest/assets/projects/synthetic/pip-expected-output.yml
  49. +1 −1 analyzer/src/funTest/assets/projects/synthetic/python3-django-expected-output.yml
  50. +73 −73 analyzer/src/funTest/assets/projects/synthetic/yarn-expected-output.yml
  51. +2 −1 analyzer/src/funTest/kotlin/integration/DrupalIntegrationTest.kt
  52. +2 −1 analyzer/src/funTest/kotlin/integration/GradleIntegrationTest.kt
  53. +2 −1 analyzer/src/funTest/kotlin/integration/PolymerIntegrationTest.kt
  54. +2 −1 analyzer/src/funTest/kotlin/integration/SimpleFormIntegrationTest.kt
  55. +2 −1 analyzer/src/funTest/kotlin/integration/VueJsIntegrationTest.kt
  56. +2 −1 analyzer/src/funTest/kotlin/vcs/GitRepoTest.kt
  57. +3 −2 analyzer/src/main/kotlin/DotNetSupport.kt
  58. +8 −5 analyzer/src/main/kotlin/MavenSupport.kt
  59. +2 −1 analyzer/src/main/kotlin/managers/Bower.kt
  60. +2 −1 analyzer/src/main/kotlin/managers/Bundler.kt
  61. +3 −2 analyzer/src/main/kotlin/managers/Npm.kt
  62. +6 −1 analyzer/src/main/kotlin/managers/PhpComposer.kt
  63. +5 −2 analyzer/src/main/kotlin/managers/Stack.kt
  64. +2 −1 analyzer/src/main/kotlin/managers/Unmanaged.kt
  65. +2 −1 analyzer/src/test/kotlin/MavenSupportTest.kt
  66. +7 −1 cli/src/main/kotlin/commands/DownloaderCommand.kt
  67. +2 −1 downloader/src/funTest/kotlin/BabelTest.kt
  68. +3 −2 downloader/src/funTest/kotlin/BeanUtilsTest.kt
  69. +5 −4 downloader/src/funTest/kotlin/CvsDownloadTest.kt
  70. +2 −1 downloader/src/funTest/kotlin/DirectoryTest.kt
  71. +2 −1 downloader/src/funTest/kotlin/DownloaderTest.kt
  72. +5 −4 downloader/src/funTest/kotlin/GitDownloadTest.kt
  73. +2 −1 downloader/src/funTest/kotlin/GitRepoDownloadTest.kt
  74. +7 −4 downloader/src/funTest/kotlin/MercurialDownloadTest.kt
  75. +8 −5 downloader/src/funTest/kotlin/SubversionDownloadTest.kt
  76. +2 −1 downloader/src/main/kotlin/Downloader.kt
  77. +14 −20 downloader/src/main/kotlin/VersionControlSystem.kt
  78. +3 −1 downloader/src/main/kotlin/WorkingTree.kt
  79. +2 −0 downloader/src/main/kotlin/vcs/Cvs.kt
  80. +2 −0 downloader/src/main/kotlin/vcs/Git.kt
  81. +2 −1 downloader/src/main/kotlin/vcs/GitRepo.kt
  82. +2 −1 downloader/src/main/kotlin/vcs/Mercurial.kt
  83. +2 −1 downloader/src/main/kotlin/vcs/Subversion.kt
  84. +2 −1 downloader/src/test/kotlin/CvsTest.kt
  85. +2 −1 downloader/src/test/kotlin/GitTest.kt
  86. +2 −1 downloader/src/test/kotlin/MercurialTest.kt
  87. +2 −1 downloader/src/test/kotlin/SubversionTest.kt
  88. +15 −14 downloader/src/test/kotlin/VersionControlSystemTest.kt
  89. +1 −1 model/src/main/kotlin/Provenance.kt
  90. +7 −8 model/src/main/kotlin/VcsInfo.kt
  91. +2 −2 model/src/main/kotlin/VcsInfoCuration.kt
  92. +88 −0 model/src/main/kotlin/VcsType.kt
  93. +6 −6 model/src/test/kotlin/OrtResultTest.kt
  94. +5 −5 model/src/test/kotlin/PackageCurationTest.kt
  95. +3 −3 model/src/test/kotlin/PackageTest.kt
  96. +1 −1 model/src/test/kotlin/ScanResultContainerTest.kt
  97. +18 −18 model/src/test/kotlin/VcsInfoTest.kt
  98. +2 −2 reporter/src/funTest/assets/static-html-reporter-test-expected-output.html
  99. +1 −1 reporter/src/main/kotlin/reporters/ExcelReporter.kt
  100. +1 −1 reporter/src/main/kotlin/reporters/StaticHtmlReporter.kt
  101. +2 −2 scanner/src/funTest/assets/file-counter-expected-output-for-analyzer-result.yml
  102. +3 −2 scanner/src/funTest/kotlin/storages/AbstractStorageTest.kt
@@ -6,7 +6,7 @@ repository:
revision: "d302b1e93963c81ed511e072a52e95251b5d078b"
path: ""
vcs_processed:
type: "git"
type: "Git"
url: "https://github.com/soc/directories-jvm.git"
revision: "d302b1e93963c81ed511e072a52e95251b5d078b"
path: ""
@@ -33,12 +33,12 @@ analyzer:
declared_licenses_processed:
spdx_expression: "MPL-2.0"
vcs:
type: "git"
type: "Git"
url: "git@github.com:soc/directories-jvm.git"
revision: ""
path: ""
vcs_processed:
type: "git"
type: "Git"
url: "https://github.com/soc/directories-jvm.git"
revision: "d302b1e93963c81ed511e072a52e95251b5d078b"
path: ""
@@ -73,12 +73,12 @@ analyzer:
value: "c7c1394bbc5718aa256557544d891b3842825a8d"
algorithm: "SHA-1"
vcs:
type: "git"
type: "Git"
url: "git@github.com:sbt/junit-interface.git"
revision: ""
path: ""
vcs_processed:
type: "git"
type: "Git"
url: "ssh://git@github.com/sbt/junit-interface.git"
revision: ""
path: ""
@@ -104,12 +104,12 @@ analyzer:
value: "a6c32b40bf3d76eca54e3c601e5d1470c86fcdfa"
algorithm: "SHA-1"
vcs:
type: "git"
type: "Git"
url: "git://github.com/junit-team/junit.git"
revision: "r4.12"
path: ""
vcs_processed:
type: "git"
type: "Git"
url: "https://github.com/junit-team/junit.git"
revision: "r4.12"
path: ""
@@ -136,12 +136,12 @@ analyzer:
value: "1dc37250fbc78e23a65a67fbbaf71d2e9cbc3c0b"
algorithm: "SHA-1"
vcs:
type: "git"
type: "Git"
url: "git@github.com:hamcrest/JavaHamcrest.git"
revision: ""
path: ""
vcs_processed:
type: "git"
type: "Git"
url: "ssh://git@github.com/hamcrest/JavaHamcrest.git"
revision: ""
path: ""
@@ -11,7 +11,7 @@ project:
revision: ""
path: ""
vcs_processed:
type: "git"
type: "Git"
url: "https://github.com/deis/example-python-flask.git"
revision: "0773991e36a4c69b121cdb05146d6140347d4065"
path: ""
@@ -54,7 +54,7 @@ packages:
revision: ""
path: ""
vcs_processed:
type: "git"
type: "Git"
url: "https://github.com/pallets/flask.git"
revision: ""
path: ""

0 comments on commit c5d3d39

Please sign in to comment.
You can’t perform that action at this time.