diff --git a/README.md b/README.md index 0bb78030..8517fbc2 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ For information on how to use the integrations see the project documentation: ### Requirements * [Apache Maven](https://maven.apache.org/) 3.3+ (prefer to use included `mvnw`) -* JDK 7+ (10 is **NOT** supported) +* JDK 8+ (10 is **NOT** supported) ### Build diff --git a/common/pom.xml b/common/pom.xml index 40922fb9..82ef0640 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -46,7 +46,6 @@ org.apache.maven maven-artifact - 3.0 diff --git a/common/src/main/java/org/sonatype/ossindex/maven/common/ComponentReportAssistant.java b/common/src/main/java/org/sonatype/ossindex/maven/common/ComponentReportAssistant.java index 6895bb37..d4cc33cc 100644 --- a/common/src/main/java/org/sonatype/ossindex/maven/common/ComponentReportAssistant.java +++ b/common/src/main/java/org/sonatype/ossindex/maven/common/ComponentReportAssistant.java @@ -124,7 +124,7 @@ public ComponentReportResult request(final ComponentReportRequest request) { */ @VisibleForTesting static PackageUrl packageUrl(final Artifact artifact) { - return new PackageUrl.Builder() + return PackageUrl.builder() .type("maven") .namespace(artifact.getGroupId()) .name(artifact.getArtifactId()) diff --git a/enforcer-rules/pom.xml b/enforcer-rules/pom.xml index bd25a89f..0fd4538e 100644 --- a/enforcer-rules/pom.xml +++ b/enforcer-rules/pom.xml @@ -27,11 +27,6 @@ ${project.groupId}:${project.artifactId} jar - - - 3.0 - - org.sonatype.ossindex.maven @@ -41,7 +36,7 @@ org.apache.maven.enforcer enforcer-api - 3.0.0-M1 + 3.0.0 @@ -64,11 +59,9 @@ maven-artifact - org.apache.maven.shared maven-dependency-tree - 2.2 diff --git a/enforcer-rules/src/main/java/org/sonatype/ossindex/maven/enforcer/BanVulnerableDependencies.java b/enforcer-rules/src/main/java/org/sonatype/ossindex/maven/enforcer/BanVulnerableDependencies.java index 338ba86a..385a8d61 100644 --- a/enforcer-rules/src/main/java/org/sonatype/ossindex/maven/enforcer/BanVulnerableDependencies.java +++ b/enforcer-rules/src/main/java/org/sonatype/ossindex/maven/enforcer/BanVulnerableDependencies.java @@ -20,6 +20,8 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; +import org.apache.maven.project.DefaultProjectBuildingRequest; +import org.apache.maven.project.ProjectBuildingRequest; import org.sonatype.ossindex.maven.common.ComponentReportAssistant; import org.sonatype.ossindex.maven.common.ComponentReportRequest; import org.sonatype.ossindex.maven.common.ComponentReportResult; @@ -312,7 +314,11 @@ private Set resolveDependencies() throws DependencyGraphBuilderExcepti artifactFilter = new CumulativeScopeArtifactFilter(scopes); } - DependencyNode node = graphBuilder.buildDependencyGraph(project, artifactFilter); + ProjectBuildingRequest buildingRequest = + new DefaultProjectBuildingRequest( session.getProjectBuildingRequest() ); + buildingRequest.setProject( project ); + + DependencyNode node = graphBuilder.buildDependencyGraph(buildingRequest, artifactFilter); collectArtifacts(result, node); return result; diff --git a/pom.xml b/pom.xml index cff82ffe..79f720e7 100644 --- a/pom.xml +++ b/pom.xml @@ -92,10 +92,11 @@ - 1.7 - 1.7 + 1.8 + 1.8 - 3.0 + 3.5.0 + 3.6.0 2.9.10 1.0.3 @@ -137,7 +138,7 @@ org.sonatype.ossindex ossindex-service-client - 1.1.1 + 1.8.1 @@ -149,7 +150,7 @@ org.apache.maven.plugin-tools maven-plugin-annotations - ${apache-maven.version} + ${maven.plugin-annotations.version} @@ -185,7 +186,7 @@ org.apache.maven.shared maven-dependency-tree - 3.0.1 + 3.1.0 @@ -365,7 +366,7 @@ - 51 + 52 @@ -379,7 +380,7 @@ org.codehaus.mojo.signature - java17 + java18 1.0