This is an automated email from the ASF dual-hosted git repository.
pvillard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 3bed30e9db NIFI-12962 Upgraded Spring Framework from 6.0.18 to 6.1.5
3bed30e9db is described below
commit 3bed30e9dba3712b52506430b74db84a8171589e
Author: exceptionfactory <[email protected]>
AuthorDate: Tue Mar 26 23:45:17 2024 -0500
NIFI-12962 Upgraded Spring Framework from 6.0.18 to 6.1.5
- Enabled parameter names for reflection in nifi-web-api to support AspectJ
Around expression parsing
Signed-off-by: Pierre Villard <[email protected]>
This closes #8575.
---
.../nifi-framework/nifi-web/nifi-web-api/pom.xml | 8 ++++++++
nifi-registry/pom.xml | 1 -
pom.xml | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
index 65674d9a9f..2284a93038 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml
@@ -35,6 +35,14 @@
</resource>
</resources>
<plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!-- Enable parameters for AspectJ Around annotation
argument name resolution -->
+ <parameters>true</parameters>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml
index 5bdeeb5d3a..70ffa926b2 100644
--- a/nifi-registry/pom.xml
+++ b/nifi-registry/pom.xml
@@ -35,7 +35,6 @@
<module>nifi-registry-docker-maven</module>
</modules>
<properties>
- <spring.version>6.1.5</spring.version>
<spring.boot.version>3.2.3</spring.boot.version>
<flyway.version>9.22.3</flyway.version>
<flyway.tests.version>9.5.0</flyway.tests.version>
diff --git a/pom.xml b/pom.xml
index dc783aa31f..f343a01391 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,7 +151,7 @@
<snakeyaml.version>2.2</snakeyaml.version>
<netty.4.version>4.1.106.Final</netty.4.version>
<servlet-api.version>6.0.0</servlet-api.version>
- <spring.version>6.0.18</spring.version>
+ <spring.version>6.1.5</spring.version>
<spring.security.version>6.2.3</spring.security.version>
<swagger.annotations.version>2.2.20</swagger.annotations.version>
<h2.version>2.2.224</h2.version>
