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 ba7271c NIFI-8988 Upgraded SnakeYAML to 1.29
ba7271c is described below
commit ba7271c85b59cb62a66282360f90eba3e3f0b5ba
Author: exceptionfactory <[email protected]>
AuthorDate: Mon Aug 2 20:50:07 2021 -0500
NIFI-8988 Upgraded SnakeYAML to 1.29
- Updated MiNiFi references to use shared parent dependency version
- Updated direct dependencies from 1.28 to 1.29
- Added dependency management declarations where necessary to override
transitive versions
Signed-off-by: Pierre Villard <[email protected]>
This closes #5275.
---
minifi/minifi-bootstrap/pom.xml | 1 -
minifi/minifi-c2/minifi-c2-service/pom.xml | 1 -
minifi/minifi-commons/minifi-commons-schema/pom.xml | 1 -
minifi/pom.xml | 5 +++++
nifi-nar-bundles/nifi-druid-bundle/pom.xml | 6 ++++++
.../nifi-easyrules-bundle/nifi-easyrules-service/pom.xml | 2 +-
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-nar-bundles/nifi-standard-bundle/pom.xml | 5 +++++
nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml | 2 +-
nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml | 6 ++++++
15 files changed, 60 insertions(+), 5 deletions(-)
diff --git a/minifi/minifi-bootstrap/pom.xml b/minifi/minifi-bootstrap/pom.xml
index 3d6d057..406e137 100644
--- a/minifi/minifi-bootstrap/pom.xml
+++ b/minifi/minifi-bootstrap/pom.xml
@@ -63,7 +63,6 @@ limitations under the License.
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.17</version>
</dependency>
<dependency>
<groupId>org.apache.nifi.minifi</groupId>
diff --git a/minifi/minifi-c2/minifi-c2-service/pom.xml
b/minifi/minifi-c2/minifi-c2-service/pom.xml
index 032cb42..62833cf 100644
--- a/minifi/minifi-c2/minifi-c2-service/pom.xml
+++ b/minifi/minifi-c2/minifi-c2-service/pom.xml
@@ -70,7 +70,6 @@ limitations under the License.
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.17</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/minifi/minifi-commons/minifi-commons-schema/pom.xml
b/minifi/minifi-commons/minifi-commons-schema/pom.xml
index f8c4bf5..fc71cec 100644
--- a/minifi/minifi-commons/minifi-commons-schema/pom.xml
+++ b/minifi/minifi-commons/minifi-commons-schema/pom.xml
@@ -28,7 +28,6 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.17</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/minifi/pom.xml b/minifi/pom.xml
index 9a24ac0..e91f044 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -270,6 +270,11 @@ 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-druid-bundle/pom.xml
b/nifi-nar-bundles/nifi-druid-bundle/pom.xml
index 805af26..a3cfc9d 100644
--- a/nifi-nar-bundles/nifi-druid-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-druid-bundle/pom.xml
@@ -64,6 +64,12 @@
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
+ <!-- Override snakeyaml:1.11 from druid -->
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>1.29</version>
+ </dependency>
</dependencies>
</dependencyManagement>
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 9edbd46..b4be2ca 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,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.28</version>
+ <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 3e29265..9586d50 100644
--- a/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-elasticsearch-bundle/pom.xml
@@ -37,6 +37,12 @@ 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 13f2919..b34e15d 100644
--- a/nifi-nar-bundles/nifi-graph-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-graph-bundle/pom.xml
@@ -39,6 +39,12 @@
<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 100aa81..8f9220b 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
@@ -73,6 +73,12 @@
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
+ <!-- Override snakeyaml:1.17 -->
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>1.29</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/nifi-nar-bundles/nifi-ranger-bundle/pom.xml
b/nifi-nar-bundles/nifi-ranger-bundle/pom.xml
index 829587e..9c98b6c 100644
--- a/nifi-nar-bundles/nifi-ranger-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-ranger-bundle/pom.xml
@@ -41,6 +41,12 @@
<artifactId>commons-io</artifactId>
<version>2.10.0</version>
</dependency>
+ <!-- Override snakeyaml:1.17 from ranger -->
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>1.29</version>
+ </dependency>
<!-- Override jackson-databind 2.9.10.4 from ranger -->
<dependency>
<groupId>com.fasterxml.jackson.core</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 a9b6b36..178cd46 100644
--- a/nifi-nar-bundles/nifi-rules-action-handler-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-rules-action-handler-bundle/pom.xml
@@ -46,6 +46,12 @@
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
+ <!-- Override snakeyaml:1.23 -->
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>1.29</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml
b/nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml
index 3ce943c..ca9c0ae 100644
--- a/nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-sql-reporting-bundle/pom.xml
@@ -32,6 +32,12 @@
<artifactId>nifi-sql-reporting-tasks</artifactId>
<version>1.15.0-SNAPSHOT</version>
</dependency>
+ <!-- Override snakeyaml:1.23 -->
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>1.29</version>
+ </dependency>
<!-- Override jackson-databind 2.9.9.3 from calcite-core -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
index 58617e4..6b2a792 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -371,6 +371,11 @@
<artifactId>avro</artifactId>
<version>1.8.1</version>
</dependency>
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>1.29</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
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 aa8f31c..22839e6 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-framework/pom.xml
@@ -331,7 +331,7 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
- <version>1.28</version>
+ <version>1.29</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
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 3ec7f32..0cba278 100644
--- a/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml
+++ b/nifi-registry/nifi-registry-extensions/nifi-registry-ranger/pom.xml
@@ -49,6 +49,12 @@
<artifactId>jackson-core</artifactId>
<version>${jackson.version}</version>
</dependency>
+ <!-- Override snakeyaml:1.17 -->
+ <dependency>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ <version>1.29</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</project>
\ No newline at end of file
