Skip to content

Commit f0c902f

Browse files
heliocastroheliocastro
authored
Merge branch 'main' into feat/python_uv
2 parents 5a34f28 + d50c3ae commit f0c902f

File tree

13 files changed

+423
-14
lines changed

13 files changed

+423
-14
lines changed

‎buildSrc/src/main/kotlin/ort-kotlin-conventions.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,8 @@ detekt {
105105

106106
java {
107107
toolchain {
108+
// Note that Gradle currently matches the Java language version exactly and does not consider (backward)
109+
// compatibility between versions, see https://github.com/gradle/gradle/issues/16256.
108110
languageVersion = JavaLanguageVersion.of(javaLanguageVersion)
109111
}
110112
}

‎gradle/libs.versions.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[versions]
2-
dependencyAnalysisPlugin = "2.11.0"
2+
dependencyAnalysisPlugin = "2.12.0"
33
detektPlugin = "1.23.8"
44
dokkatooPlugin = "2.4.0"
55
downloadPlugin = "5.6.0"
66
gitSemverPlugin = "0.16.0"
7-
graalVmNativeImagePlugin = "0.10.5"
7+
graalVmNativeImagePlugin = "0.10.6"
88
ideaExtPlugin = "1.1.10"
99
jakartaMigrationPlugin = "0.24.0"
1010
kotlinPlugin = "2.1.10"
@@ -59,7 +59,7 @@ postgres = "42.7.5"
5959
postgresEmbedded = "1.1.0"
6060
reflections = "0.10.2"
6161
retrofit = "2.11.0"
62-
s3 = "2.30.36"
62+
s3 = "2.31.0"
6363
saxonHe = "12.5"
6464
scanoss = "0.10.1"
6565
semver4j = "5.6.0"

‎plugins/commands/requirements/build.gradle.kts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ dependencies {
2828
ksp(projects.plugins.commands.commandApi)
2929

3030
implementation(projects.analyzer)
31-
implementation(projects.downloader)
3231
implementation(projects.model)
33-
implementation(projects.scanner)
3432
implementation(projects.utils.commonUtils)
3533
implementation(projects.utils.spdxUtils)
3634

‎plugins/package-managers/maven/src/funTest/assets/projects/synthetic/tycho-expected-output-feature.yml

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
---
2+
projects:
3+
- id: "Tycho:org.ossreviewtoolkit:org.ossreviewtoolkit.tycho.test.bundle:1.1.0-SNAPSHOT"
4+
definition_file_path: "plugins/package-managers/maven/src/funTest/assets/projects/synthetic/tycho-feature/org.ossreviewtoolkit.tycho.bundle/.tycho-consumer-pom.xml"
5+
authors:
6+
- "ACME"
7+
- "ORT"
8+
- "Sirius Cybernetics Corporation"
9+
declared_licenses:
10+
- "Apache License, Version 2.0"
11+
declared_licenses_processed:
12+
spdx_expression: "Apache-2.0"
13+
mapped:
14+
Apache License, Version 2.0: "Apache-2.0"
15+
vcs:
16+
type: "Git"
17+
url: "https://example.com/git/repository.git"
18+
revision: ""
19+
path: ""
20+
vcs_processed:
21+
type: "Git"
22+
url: "<REPLACE_URL_PROCESSED>"
23+
revision: "<REPLACE_REVISION>"
24+
path: "plugins/package-managers/maven/src/funTest/assets/projects/synthetic/tycho-feature/org.ossreviewtoolkit.tycho.bundle"
25+
homepage_url: "http://maven.apache.org/org.ossreviewtoolkit.tycho.test.bundle"
26+
scopes:
27+
- name: "system"
28+
dependencies:
29+
- id: "Maven:p2.eclipse.plugin:org.apache.commons.collections4:4.4.0.v20200420-1700"
30+
- id: "Tycho:org.ossreviewtoolkit:org.ossreviewtoolkit.tycho.test.feature:1.0.0-SNAPSHOT"
31+
definition_file_path: "plugins/package-managers/maven/src/funTest/assets/projects/synthetic/tycho-feature/org.ossreviewtoolkit.tycho.feature/.tycho-consumer-pom.xml"
32+
authors:
33+
- "ACME"
34+
- "ORT"
35+
- "Sirius Cybernetics Corporation"
36+
declared_licenses:
37+
- "Apache License, Version 2.0"
38+
declared_licenses_processed:
39+
spdx_expression: "Apache-2.0"
40+
mapped:
41+
Apache License, Version 2.0: "Apache-2.0"
42+
vcs:
43+
type: "Git"
44+
url: "https://example.com/git/repository.git"
45+
revision: ""
46+
path: ""
47+
vcs_processed:
48+
type: "Git"
49+
url: "<REPLACE_URL_PROCESSED>"
50+
revision: "<REPLACE_REVISION>"
51+
path: "plugins/package-managers/maven/src/funTest/assets/projects/synthetic/tycho-feature/org.ossreviewtoolkit.tycho.feature"
52+
homepage_url: "http://maven.apache.org/org.ossreviewtoolkit.tycho.test.feature"
53+
scopes:
54+
- name: "compile"
55+
dependencies:
56+
- id: "Tycho:org.ossreviewtoolkit:org.ossreviewtoolkit.tycho.test.bundle:1.1.0-SNAPSHOT"
57+
linkage: "PROJECT_DYNAMIC"
58+
dependencies:
59+
- id: "Maven:p2.eclipse.plugin:org.apache.commons.collections4:4.4.0.v20200420-1700"
60+
- name: "system"
61+
dependencies:
62+
- id: "Maven:p2.eclipse.plugin:org.apache.commons.collections4:4.4.0.v20200420-1700"
63+
- id: "Tycho:org.ossreviewtoolkit:tycho-test-aggregator:1.0.0-SNAPSHOT"
64+
definition_file_path: "plugins/package-managers/maven/src/funTest/assets/projects/synthetic/tycho-feature/pom.xml"
65+
authors:
66+
- "ACME"
67+
- "Sirius Cybernetics Corporation"
68+
declared_licenses:
69+
- "Apache License, Version 2.0"
70+
declared_licenses_processed:
71+
spdx_expression: "Apache-2.0"
72+
mapped:
73+
Apache License, Version 2.0: "Apache-2.0"
74+
vcs:
75+
type: "Git"
76+
url: "https://example.com/git/repository.git"
77+
revision: ""
78+
path: ""
79+
vcs_processed:
80+
type: "Git"
81+
url: "<REPLACE_URL_PROCESSED>"
82+
revision: "<REPLACE_REVISION>"
83+
path: "plugins/package-managers/maven/src/funTest/assets/projects/synthetic/tycho-feature"
84+
homepage_url: "http://maven.apache.org"
85+
scopes: []
86+
packages:
87+
- id: "Maven:p2.eclipse.plugin:org.apache.commons.collections4:4.4.0.v20200420-1700"
88+
purl: "pkg:maven/p2.eclipse.plugin/[email protected]"
89+
authors:
90+
- "%bundleVendor"
91+
declared_licenses:
92+
- "https://www.apache.org/licenses/LICENSE-2.0.txt"
93+
declared_licenses_processed:
94+
unmapped:
95+
- "https://www.apache.org/licenses/LICENSE-2.0.txt"
96+
description: "The Apache Commons Collections package contains types that extend\
97+
\ and augment the Java Collections Framework."
98+
homepage_url: "https://commons.apache.org/proper/commons-collections/"
99+
binary_artifact:
100+
url: "https://download.eclipse.org/tools/orbit/downloads/drops2/R20211213173813/repository/plugins/org.apache.commons.collections4_4.4.0.v20200420-1700.jar"
101+
hash:
102+
value: "bd6d43638710c9f2e23a862671fe359ad593c5ca85295f18798babb5fc9a9cd1"
103+
algorithm: "SHA-256"
104+
source_artifact:
105+
url: "https://download.eclipse.org/tools/orbit/downloads/drops2/R20211213173813/repository/plugins/org.apache.commons.collections4.source_4.4.0.v20200420-1700.jar"
106+
hash:
107+
value: "e9f1077e456fc0483955d747835acf630412ced4154ec3bfa3a128d74a73ac2d"
108+
algorithm: "SHA-256"
109+
vcs:
110+
type: ""
111+
url: ""
112+
revision: ""
113+
path: ""
114+
vcs_processed:
115+
type: ""
116+
url: ""
117+
revision: ""
118+
path: ""

‎plugins/package-managers/maven/src/funTest/assets/projects/synthetic/tycho-feature/.mvn/extensions.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<extensions>
2+
<extension>
3+
<groupId>org.eclipse.tycho</groupId>
4+
<artifactId>tycho-build</artifactId>
5+
<version>4.0.8</version>
6+
</extension>
7+
</extensions>

‎plugins/package-managers/maven/src/funTest/assets/projects/synthetic/tycho-feature/org.ossreviewtoolkit.tycho.bundle/META-INF/MANIFEST.MF

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Manifest-Version: 1.0
2+
Bundle-ManifestVersion: 2
3+
Bundle-Name: %Bundle-Name
4+
Bundle-SymbolicName: org.ossreviewtoolkit.tycho.test.bundle
5+
Bundle-Version: 1.1.0.qualifier
6+
Require-Bundle: org.apache.commons.collections4;bundle-version="4.4.0.v20200420-1700"
7+
Bundle-RequiredExecutionEnvironment: JavaSE-21
8+
Bundle-ActivationPolicy: lazy
9+
Bundle-Vendor: ORT
10+
Automatic-Module-Name: org.ossreviewtoolkit.tycho.test.bundle

‎plugins/package-managers/maven/src/funTest/assets/projects/synthetic/tycho-feature/org.ossreviewtoolkit.tycho.feature/feature.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<feature
3+
id="org.ossreviewtoolkit.tycho.test.feature"
4+
label="Tycho test feature"
5+
version="1.0.0.qualifier"
6+
provider-name="ORT">
7+
8+
<description>
9+
A test feature for the ORT Tycho package manager.
10+
</description>
11+
12+
<copyright>
13+
</copyright>
14+
15+
<license url="">
16+
</license>
17+
18+
<plugin
19+
id="org.ossreviewtoolkit.tycho.test.bundle"
20+
download-size="0"
21+
install-size="0"
22+
version="0.0.0"
23+
unpack="false"/>
24+
</feature>

‎plugins/package-managers/maven/src/funTest/assets/projects/synthetic/tycho-feature/org.ossreviewtoolkit.tycho.parent/pom.xml

Lines changed: 159 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
<project>
2+
<modelVersion>4.0.0</modelVersion>
3+
<groupId>org.ossreviewtoolkit</groupId>
4+
<artifactId>tycho-test-parent</artifactId>
5+
<version>1.0.0-SNAPSHOT</version>
6+
<packaging>pom</packaging>
7+
8+
<properties>
9+
<tycho.version>4.0.8</tycho.version>
10+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
11+
</properties>
12+
13+
<build>
14+
<pluginManagement>
15+
<plugins>
16+
<plugin>
17+
<groupId>org.eclipse.tycho</groupId>
18+
<artifactId>tycho-p2-director-plugin</artifactId>
19+
<version>${tycho.version}</version>
20+
<executions>
21+
<execution>
22+
<id>materialize-products</id>
23+
<goals>
24+
<goal>materialize-products</goal>
25+
</goals>
26+
</execution>
27+
<execution>
28+
<id>archive-products</id>
29+
<goals>
30+
<goal>archive-products</goal>
31+
</goals>
32+
</execution>
33+
</executions>
34+
</plugin>
35+
<plugin>
36+
<groupId>org.eclipse.tycho</groupId>
37+
<artifactId>tycho-maven-plugin</artifactId>
38+
<version>${tycho.version}</version>
39+
<extensions>true</extensions>
40+
</plugin>
41+
<plugin>
42+
<groupId>org.eclipse.tycho</groupId>
43+
<artifactId>tycho-p2-plugin</artifactId>
44+
<version>${tycho.version}</version>
45+
<executions>
46+
<execution>
47+
<goals>
48+
<goal>p2-metadata</goal>
49+
</goals>
50+
<id>attach-p2-metadata</id>
51+
<phase>package</phase>
52+
</execution>
53+
</executions>
54+
</plugin>
55+
<plugin>
56+
<groupId>org.eclipse.tycho</groupId>
57+
<artifactId>tycho-packaging-plugin</artifactId>
58+
<version>${tycho.version}</version>
59+
<executions>
60+
<execution>
61+
<phase>package</phase>
62+
<id>package-feature</id>
63+
<configuration>
64+
<finalName>${project.artifactId}_${unqualifiedVersion}.${buildQualifier}</finalName>
65+
</configuration>
66+
</execution>
67+
</executions>
68+
</plugin>
69+
<plugin>
70+
<groupId>org.eclipse.tycho</groupId>
71+
<artifactId>target-platform-configuration</artifactId>
72+
<version>${tycho.version}</version>
73+
<configuration>
74+
<environments>
75+
<environment>
76+
<os>linux</os>
77+
<ws>gtk</ws>
78+
<arch>x86_64</arch>
79+
</environment>
80+
<environment>
81+
<os>win32</os>
82+
<ws>win32</ws>
83+
<arch>x86_64</arch>
84+
</environment>
85+
<environment>
86+
<os>macosx</os>
87+
<ws>cocoa</ws>
88+
<arch>x86_64</arch>
89+
</environment>
90+
</environments>
91+
<target>
92+
<file>../org.ossreviewtoolkit.tycho.target/org.ossreviewtoolkit.tycho.target.target</file>
93+
</target>
94+
</configuration>
95+
</plugin>
96+
<plugin>
97+
<groupId>org.eclipse.tycho</groupId>
98+
<artifactId>tycho-compiler-plugin</artifactId>
99+
<version>${tycho.version}</version>
100+
<configuration>
101+
<compilerArgument>-enableJavadoc</compilerArgument>
102+
<compilerArgument>-warn:-warningToken</compilerArgument>
103+
<encoding>${project.build.sourceEncoding}</encoding>
104+
<optimize>true</optimize>
105+
<showDeprecation>true</showDeprecation>
106+
<showWarnings>true</showWarnings>
107+
<source>17.0</source>
108+
<target>17.0</target>
109+
<useProjectSettings>true</useProjectSettings>
110+
</configuration>
111+
</plugin>
112+
<plugin>
113+
<groupId>org.eclipse.tycho</groupId>
114+
<artifactId>tycho-p2-repository-plugin</artifactId>
115+
<version>${tycho.version}</version>
116+
<configuration>
117+
<includeAllDependencies>true</includeAllDependencies>
118+
</configuration>
119+
<executions>
120+
<execution>
121+
<id>default-assemble-repository</id>
122+
<phase>package</phase>
123+
<goals>
124+
<goal>assemble-repository</goal>
125+
</goals>
126+
<configuration>
127+
<includeAllSources>false</includeAllSources>
128+
</configuration>
129+
</execution>
130+
</executions>
131+
</plugin>
132+
<plugin>
133+
<artifactId>tycho-p2-extras-plugin</artifactId>
134+
<groupId>org.eclipse.tycho.extras</groupId>
135+
<version>${tycho.version}</version>
136+
</plugin>
137+
</plugins>
138+
</pluginManagement>
139+
<plugins>
140+
<plugin>
141+
<artifactId>target-platform-configuration</artifactId>
142+
<groupId>org.eclipse.tycho</groupId>
143+
</plugin>
144+
<plugin>
145+
<artifactId>tycho-compiler-plugin</artifactId>
146+
<groupId>org.eclipse.tycho</groupId>
147+
</plugin>
148+
<plugin>
149+
<artifactId>tycho-maven-plugin</artifactId>
150+
<extensions>true</extensions>
151+
<groupId>org.eclipse.tycho</groupId>
152+
</plugin>
153+
<plugin>
154+
<artifactId>tycho-p2-extras-plugin</artifactId>
155+
<groupId>org.eclipse.tycho.extras</groupId>
156+
</plugin>
157+
</plugins>
158+
</build>
159+
</project>

‎plugins/package-managers/maven/src/funTest/assets/projects/synthetic/tycho-feature/org.ossreviewtoolkit.tycho.target/org.ossreviewtoolkit.tycho.target.target

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?pde version="3.8"?>
2+
<target name="MyTarget" sequenceNumber="1">
3+
<locations>
4+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner"
5+
includeSource="true" type="InstallableUnit">
6+
<repository
7+
location="https://download.eclipse.org/tools/orbit/downloads/drops/R20211213173813/repository" />
8+
<unit id="org.apache.commons.collections4" version="0.0.0" />
9+
</location>
10+
</locations>
11+
</target>

0 commit comments

Comments
 (0)