File tree 5 files changed +10
-10
lines changed
package-managers/node/src/main/kotlin
scanners/scancode/src/main/kotlin
5 files changed +10
-10
lines changed Original file line number Diff line number Diff line change @@ -83,10 +83,10 @@ kotlin.target.compilations.apply {
83
83
84
84
configurations.all {
85
85
resolutionStrategy {
86
- // Ensure all JRuby versions match our version to avoid Psych YAML library issues.
86
+ // Ensure all transitive JRuby versions match ORT's version to avoid Psych YAML library issues.
87
87
force(libs.jruby)
88
88
89
- // Ensure that all transitive versions of Kotlin libraries match our version of Kotlin.
89
+ // Ensure that all transitive versions of Kotlin libraries match ORT's version of Kotlin.
90
90
force(" org.jetbrains.kotlin:kotlin-reflect:${libs.versions.kotlinPlugin.get()} " )
91
91
}
92
92
}
Original file line number Diff line number Diff line change @@ -322,9 +322,9 @@ class DependencyReference(
322
322
val dependencies : Set <DependencyReference > = emptySet(),
323
323
324
324
/* *
325
- * The type of linkage used for the referred package from its dependent package. As most of our supported
325
+ * The type of linkage used for the referred package from its dependent package. As most of ORT's supported
326
326
* package managers / languages only support dynamic linking or at least default to it, also use that as the
327
- * default value here to not blow up our result files.
327
+ * default value here to not blow up ORT result files.
328
328
*/
329
329
@JsonInclude(value = JsonInclude .Include .CUSTOM , valueFilter = PackageLinkageValueFilter ::class )
330
330
val linkage : PackageLinkage = PackageLinkage .DYNAMIC ,
@@ -367,9 +367,9 @@ data class DependencyGraphNode(
367
367
val fragment : Int = 0 ,
368
368
369
369
/* *
370
- * The type of linkage used for the referred package from its dependent package. As most of our supported
370
+ * The type of linkage used for the referred package from its dependent package. As most of ORT's supported
371
371
* package managers / languages only support dynamic linking or at least default to it, also use that as the
372
- * default value here to not blow up our result files.
372
+ * default value here to not blow up ORT result files.
373
373
*/
374
374
@JsonInclude(value = JsonInclude .Include .CUSTOM , valueFilter = PackageLinkageValueFilter ::class )
375
375
val linkage : PackageLinkage = PackageLinkage .DYNAMIC ,
Original file line number Diff line number Diff line change @@ -41,9 +41,9 @@ data class PackageReference(
41
41
override val id : Identifier ,
42
42
43
43
/* *
44
- * The type of linkage used for the referred package from its dependent package. As most of our supported
44
+ * The type of linkage used for the referred package from its dependent package. As most of ORT's supported
45
45
* package managers / languages only support dynamic linking or at least default to it, also use that as the
46
- * default value here to not blow up our result files.
46
+ * default value here to not blow up ORT result files.
47
47
*/
48
48
@JsonInclude(value = JsonInclude .Include .CUSTOM , valueFilter = PackageLinkageValueFilter ::class )
49
49
override val linkage : PackageLinkage = PackageLinkage .DYNAMIC ,
Original file line number Diff line number Diff line change @@ -204,7 +204,7 @@ open class Npm(
204
204
val scopeNames = setOfNotNull(
205
205
// Optional dependencies are just like regular dependencies except that NPM ignores failures when
206
206
// installing them (see https://docs.npmjs.com/files/package.json#optionaldependencies), i.e. they are
207
- // not a separate scope in our semantics.
207
+ // not a separate scope in ORT semantics.
208
208
buildDependencyGraphForScopes(
209
209
project,
210
210
workingDir,
Original file line number Diff line number Diff line change @@ -40,7 +40,7 @@ const val MAX_SUPPORTED_OUTPUT_FORMAT_MAJOR_VERSION = 3
40
40
41
41
private val TIMESTAMP_FORMATTER = DateTimeFormatter .ofPattern(" yyyy-MM-dd'T'HHmmss.n" ).withZone(ZoneId .of(" UTC" ))
42
42
43
- // Note: The "(File: ...)" part in the patterns below is actually added by our own getRawResult() function.
43
+ // Note: The "(File: ...)" part in the patterns below is actually added by ORT's own getRawResult() function.
44
44
private val UNKNOWN_ERROR_REGEX = Regex (
45
45
" (ERROR: for scanner: (?<scanner>\\ w+):\n )?" +
46
46
" ERROR: Unknown error:\n .+\n (?<error>\\ w+Error)[:\n ](?<message>.*) \\ (File: (?<file>.+)\\ )" ,
You can’t perform that action at this time.
0 commit comments