Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NIFI-14044 - Dependencies housekeeping for the NiFi NAR Maven Plugin #40

Merged
merged 1 commit into from
Nov 27, 2024
Merged

NIFI-14044 - Dependencies housekeeping for the NiFi NAR Maven Plugin #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
<version>32</version>
<version>33</version>
<relativePath />
</parent>
<groupId>org.apache.nifi</groupId>
Expand Down Expand Up @@ -77,9 +77,9 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.build.outputTimestamp>2024-09-25T19:25:52Z</project.build.outputTimestamp>
<inceptionYear>2014</inceptionYear>
<mockito.version>5.12.0</mockito.version>
<junit.version>5.10.2</junit.version>
<slf4j.version>2.0.13</slf4j.version>
<mockito.version>5.14.2</mockito.version>
<junit.version>5.11.3</junit.version>
<slf4j.version>2.0.16</slf4j.version>
</properties>
<build>
<pluginManagement>
Expand Down Expand Up @@ -247,30 +247,30 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
<version>3.6.2</version>
<version>3.6.3</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<scope>provided</scope>
<version>3.9.6</version>
<version>3.9.9</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>3.9.6</version>
<version>3.9.9</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<scope>provided</scope>
<version>3.9.6</version>
<version>3.9.9</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<type>maven-plugin</type>
<version>3.6.1</version>
<version>3.8.1</version>
<exclusions>
<exclusion>
<groupId>org.apache.maven.doxia</groupId>
Expand All @@ -297,18 +297,18 @@
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-dependency-tree</artifactId>
<version>3.2.1</version>
<version>3.3.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.4.1</version>
<version>3.4.2</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<scope>provided</scope>
<version>3.13.0</version>
<version>3.15.1</version>
</dependency>
<!-- Test Dependencies -->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/apache/nifi/NarMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -976,7 +976,7 @@ protected DependencyStatusSets getClassifierTranslatedDependencies(Set<Artifact>
// if this did something, we need to resolve the new artifacts
if (StringUtils.isNotEmpty(copyDepClassifier)) {
ArtifactTranslator translator = new ClassifierTypeTranslator(artifactHandlerManager, copyDepClassifier, type);
Set<ArtifactCoordinate> artifactCoordinates = translator.translate(artifacts, getLog());
Set<org.eclipse.aether.artifact.Artifact> artifactCoordinates = translator.translate(artifacts, getLog());

status = filterMarkedDependencies(artifacts);

Expand Down