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/08/08 18:20:35 UTC

[nifi] branch main updated: NIFI-10137 This closes #6134. Changed nifi-toolkit-api to use Jersey 2 and Jackson

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


The following commit(s) were added to refs/heads/main by this push:
     new bf9e08fe7d NIFI-10137 This closes #6134. Changed nifi-toolkit-api to use Jersey 2 and Jackson
bf9e08fe7d is described below

commit bf9e08fe7d07837a49cff318de8786954038ad15
Author: exceptionfactory <ex...@apache.org>
AuthorDate: Fri Jun 17 12:58:57 2022 -0500

    NIFI-10137 This closes #6134. Changed nifi-toolkit-api to use Jersey 2 and Jackson
    
    Signed-off-by: Joe Witt <jo...@apache.org>
---
 nifi-toolkit/nifi-toolkit-api/pom.xml | 35 +++++++++++++++++++----------------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/nifi-toolkit/nifi-toolkit-api/pom.xml b/nifi-toolkit/nifi-toolkit-api/pom.xml
index c7a6d4606d..609dcbdf0b 100644
--- a/nifi-toolkit/nifi-toolkit-api/pom.xml
+++ b/nifi-toolkit/nifi-toolkit-api/pom.xml
@@ -20,10 +20,6 @@ language governing permissions and limitations under the License. -->
 
     <artifactId>nifi-toolkit-api</artifactId>
 
-    <properties>
-        <okhttp2.version>2.7.5</okhttp2.version>
-    </properties>
-
     <dependencies>
         <!-- to get swagger definitions -->
         <dependency>
@@ -42,23 +38,28 @@ language governing permissions and limitations under the License. -->
             <version>1.6.0</version>
         </dependency>
         <dependency>
-            <groupId>com.squareup.okhttp</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>${okhttp2.version}</version>
+            <groupId>org.glassfish.jersey.core</groupId>
+            <artifactId>jersey-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-json-jackson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-multipart</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.squareup.okhttp</groupId>
-            <artifactId>logging-interceptor</artifactId>
-            <version>${okhttp2.version}</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
+            <groupId>com.fasterxml.jackson.jaxrs</groupId>
+            <artifactId>jackson-jaxrs-json-provider</artifactId>
         </dependency>
         <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>2.8.2</version>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
         </dependency>
     </dependencies>
 
@@ -83,7 +84,7 @@ language governing permissions and limitations under the License. -->
             <plugin>
                 <groupId>io.swagger</groupId>
                 <artifactId>swagger-codegen-maven-plugin</artifactId>
-                <version>2.2.2</version>
+                <version>2.4.27</version>
                 <executions>
                     <execution>
                         <goals>
@@ -100,6 +101,8 @@ language governing permissions and limitations under the License. -->
                                 <apiPackage>org.apache.nifi.api.toolkit.api</apiPackage>
                                 <modelPackage>org.apache.nifi.api.toolkit.model</modelPackage>
                                 <httpUserAgent>apache-nifi-api-toolkit-agent</httpUserAgent>
+                                <library>jersey2</library>
+                                <dateLibrary>java8</dateLibrary>
                             </configOptions>
                         </configuration>
                     </execution>