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 <pierre.villard.fr@gmail.com>

This closes #5275.
This commit is contained in:
exceptionfactory 2021-08-02 20:50:07 -05:00 committed by Pierre Villard
parent 1ea47d6888
commit ba7271c85b
No known key found for this signature in database
GPG Key ID: F92A93B30C07C6D5
15 changed files with 60 additions and 5 deletions

View File

@ -63,7 +63,6 @@ limitations under the License.
<dependency> <dependency>
<groupId>org.yaml</groupId> <groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId> <artifactId>snakeyaml</artifactId>
<version>1.17</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.nifi.minifi</groupId> <groupId>org.apache.nifi.minifi</groupId>

View File

@ -70,7 +70,6 @@ limitations under the License.
<dependency> <dependency>
<groupId>org.yaml</groupId> <groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId> <artifactId>snakeyaml</artifactId>
<version>1.17</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

View File

@ -28,7 +28,6 @@
<dependency> <dependency>
<groupId>org.yaml</groupId> <groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId> <artifactId>snakeyaml</artifactId>
<version>1.17</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>

View File

@ -270,6 +270,11 @@ limitations under the License.
<version>2.3.3</version> <version>2.3.3</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.29</version>
</dependency>
<!-- NiFi Modules --> <!-- NiFi Modules -->
<dependency> <dependency>

View File

@ -64,6 +64,12 @@
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version> <version>${jackson.version}</version>
</dependency> </dependency>
<!-- Override snakeyaml:1.11 from druid -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.29</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

View File

@ -35,7 +35,7 @@
<dependency> <dependency>
<groupId>org.yaml</groupId> <groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId> <artifactId>snakeyaml</artifactId>
<version>1.28</version> <version>1.29</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>

View File

@ -37,6 +37,12 @@ language governing permissions and limitations under the License. -->
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<!-- Override snakeyaml:1.15 from elasticsearch -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.29</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>
<artifactId>nifi-elasticsearch-processors</artifactId> <artifactId>nifi-elasticsearch-processors</artifactId>

View File

@ -39,6 +39,12 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<!-- Override snakeyaml:1.15 -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.29</version>
</dependency>
<dependency> <dependency>
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>
<artifactId>nifi-graph-processors</artifactId> <artifactId>nifi-graph-processors</artifactId>

View File

@ -73,6 +73,12 @@
<artifactId>jackson-core</artifactId> <artifactId>jackson-core</artifactId>
<version>${jackson.version}</version> <version>${jackson.version}</version>
</dependency> </dependency>
<!-- Override snakeyaml:1.17 -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.29</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

View File

@ -41,6 +41,12 @@
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
<version>2.10.0</version> <version>2.10.0</version>
</dependency> </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 --> <!-- Override jackson-databind 2.9.10.4 from ranger -->
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>

View File

@ -46,6 +46,12 @@
<artifactId>jackson-core</artifactId> <artifactId>jackson-core</artifactId>
<version>${jackson.version}</version> <version>${jackson.version}</version>
</dependency> </dependency>
<!-- Override snakeyaml:1.23 -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.29</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

View File

@ -32,6 +32,12 @@
<artifactId>nifi-sql-reporting-tasks</artifactId> <artifactId>nifi-sql-reporting-tasks</artifactId>
<version>1.15.0-SNAPSHOT</version> <version>1.15.0-SNAPSHOT</version>
</dependency> </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 --> <!-- Override jackson-databind 2.9.9.3 from calcite-core -->
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>

View File

@ -371,6 +371,11 @@
<artifactId>avro</artifactId> <artifactId>avro</artifactId>
<version>1.8.1</version> <version>1.8.1</version>
</dependency> </dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.29</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
</project> </project>

View File

@ -331,7 +331,7 @@
<dependency> <dependency>
<groupId>org.yaml</groupId> <groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId> <artifactId>snakeyaml</artifactId>
<version>1.28</version> <version>1.29</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>

View File

@ -49,6 +49,12 @@
<artifactId>jackson-core</artifactId> <artifactId>jackson-core</artifactId>
<version>${jackson.version}</version> <version>${jackson.version}</version>
</dependency> </dependency>
<!-- Override snakeyaml:1.17 -->
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.29</version>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
</project> </project>