This is an automated email from the ASF dual-hosted git repository.
mthomsen 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 5b3601f50f NIFI-10472 Upgraded SnakeYAML from 1.29 to 1.31
5b3601f50f is described below
commit 5b3601f50fb71f7c3b53cbfbcd3a2cccf45b06ee
Author: exceptionfactory <[email protected]>
AuthorDate: Fri Sep 9 14:19:11 2022 -0500
NIFI-10472 Upgraded SnakeYAML from 1.29 to 1.31
- Replaced module overrides with root managed dependency version
This closes #6389
Signed-off-by: Mike Thomsen <[email protected]>
---
minifi/pom.xml | 5 -----
.../nifi-easyrules-bundle/nifi-easyrules-service/pom.xml | 1 -
nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml | 6 ------
nifi-nar-bundles/nifi-graph-bundle/pom.xml | 6 ------
nifi-nar-bundles/nifi-hive-bundle/pom.xml | 6 ------
nifi-nar-bundles/nifi-ranger-bundle/pom.xml | 6 ------
nifi-nar-bundles/nifi-rules-action-handler-bundle/pom.xml | 6 ------
nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml | 6 ------
.../nifi-standard-bundle/nifi-standard-content-viewer/pom.xml | 1 -
nifi-nar-bundles/nifi-standard-bundle/pom.xml | 5 -----
nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml | 5 -----
nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml | 6 ------
pom.xml | 6 ++++++
13 files changed, 6 insertions(+), 59 deletions(-)
diff --git a/minifi/pom.xml b/minifi/pom.xml
index 9b367f8336..bf0c402b55 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -203,11 +203,6 @@ limitations under the License.
<version>2.3.3</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.29</version>
- </dependency>
<!-- NiFi Modules -->
<dependency>
diff --git
a/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml
b/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml
index a0845f25e9..0747295d9c 100644
--- a/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml
+++ b/nifi-nar-bundles/nifi-easyrules-bundle/nifi-easyrules-service/pom.xml
@@ -35,7 +35,6 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.29</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml
b/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml
index 0b68388318..78c90e5023 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml
@@ -34,12 +34,6 @@ language governing permissions and limitations under the
License. -->
<dependencyManagement>
<dependencies>
- <!-- Override snakeyaml:1.15 from elasticsearch -->
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.29</version>
- </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-elasticsearch-processors</artifactId>
diff --git a/nifi-nar-bundles/nifi-graph-bundle/pom.xml
b/nifi-nar-bundles/nifi-graph-bundle/pom.xml
index 2d1377c287..af96efa5e7 100644
--- a/nifi-nar-bundles/nifi-graph-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-graph-bundle/pom.xml
@@ -41,12 +41,6 @@
<dependencyManagement>
<dependencies>
- <!-- Override snakeyaml:1.15 -->
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.29</version>
- </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-graph-processors</artifactId>
diff --git a/nifi-nar-bundles/nifi-hive-bundle/pom.xml
b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
index d31ad02b5a..adecabea4d 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
@@ -67,12 +67,6 @@
<artifactId>avatica</artifactId>
<version>${avatica.version}</version>
</dependency>
- <!-- Override snakeyaml:1.17 -->
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.29</version>
- </dependency>
<!-- Override commons-compress -->
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/nifi-nar-bundles/nifi-ranger-bundle/pom.xml
b/nifi-nar-bundles/nifi-ranger-bundle/pom.xml
index 355e0ae87f..bbc87fb9dc 100644
--- a/nifi-nar-bundles/nifi-ranger-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-ranger-bundle/pom.xml
@@ -43,12 +43,6 @@
<artifactId>zookeeper</artifactId>
<version>${zookeeper.version}</version>
</dependency>
- <!-- Override snakeyaml:1.17 from ranger -->
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.29</version>
- </dependency>
<!-- Override commons-compress -->
<dependency>
<groupId>org.apache.commons</groupId>
diff --git a/nifi-nar-bundles/nifi-rules-action-handler-bundle/pom.xml
b/nifi-nar-bundles/nifi-rules-action-handler-bundle/pom.xml
index d6531d988b..cf68f6ed8c 100644
--- a/nifi-nar-bundles/nifi-rules-action-handler-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-rules-action-handler-bundle/pom.xml
@@ -35,12 +35,6 @@
<artifactId>nifi-rules-action-handler-service</artifactId>
<version>1.18.0-SNAPSHOT</version>
</dependency>
- <!-- Override snakeyaml:1.23 -->
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.29</version>
- </dependency>
</dependencies>
</dependencyManagement>
</project>
diff --git a/nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml
b/nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml
index 28e9d4c60b..a8705f4f61 100644
--- a/nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml
@@ -32,12 +32,6 @@
<artifactId>nifi-sql-reporting-tasks</artifactId>
<version>1.18.0-SNAPSHOT</version>
</dependency>
- <!-- Override snakeyaml:1.23 -->
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.29</version>
- </dependency>
<!-- Override commons-compress -->
<dependency>
<groupId>org.apache.commons</groupId>
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
index fb6b1f285d..75976ddf1b 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/pom.xml
@@ -82,7 +82,6 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.30</version>
</dependency>
</dependencies>
</project>
diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
index 1c094bd607..bd586c4f58 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -295,11 +295,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.29</version>
- </dependency>
<dependency>
<groupId>org.apache.sshd</groupId>
<artifactId>sshd-core</artifactId>
diff --git a/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
b/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
index 5f80e69008..e246ca3943 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
@@ -351,11 +351,6 @@
<artifactId>jsch</artifactId>
<version>0.1.54</version>
</dependency>
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.29</version>
- </dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
diff --git
a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml
b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml
index 7f93f740c1..63b80e2982 100644
--- a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml
+++ b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml
@@ -38,12 +38,6 @@
<artifactId>commons-compress</artifactId>
<version>1.21</version>
</dependency>
- <!-- Override snakeyaml:1.17 -->
- <dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>1.29</version>
- </dependency>
<!-- Override jetty-server:9.4.20 -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/pom.xml b/pom.xml
index afc984294a..f743101574 100644
--- a/pom.xml
+++ b/pom.xml
@@ -137,6 +137,7 @@
<mockito.version>3.11.2</mockito.version>
<netty.3.version>3.10.6.Final</netty.3.version>
<netty.4.version>4.1.79.Final</netty.4.version>
+ <snakeyaml.version>1.31</snakeyaml.version>
<spring.version>5.3.22</spring.version>
<spring.security.version>5.7.3</spring.security.version>
<swagger.annotations.version>1.6.6</swagger.annotations.version>
@@ -510,6 +511,11 @@
<artifactId>swagger-annotations</artifactId>
<version>${swagger.annotations.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>${snakeyaml.version}</version>
+ </dependency>
<dependency>
<groupId>com.fasterxml.jackson</groupId>
<artifactId>jackson-bom</artifactId>
