Skip to content

Commit d7766be

Browse files
sschuberthsschuberth
committed
style!: Fix package names that slipped through while the check was broken
BREAKING CHANGE: Programmatic users need to adapt to the package names. Signed-off-by: Sebastian Schuberth <sebastian@doubleopen.io>
1 parent 0ca59e3 commit d7766be

13 files changed

Lines changed: 36 additions & 36 deletions

File tree

‎plugins/package-managers/ort-project-file/src/funTest/kotlin/OrtProjectFileFunTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* License-Filename: LICENSE
1818
*/
1919

20-
package org.ossreviewtoolkit.plugins.packagemanagers.ortproject
20+
package org.ossreviewtoolkit.plugins.packagemanagers.ortprojectfile
2121

2222
import io.kotest.core.spec.style.WordSpec
2323
import io.kotest.matchers.collections.beEmpty as beEmptyCollection

‎plugins/package-managers/ort-project-file/src/main/kotlin/OrtProject.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* License-Filename: LICENSE
1818
*/
1919

20-
package org.ossreviewtoolkit.plugins.packagemanagers.ortproject
20+
package org.ossreviewtoolkit.plugins.packagemanagers.ortprojectfile
2121

2222
import com.charleskorn.kaml.Yaml
2323

‎plugins/package-managers/ort-project-file/src/main/kotlin/OrtProjectFile.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* License-Filename: LICENSE
1818
*/
1919

20-
package org.ossreviewtoolkit.plugins.packagemanagers.ortproject
20+
package org.ossreviewtoolkit.plugins.packagemanagers.ortprojectfile
2121

2222
import java.io.File
2323

‎plugins/package-managers/ort-project-file/src/main/kotlin/OrtProjectMapper.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* License-Filename: LICENSE
1818
*/
1919

20-
package org.ossreviewtoolkit.plugins.packagemanagers.ortproject
20+
package org.ossreviewtoolkit.plugins.packagemanagers.ortprojectfile
2121

2222
import java.io.File
2323

@@ -39,9 +39,9 @@ import org.ossreviewtoolkit.model.orNone
3939
import org.ossreviewtoolkit.model.utils.toIdentifier
4040
import org.ossreviewtoolkit.model.utils.toPackageUrl
4141
import org.ossreviewtoolkit.model.utils.toPurl
42-
import org.ossreviewtoolkit.plugins.packagemanagers.ortproject.OrtProject.Dependency
43-
import org.ossreviewtoolkit.plugins.packagemanagers.ortproject.OrtProject.SourceArtifact
44-
import org.ossreviewtoolkit.plugins.packagemanagers.ortproject.OrtProject.Vcs
42+
import org.ossreviewtoolkit.plugins.packagemanagers.ortprojectfile.OrtProject.Dependency
43+
import org.ossreviewtoolkit.plugins.packagemanagers.ortprojectfile.OrtProject.SourceArtifact
44+
import org.ossreviewtoolkit.plugins.packagemanagers.ortprojectfile.OrtProject.Vcs
4545

4646
private const val DEFAULT_SCOPE_NAME = "unnamed"
4747
private const val PROJECT_TYPE = "OrtProjectFile"

‎plugins/package-managers/spdx-document-file/src/funTest/kotlin/SpdxDocumentFileFunTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* License-Filename: LICENSE
1818
*/
1919

20-
package org.ossreviewtoolkit.plugins.packagemanagers.spdx
20+
package org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile
2121

2222
import io.kotest.core.annotation.Tags
2323
import io.kotest.core.spec.style.WordSpec

‎plugins/package-managers/spdx-document-file/src/main/kotlin/SpdxDocumentFile.kt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* License-Filename: LICENSE
1818
*/
1919

20-
package org.ossreviewtoolkit.plugins.packagemanagers.spdx
20+
package org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile
2121

2222
import java.io.File
2323

