Skip to content

NIFI-15632 - NiFi Maven - dependency housekeeping for release 2.3.0 #45

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

Merged
exceptionfactory merged 1 commit into from
Feb 23, 2026
Merged

NIFI-15632 - NiFi Maven - dependency housekeeping for release 2.3.0 #45

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
4 changes: 2 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.12/apache-maven-3.9.12-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar
53 changes: 53 additions & 0 deletions checkstyle.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,22 @@
<module name="FileTabCharacter">
<property name="eachLine" value="true"/>
</module>
<module name="NewlineAtEndOfFile"/>
<module name="RegexpMultiline">
<property name="format" value="\n{3,}"/>
<property name="message" value="Multiple consecutive blank lines are not allowed."/>
</module>
<module name="LineLength">
<!-- needs extra, because Eclipse formatter
ignores the ending left brace -->
<property name="max" value="200"/>
<property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
</module>
<module name="TreeWalker">
<module name="WhitespaceAfter"/>
<module name="NoWhitespaceAfter"/>
<module name="NoWhitespaceBefore"/>
<module name="WhitespaceAround"/>
<module name="RegexpSinglelineJava">
<property name="format" value="\s+$"/>
<property name="message" value="Line has trailing whitespace."/>
Expand All @@ -37,9 +46,17 @@
</module>
<module name="OuterTypeFilename"/>
<module name="AvoidStarImport"/>
<module name="IllegalImport"/>
<module name="RedundantImport"/>
<module name="UnusedImports">
<property name="processJavadoc" value="true"/>
</module>
<module name="CustomImportOrder">
<property name="customImportOrderRules" value="THIRD_PARTY_PACKAGE###SPECIAL_IMPORTS###STANDARD_JAVA_PACKAGE###STATIC"/>
<property name="sortImportsInGroupAlphabetically" value="true"/>
<property name="separateLineBetweenGroups" value="true"/>
<property name="standardPackageRegExp" value="^(java|javax)\."/>
</module>
<module name="NoLineWrap"/>
<module name="LeftCurly"/>
<module name="RightCurly"/>
Expand Down Expand Up @@ -81,5 +98,41 @@
<property name="allowedAnnotations" value="Override,Test,BeforeClass,AfterClass,Before,After"/>
</module>
<module name="SingleLineJavadoc"/>
<module name="UpperEll"/>
<module name="EqualsHashCode"/>
<module name="FallThrough"/>
<module name="StringLiteralEquality"/>
<module name="CovariantEquals"/>
<module name="DefaultComesLast"/>
<module name="SimplifyBooleanExpression"/>
<module name="SimplifyBooleanReturn"/>
<module name="MissingOverride"/>
<module name="EmptyStatement"/>
<module name="PatternVariableName"/>
<module name="RecordComponentName"/>
<module name="IllegalIdentifierName"/>
<module name="UnnecessarySemicolonInTryWithResources"/>
<module name="UnnecessarySemicolonAfterTypeMemberDeclaration"/>
<module name="AvoidNoArgumentSuperConstructorCall"/>
<module name="NeedBraces"/>
<module name="ModifierOrder"/>
<module name="MultipleVariableDeclarations"/>
<module name="OneStatementPerLine"/>
<module name="Indentation">
<property name="basicOffset" value="4"/>
<property name="braceAdjustment" value="0"/>
<property name="caseIndent" value="4"/>
<property name="throwsIndent" value="4"/>
<property name="lineWrappingIndentation" value="4"/>
<property name="arrayInitIndent" value="8"/>
</module>
<module name="CommentsIndentation"/>
<module name="IllegalInstantiation"/>
<module name="ArrayTypeStyle"/>
<module name="InvalidJavadocPosition"/>
<module name="EmptyForIteratorPad"/>
<module name="GenericWhitespace"/>
<module name="ParenPad"/>
<module name="TypecastParenPad"/>
</module>
</module>
25 changes: 13 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>35</version>
<version>37</version>
<relativePath />
</parent>
<groupId>org.apache.nifi</groupId>
Expand Down Expand Up @@ -77,8 +77,8 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<project.build.outputTimestamp>2025-10-23T04:09:48Z</project.build.outputTimestamp>
<inceptionYear>2014</inceptionYear>
<mockito.version>5.20.0</mockito.version>
<junit.version>6.0.0</junit.version>
<mockito.version>5.21.0</mockito.version>
<junit.version>6.0.3</junit.version>
<slf4j.version>2.0.17</slf4j.version>
</properties>
<build>
Expand All @@ -87,12 +87,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.4</version>
<version>3.5.5</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>3.1.1</version>
<version>3.3.1</version>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<releaseProfiles>apache-release</releaseProfiles>
Expand Down Expand Up @@ -122,7 +122,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>11.1.0</version>
<version>13.2.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down Expand Up @@ -169,7 +169,7 @@
</plugins>
</requireSameVersions>
<requireMavenVersion>
<version>3.9.6</version>
<version>3.9.12</version>
</requireMavenVersion>
<requireReleaseDeps>
<message>Dependencies outside of Apache NiFi must not use SNAPSHOT versions</message>
Expand Down Expand Up @@ -246,24 +246,25 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
<version>3.6.4</version>
<version>3.6.6</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
<scope>provided</scope>
<version>3.9.11</version>
<version>3.9.12</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>3.9.11</version>
<scope>provided</scope>
<version>3.9.12</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-compat</artifactId>
<scope>provided</scope>
<version>3.9.11</version>
<version>3.9.12</version>
</dependency>
<dependency>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -307,7 +308,7 @@
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<scope>provided</scope>
<version>3.15.1</version>
<version>3.15.2</version>
</dependency>
<!-- Test Dependencies -->
<dependency>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/apache/nifi/NarDuplicateDependenciesMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public class NarDuplicateDependenciesMojo extends AbstractMojo {
private ArtifactHandlerManager artifactHandlerManager;

/**
* The {@link ProjectBuilder} used to generate the {@link MavenProject} for the nar artifact the dependency tree is being generated for.
* The {@link ProjectBuilder} used to generate the {@code MavenProject} for the nar artifact the dependency tree is being generated for.
*/
@Component
private ProjectBuilder projectBuilder;
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 @@ -482,7 +482,7 @@ public class NarMojo extends AbstractMojo {


/**
* The {@link ProjectBuilder} used to generate the {@link MavenProject} for the nar artifact the dependency tree is being generated for.
* The {@link ProjectBuilder} used to generate the {@code MavenProject} for the nar artifact the dependency tree is being generated for.
*/
@Component
private ProjectBuilder projectBuilder;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/apache/nifi/NarProvidedDependenciesMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public class NarProvidedDependenciesMojo extends AbstractMojo {
private ArtifactHandlerManager artifactHandlerManager;

/**
* The {@link ProjectBuilder} used to generate the {@link MavenProject} for the nar artifact the dependency tree is being generated for.
* The {@link ProjectBuilder} used to generate the {@code MavenProject} for the nar artifact the dependency tree is being generated for.
*/
@Component
private ProjectBuilder projectBuilder;
Expand Down