This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi-maven.git
The following commit(s) were added to refs/heads/main by this push:
new 4da0d65 NIFI-15632 Upgraded Maven to 3.9.12 and other dependencies
(#45)
4da0d65 is described below
commit 4da0d654fe393723aed91b625e040c9486d2eb51
Author: Pierre Villard <[email protected]>
AuthorDate: Mon Feb 23 14:56:33 2026 +0100
NIFI-15632 Upgraded Maven to 3.9.12 and other dependencies (#45)
- Aligned Checkstyle configuration with primary repository
- Upgraded Maven plugins and JUnit libraries
Signed-off-by: David Handermann <[email protected]>
---
.mvn/wrapper/maven-wrapper.properties | 4 +-
checkstyle.xml | 53 ++++++++++++++++++++++
pom.xml | 25 +++++-----
.../apache/nifi/NarDuplicateDependenciesMojo.java | 2 +-
src/main/java/org/apache/nifi/NarMojo.java | 2 +-
.../apache/nifi/NarProvidedDependenciesMojo.java | 2 +-
6 files changed, 71 insertions(+), 17 deletions(-)
diff --git a/.mvn/wrapper/maven-wrapper.properties
b/.mvn/wrapper/maven-wrapper.properties
index 346d645..983d8f0 100644
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -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
diff --git a/checkstyle.xml b/checkstyle.xml
index 193a4df..8c676b7 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -20,6 +20,11 @@
<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 -->
@@ -27,6 +32,10 @@
<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."/>
@@ -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"/>
@@ -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>
diff --git a/pom.xml b/pom.xml
index a8d7527..b64e715 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -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>
diff --git a/src/main/java/org/apache/nifi/NarDuplicateDependenciesMojo.java
b/src/main/java/org/apache/nifi/NarDuplicateDependenciesMojo.java
index 008ca9f..7d1fce5 100644
--- a/src/main/java/org/apache/nifi/NarDuplicateDependenciesMojo.java
+++ b/src/main/java/org/apache/nifi/NarDuplicateDependenciesMojo.java
@@ -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;
diff --git a/src/main/java/org/apache/nifi/NarMojo.java
b/src/main/java/org/apache/nifi/NarMojo.java
index 6758f6e..830bea7 100644
--- a/src/main/java/org/apache/nifi/NarMojo.java
+++ b/src/main/java/org/apache/nifi/NarMojo.java
@@ -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;
diff --git a/src/main/java/org/apache/nifi/NarProvidedDependenciesMojo.java
b/src/main/java/org/apache/nifi/NarProvidedDependenciesMojo.java
index 06553eb..e70da0e 100644
--- a/src/main/java/org/apache/nifi/NarProvidedDependenciesMojo.java
+++ b/src/main/java/org/apache/nifi/NarProvidedDependenciesMojo.java
@@ -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;