@@ -49,17 +49,17 @@ import org.ossreviewtoolkit.plugins.api.OrtPlugin
4949
import org.ossreviewtoolkit.plugins.api.OrtPluginOption
5050
import org.ossreviewtoolkit.plugins.api.PluginConfig
5151
import org.ossreviewtoolkit.plugins.api.PluginDescriptor
52-
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.SpdxDocumentCache
53-
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.SpdxResolvedDocument
54-
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.extractScopeFromExternalReferences
55-
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.isExternalDocumentReferenceId
56-
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.locateCpe
57-
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.locateExternalReference
58-
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.mapNotPresentToEmpty
59-
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.projectPackage
60-
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.toIdentifier
61-
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.toPackage
62-
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils.wrapPresentInSet
52+
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.SpdxDocumentCache
53+
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.SpdxResolvedDocument
54+
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.extractScopeFromExternalReferences
55+
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.isExternalDocumentReferenceId
56+
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.locateCpe
57+
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.locateExternalReference
58+
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.mapNotPresentToEmpty
59+
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.projectPackage
60+
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.toIdentifier
61+
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.toPackage
62+
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils.wrapPresentInSet
6363
import org.ossreviewtoolkit.utils.spdxdocument.model.SpdxExternalReference
6464
import org.ossreviewtoolkit.utils.spdxdocument.model.SpdxPackage
6565
import org.ossreviewtoolkit.utils.spdxdocument.model.SpdxRelationship

‎plugins/package-managers/spdx-document-file/src/main/kotlin/utils/SpdxDocumentCache.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
* License-Filename: LICENSE
1818
*/
1919

20-
package org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils
20+
package org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils
2121

2222
import java.io.File
2323

2424
import org.apache.logging.log4j.kotlin.logger
2525

26-
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.SpdxDocumentFile
26+
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.SpdxDocumentFile
2727
import org.ossreviewtoolkit.utils.spdxdocument.SpdxModelMapper
2828
import org.ossreviewtoolkit.utils.spdxdocument.model.SpdxDocument
2929

‎plugins/package-managers/spdx-document-file/src/main/kotlin/utils/SpdxExtensions.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* License-Filename: LICENSE
1818
*/
1919

20-
package org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils
20+
package org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils
2121

2222
import java.io.File
2323

@@ -36,7 +36,7 @@ import org.ossreviewtoolkit.model.orEmpty
3636
import org.ossreviewtoolkit.model.utils.toIdentifier
3737
import org.ossreviewtoolkit.model.utils.toPackageUrl
3838
import org.ossreviewtoolkit.model.utils.toPurl
39-
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.PACKAGE_TYPE_SPDX
39+
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.PACKAGE_TYPE_SPDX
4040
import org.ossreviewtoolkit.utils.common.withoutPrefix
4141
import org.ossreviewtoolkit.utils.spdx.SpdxConstants
4242
import org.ossreviewtoolkit.utils.spdxdocument.model.SpdxDocument

‎plugins/package-managers/spdx-document-file/src/main/kotlin/utils/SpdxResolvedDocument.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
@file:Suppress("TooManyFunctions")
2121

22-
package org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils
22+
package org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils
2323

2424
import java.io.File
2525
import java.net.URI
@@ -30,8 +30,8 @@ import org.ossreviewtoolkit.model.Hash
3030
import org.ossreviewtoolkit.model.Issue
3131
import org.ossreviewtoolkit.model.Severity
3232
import org.ossreviewtoolkit.model.createAndLogIssue
33-
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.SpdxDocumentFile
34-
import org.ossreviewtoolkit.plugins.packagemanagers.spdx.SpdxDocumentFileFactory
33+
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.SpdxDocumentFile
34+
import org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.SpdxDocumentFileFactory
3535
import org.ossreviewtoolkit.utils.authentication.requestPasswordAuthentication
3636
import org.ossreviewtoolkit.utils.common.collectMessages
3737
import org.ossreviewtoolkit.utils.common.safeDeleteRecursively

‎plugins/package-managers/spdx-document-file/src/main/kotlin/utils/StringExtensions.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* License-Filename: LICENSE
1818
*/
1919

20-
package org.ossreviewtoolkit.plugins.packagemanagers.spdx.utils
20+
package org.ossreviewtoolkit.plugins.packagemanagers.spdxdocumentfile.utils
2121

2222
import org.ossreviewtoolkit.model.Identifier
2323
import org.ossreviewtoolkit.utils.common.collapseWhitespace

0 commit comments

Comments
 (0)