You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2022/07/24 01:09:16 UTC
[nifi] branch main updated (0cd438d9e9 -> 7244b9cfc4)
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
from 0cd438d9e9 NIFI-9817 Added Unit Validator to PutCloudWatchMetric
new 69b0a20e67 NIFI-10267 This close #6238. Upgraded Netty from 4.1.77 to 4.1.79
new 21b57e36e8 NIFI-10268 This closes #6239. Upgraded Spring Framework from 5.3.21 to 5.3.22
new 077e09cf3e NIFI-10269 This closes #6241. Upgraded H2 from 2.1.210 to 2.1.214
new 7d920b9bc6 NIFI-10270 This closes #6240. Upgraded AWS SDK from 1.12.182 to 1.12.267
new 7244b9cfc4 NIFI-10271 This closes #6242. Upgraded Xerces from 2.12.1 to 2.12.2
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
minifi/pom.xml | 2 +-
nifi-dependency-check-maven/suppressions.xml | 5 +++++
.../apache/nifi/h2/database/migration/H2DatabaseUpdater.java | 10 ++++++----
nifi-nar-bundles/nifi-aws-bundle/pom.xml | 2 +-
nifi-nar-bundles/nifi-hive-bundle/pom.xml | 6 ++++++
.../nifi-media-bundle/nifi-media-processors/pom.xml | 10 ++++++++++
.../nifi-scripting-bundle/nifi-scripting-processors/pom.xml | 2 +-
nifi-registry/pom.xml | 2 +-
pom.xml | 6 +++---
9 files changed, 34 insertions(+), 11 deletions(-)
[nifi] 05/05: NIFI-10271 This closes #6242. Upgraded Xerces from 2.12.1 to 2.12.2
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 7244b9cfc43dcb73ff1d088ecec7c1cf0b045e28
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Sat Jul 23 15:35:48 2022 -0500
NIFI-10271 This closes #6242. Upgraded Xerces from 2.12.1 to 2.12.2
- Suppressed false positive vulnerability report for CVE-2017-10355
Signed-off-by: Joe Witt <jo...@apache.org>
---
nifi-dependency-check-maven/suppressions.xml | 5 +++++
nifi-nar-bundles/nifi-hive-bundle/pom.xml | 6 ++++++
.../nifi-media-bundle/nifi-media-processors/pom.xml | 10 ++++++++++
.../nifi-scripting-bundle/nifi-scripting-processors/pom.xml | 2 +-
4 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/nifi-dependency-check-maven/suppressions.xml b/nifi-dependency-check-maven/suppressions.xml
index db3e58a794..20dcabe779 100644
--- a/nifi-dependency-check-maven/suppressions.xml
+++ b/nifi-dependency-check-maven/suppressions.xml
@@ -129,4 +129,9 @@
<packageUrl regex="true">^pkg:maven/org\.apache\.flume\.flume\-ng\-sinks/flume\-ng\-morphline\-solr\-sink@.*$</packageUrl>
<cpe>cpe:/a:apache:solr</cpe>
</suppress>
+ <suppress>
+ <notes>CVE-2017-10355 does not apply to Xerces 2.12.2</notes>
+ <packageUrl regex="true">^pkg:maven/xerces/xercesImpl@.*$</packageUrl>
+ <cve>CVE-2017-10355</cve>
+ </suppress>
</suppressions>
diff --git a/nifi-nar-bundles/nifi-hive-bundle/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
index 60094dd704..54991ac0a5 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
@@ -97,6 +97,12 @@
<artifactId>ant</artifactId>
<version>1.10.12</version>
</dependency>
+ <!-- Override Xerces 2.9.1 in Hive 1.1 and 1.2 -->
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.12.2</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml b/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml
index 1fad27fd7d..08e08ac99d 100644
--- a/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-media-bundle/nifi-media-processors/pom.xml
@@ -29,6 +29,16 @@
<tika.version>2.4.1</tika.version>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <!-- Override Xerces 2.12.1 from Tika -->
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.12.2</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
index 9e2178c4c9..8b2adb0766 100644
--- a/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-scripting-bundle/nifi-scripting-processors/pom.xml
@@ -112,7 +112,7 @@
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
- <version>2.12.1</version>
+ <version>2.12.2</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
[nifi] 02/05: NIFI-10268 This closes #6239. Upgraded Spring Framework from 5.3.21 to 5.3.22
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 21b57e36e809fe80cc9db442fb7db46e301e0687
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Fri Jul 22 20:10:38 2022 -0500
NIFI-10268 This closes #6239. Upgraded Spring Framework from 5.3.21 to 5.3.22
- Upgraded Spring Boot from 2.7.1 to 2.7.2 for Registry
Signed-off-by: Joe Witt <jo...@apache.org>
---
nifi-registry/pom.xml | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/nifi-registry/pom.xml b/nifi-registry/pom.xml
index da9eeab651..7bd4fcab9f 100644
--- a/nifi-registry/pom.xml
+++ b/nifi-registry/pom.xml
@@ -36,7 +36,7 @@
</modules>
<properties>
<jax.rs.api.version>2.1</jax.rs.api.version>
- <spring.boot.version>2.7.1</spring.boot.version>
+ <spring.boot.version>2.7.2</spring.boot.version>
<flyway.version>8.4.2</flyway.version>
<flyway.tests.version>7.0.0</flyway.tests.version>
<swagger.ui.version>3.12.0</swagger.ui.version>
diff --git a/pom.xml b/pom.xml
index 5fb3c1d6d8..af5d0d5ee5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,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>
- <spring.version>5.3.21</spring.version>
+ <spring.version>5.3.22</spring.version>
<spring.security.version>5.7.2</spring.security.version>
<h2.version>2.1.210</h2.version>
<zookeeper.version>3.8.0</zookeeper.version>
[nifi] 01/05: NIFI-10267 This close #6238. Upgraded Netty from 4.1.77 to 4.1.79
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 69b0a20e670c7d83fa74748075291bb902f2d6a1
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Mon Jul 18 17:39:53 2022 -0500
NIFI-10267 This close #6238. Upgraded Netty from 4.1.77 to 4.1.79
Signed-off-by: Joe Witt <jo...@apache.org>
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index d390a7db1a..5fb3c1d6d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,7 @@
<logback.version>1.2.11</logback.version>
<mockito.version>3.11.2</mockito.version>
<netty.3.version>3.10.6.Final</netty.3.version>
- <netty.4.version>4.1.77.Final</netty.4.version>
+ <netty.4.version>4.1.79.Final</netty.4.version>
<spring.version>5.3.21</spring.version>
<spring.security.version>5.7.2</spring.security.version>
<h2.version>2.1.210</h2.version>
[nifi] 04/05: NIFI-10270 This closes #6240. Upgraded AWS SDK from 1.12.182 to 1.12.267
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 7d920b9bc6331255a76f3a99e45cc5b64bf6ee51
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Sat Jul 23 12:14:16 2022 -0500
NIFI-10270 This closes #6240. Upgraded AWS SDK from 1.12.182 to 1.12.267
- Upgraded MiNiFi AWS SDK references from 1.11.172 to 1.12.267
Signed-off-by: Joe Witt <jo...@apache.org>
---
minifi/pom.xml | 2 +-
nifi-nar-bundles/nifi-aws-bundle/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/minifi/pom.xml b/minifi/pom.xml
index 35c660dc50..e9fe884796 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -41,7 +41,7 @@ limitations under the License.
</modules>
<properties>
<system.rules.version>1.19.0</system.rules.version>
- <aws.sdk.version>1.11.172</aws.sdk.version>
+ <aws.sdk.version>1.12.267</aws.sdk.version>
<yammer.metrics.version>2.2.0</yammer.metrics.version>
</properties>
diff --git a/nifi-nar-bundles/nifi-aws-bundle/pom.xml b/nifi-nar-bundles/nifi-aws-bundle/pom.xml
index 306f44bdc4..71ba70f22f 100644
--- a/nifi-nar-bundles/nifi-aws-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-aws-bundle/pom.xml
@@ -27,7 +27,7 @@
<properties>
<!-- keep AWS 1.x until NIFI-8287 -->
- <aws-java-sdk-version>1.12.182</aws-java-sdk-version>
+ <aws-java-sdk-version>1.12.267</aws-java-sdk-version>
<!-- keep KCL 1.x until NIFI-8531 (blocked by NIFI-8287) -->
<aws-kinesis-client-library-version>1.14.7</aws-kinesis-client-library-version>
</properties>
[nifi] 03/05: NIFI-10269 This closes #6241. Upgraded H2 from 2.1.210 to 2.1.214
Posted by jo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
joewitt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 077e09cf3ea13d1b959791c297810cecfad823f5
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Fri Jul 22 20:20:47 2022 -0500
NIFI-10269 This closes #6241. Upgraded H2 from 2.1.210 to 2.1.214
- Adjusted H2DatabaseUpdater to catch generalized SQLNonTransientException instead of H2 JdbcSQLNonTransientException
Signed-off-by: Joe Witt <jo...@apache.org>
---
.../apache/nifi/h2/database/migration/H2DatabaseUpdater.java | 10 ++++++----
pom.xml | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/nifi-h2/nifi-h2-database-migrator/src/main/java/org/apache/nifi/h2/database/migration/H2DatabaseUpdater.java b/nifi-h2/nifi-h2-database-migrator/src/main/java/org/apache/nifi/h2/database/migration/H2DatabaseUpdater.java
index 8cf07fee56..7a5109214b 100644
--- a/nifi-h2/nifi-h2-database-migrator/src/main/java/org/apache/nifi/h2/database/migration/H2DatabaseUpdater.java
+++ b/nifi-h2/nifi-h2-database-migrator/src/main/java/org/apache/nifi/h2/database/migration/H2DatabaseUpdater.java
@@ -16,7 +16,6 @@
*/
package org.apache.nifi.h2.database.migration;
-import org.h2.jdbc.JdbcSQLNonTransientException;
import org.h2.jdbcx.JdbcDataSource;
import org.h2.mvstore.MVStoreException;
import org.slf4j.Logger;
@@ -28,6 +27,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import java.sql.Connection;
import java.sql.SQLException;
+import java.sql.SQLNonTransientException;
import java.sql.Statement;
public class H2DatabaseUpdater {
@@ -48,16 +48,18 @@ public class H2DatabaseUpdater {
migrationDataSource.setPassword(pass);
try (Connection connection = migrationDataSource.getConnection()) {
return;
- } catch (JdbcSQLNonTransientException jsqlnte) {
+ } catch (SQLNonTransientException e) {
// Migration/version issues will be caused by an MVStoreException
- final Throwable exceptionCause = jsqlnte.getCause();
+ final Throwable exceptionCause = e.getCause();
if (exceptionCause instanceof MVStoreException) {
// Check for specific error message
final String errorMessage = exceptionCause.getMessage();
if (!errorMessage.contains("The write format")
&& !errorMessage.contains("is smaller than the supported format")) {
- throw jsqlnte;
+ throw e;
}
+ } else {
+ throw e;
}
} catch (SQLException sqle) {
throw new RuntimeException(String.format("H2 connection failed URL [%s] File [%s]", dbUrl, dbPathNoExtension), sqle);
diff --git a/pom.xml b/pom.xml
index af5d0d5ee5..d2c9fb9c83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,7 +138,7 @@
<netty.4.version>4.1.79.Final</netty.4.version>
<spring.version>5.3.22</spring.version>
<spring.security.version>5.7.2</spring.security.version>
- <h2.version>2.1.210</h2.version>
+ <h2.version>2.1.214</h2.version>
<zookeeper.version>3.8.0</zookeeper.version>
</properties>
<dependencyManagement>