admin/aquasecurity-trivy
1
0
Fork 0
mirror of https://github.com/aquasecurity/trivy.git synced 2026-02-15 13:13:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(java): update order for resolving package fields from multiple demManagement (#9575)

Browse Source
This commit is contained in:
DmitriyLewen
2025-10-06 13:46:19 +06:00
committed by GitHub
parent 3962ea461a
commit e286c5e207
6 changed files with 283 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
pkg/dependency/parser/java/pom/testdata/get-fields-from-multiple-depmanagements/parent/pom.xml vendored Normal file
View File

@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.example</groupId>
<artifactId>parent</artifactId>
<version>1.0.0</version>
<packaging>pom</packaging>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.example</groupId>
<artifactId>example-api</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.example</groupId>
<artifactId>example-api3</artifactId>
<version>4.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.example</groupId>
<artifactId>example-api4</artifactId>
<version>4.0.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.example</groupId>
<artifactId>example-api5</artifactId>
<version>4.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.example</groupId>
<artifactId>example-api6</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.example</groupId>
<artifactId>example-api7</artifactId>
<scope>runtime</scope>
</dependency>
</dependencies>
</dependencyManagement>
</project>

36
pkg/dependency/parser/java/pom/testdata/get-fields-from-multiple-depmanagements/pom.xml vendored Normal file
View File

@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.example</groupId>
<artifactId>get-fields-from-multiple-depmanagements</artifactId>
<version>1.0.0</version>
<parent>
<groupId>com.example</groupId>
<artifactId>parent</artifactId>
<version>1.0.0</version>
<relativePath>./parent/pom.xml</relativePath>
</parent>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.example</groupId>
<artifactId>example-api2</artifactId>
<version>4.0.0</version>
<scope>compile</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>org.example</groupId>
<artifactId>example-dependency</artifactId>
<version>4.0.0</version>
</dependency>
</dependencies>
</project>

53
pkg/dependency/parser/java/pom/testdata/repository/org/example/example-dependency/4.0.0/example-dependency-4.0.0.pom vendored Normal file
View File

@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.example</groupId>
<artifactId>example-parent</artifactId>
<version>4.0.0</version>
</parent>
<groupId>org.example</groupId>
<artifactId>example-dependency</artifactId>
<version>4.0.0</version>
<packaging>jar</packaging>
<name>Example API Dependency</name>
<description>The example API</description>
<dependencies>
<dependency>
<groupId>org.example</groupId>
<artifactId>example-api</artifactId>
</dependency>
<dependency>
<groupId>org.example</groupId>
<artifactId>example-api2</artifactId>
</dependency>
<dependency>
<groupId>org.example</groupId>
<artifactId>example-api3</artifactId>
</dependency>
<dependency>
<groupId>org.example</groupId>
<artifactId>example-api4</artifactId>
</dependency>
<dependency>
<groupId>org.example</groupId>
<artifactId>example-api5</artifactId>
</dependency>
<dependency>
<groupId>org.example</groupId>
<artifactId>example-api6</artifactId>
</dependency>
<dependency>
<groupId>org.example</groupId>
<artifactId>example-api7</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>

56
pkg/dependency/parser/java/pom/testdata/repository/org/example/example-parent/4.0.0/example-parent-4.0.0.pom vendored Normal file
View File

@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.example</groupId>
<artifactId>example-parent</artifactId>
<version>4.0.0</version>
<packaging>pom</packaging>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.example</groupId>
<artifactId>example-api</artifactId>
<version>1.7.30</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.example</groupId>
<artifactId>example-api2</artifactId>
<version>1.7.30</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.example</groupId>
<artifactId>example-api3</artifactId>
<version>1.7.30</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.example</groupId>
<artifactId>example-api4</artifactId>
<version>1.7.30</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.example</groupId>
<artifactId>example-api5</artifactId>
<version>1.7.30</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.example</groupId>
<artifactId>example-api6</artifactId>
<version>1.7.30</version>
</dependency>
<dependency>
<groupId>org.example</groupId>
<artifactId>example-api7</artifactId>
<version>1.7.30</version>
</dependency>
</dependencies>
</dependencyManagement>
</project>