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 53faecdcf6 NIFI-11027 Removed direct dependency on Joda Time
53faecdcf6 is described below
commit 53faecdcf6b9abc8f283f7e3ae5425a7517995b7
Author: exceptionfactory <[email protected]>
AuthorDate: Wed Jan 4 18:29:52 2023 -0600
NIFI-11027 Removed direct dependency on Joda Time
Signed-off-by: Pierre Villard <[email protected]>
This closes #6825.
---
minifi/pom.xml | 5 -----
.../nifi-standard-content-viewer/pom.xml | 5 -----
.../apache/nifi/web/StandardContentViewerController.java | 16 +---------------
nifi-nar-bundles/nifi-standard-bundle/pom.xml | 5 -----
4 files changed, 1 insertion(+), 30 deletions(-)
diff --git a/minifi/pom.xml b/minifi/pom.xml
index 9569c786ac..063a3cc6dd 100644
--- a/minifi/pom.xml
+++ b/minifi/pom.xml
@@ -744,11 +744,6 @@ limitations under the License.
<artifactId>jzlib</artifactId>
<version>1.1.3</version>
</dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>2.8.2</version>
- </dependency>
<dependency>
<groupId>com.yammer.metrics</groupId>
<artifactId>metrics-ganglia</artifactId>
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 319887edbe..d3b21edc60 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
@@ -70,11 +70,6 @@
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
</dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <scope>compile</scope>
- </dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
diff --git
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
index f89a74f4e2..9868f6e866 100644
---
a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
+++
b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-content-viewer/src/main/java/org/apache/nifi/web/StandardContentViewerController.java
@@ -27,9 +27,6 @@ import org.apache.avro.io.DatumReader;
import org.apache.nifi.web.ViewableContent.DisplayMode;
import org.apache.nifi.xml.processing.ProcessingException;
import org.apache.nifi.xml.processing.transform.StandardTransformProvider;
-import org.joda.time.DateTime;
-import org.joda.time.LocalDate;
-import org.joda.time.LocalTime;
import org.yaml.snakeyaml.DumperOptions;
import org.yaml.snakeyaml.Yaml;
@@ -43,7 +40,6 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.HashSet;
-import java.util.IdentityHashMap;
import java.util.Set;
public class StandardContentViewerController extends HttpServlet {
@@ -115,17 +111,7 @@ public class StandardContentViewerController extends
HttpServlet {
final StringBuilder sb = new StringBuilder();
sb.append("[");
// Use Avro conversions to display logical type values in
human readable way.
- final GenericData genericData = new GenericData(){
- @Override
- protected void toString(Object datum, StringBuilder
buffer, IdentityHashMap<Object, Object> seenObjects) {
- // Since these types are not quoted and produce a
malformed JSON string, quote it here.
- if (datum instanceof LocalDate || datum instanceof
LocalTime || datum instanceof DateTime) {
- buffer.append("\"").append(datum).append("\"");
- return;
- }
- super.toString(datum, buffer, seenObjects);
- }
- };
+ final GenericData genericData = new GenericData();
genericData.addLogicalTypeConversion(new
Conversions.DecimalConversion());
genericData.addLogicalTypeConversion(new
TimeConversions.DateConversion());
genericData.addLogicalTypeConversion(new
TimeConversions.TimeMicrosConversion());
diff --git a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
index 263cc944c8..3a6614ebcc 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-bundle/pom.xml
@@ -170,11 +170,6 @@
<artifactId>Saxon-HE</artifactId>
<version>10.6</version>
</dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>2.8.2</version>
- </dependency>
<dependency>
<groupId>javax.jms</groupId>
<artifactId>javax.jms-api</artifactId>
