This is an automated email from the ASF dual-hosted git repository.
exceptionfactory 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 09faec4866 NIFI-10432 Upgraded jsoup from 1.14.2 to 1.15.3
09faec4866 is described below
commit 09faec4866ed5cd9c7f4c026430d3110a0ea0edb
Author: Mike Thomsen <[email protected]>
AuthorDate: Fri Sep 2 21:24:45 2022 -0400
NIFI-10432 Upgraded jsoup from 1.14.2 to 1.15.3
This closes #6362
Co-authored-by: David Handermann <[email protected]>
Signed-off-by: David Handermann <[email protected]>
---
minifi/pom.xml | 1 -
nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/pom.xml | 1 -
.../src/test/java/org/apache/nifi/TestPutHTMLElement.java | 3 +--
nifi-nar-bundles/nifi-media-bundle/pom.xml | 1 -
pom.xml | 6 ++++++
5 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/minifi/pom.xml b/minifi/pom.xml
index a286f5efa7..e06e6543f9 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -794,7 +794,6 @@ limitations under the License.
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
- <version>1.14.2</version>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
diff --git a/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/pom.xml
b/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/pom.xml
index 86431892ef..a3d673f11f 100644
--- a/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/pom.xml
@@ -29,7 +29,6 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
- <version>1.14.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
diff --git
a/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/test/java/org/apache/nifi/TestPutHTMLElement.java
b/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/test/java/org/apache/nifi/TestPutHTMLElement.java
index abb816bca8..e9a7fcb926 100644
---
a/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/test/java/org/apache/nifi/TestPutHTMLElement.java
+++
b/nifi-nar-bundles/nifi-html-bundle/nifi-html-processors/src/test/java/org/apache/nifi/TestPutHTMLElement.java
@@ -121,8 +121,7 @@ public class TestPutHTMLElement extends AbstractHTMLTest {
Elements eles = doc.select("#put");
Element ele = eles.get(0);
- assertTrue(StringUtils.equals("<a href=\"httpd://localhost\"></a> \n" +
- "<p>modified value</p>", ele.html()));
+ assertEquals("<a href=\"httpd://localhost\"></a><p>modified
value</p>", StringUtils.remove(ele.html(), "\n"));
}
}
diff --git a/nifi-nar-bundles/nifi-media-bundle/pom.xml
b/nifi-nar-bundles/nifi-media-bundle/pom.xml
index c53316d712..c546e28ee5 100644
--- a/nifi-nar-bundles/nifi-media-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-media-bundle/pom.xml
@@ -47,7 +47,6 @@
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
- <version>1.14.2</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
diff --git a/pom.xml b/pom.xml
index c8c92b535b..2f1a992564 100644
--- a/pom.xml
+++ b/pom.xml
@@ -573,6 +573,12 @@
<scope>import</scope>
<type>pom</type>
</dependency>
+
+ <dependency>
+ <groupId>org.jsoup</groupId>
+ <artifactId>jsoup</artifactId>
+ <version>1.15.3</version>
+ </dependency>
</dependencies>
</dependencyManagement>