updated oap

oaplatform · Jan 3, 2024 · dc2c25d · dc2c25d
1 parent 4bf5e83
commit dc2c25d
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 31 deletions.
diff --git a/oap-ws-openapi-ws/src/test/resources/oap/ws/openapi/OpenapiWSTest/openapi.json b/oap-ws-openapi-ws/src/test/resources/oap/ws/openapi/OpenapiWSTest/openapi.json
@@ -1622,15 +1622,15 @@
         },
         "type" : "object"
       },
-      "Stream" : {
+      "StreamInteger" : {
         "properties" : {
           "parallel" : {
             "type" : "boolean"
           }
         },
         "type" : "object"
       },
-      "StreamInteger" : {
+      "StreamObject" : {
         "properties" : {
           "parallel" : {
             "type" : "boolean"
@@ -1814,14 +1814,6 @@
       "oap_json_ext_Ext" : {
         "type" : "object"
       },
-      "oap_util_Stream" : {
-        "properties" : {
-          "parallel" : {
-            "type" : "boolean"
-          }
-        },
-        "type" : "object"
-      },
       "oap_ws_openapi_ExampleNewWS_NewWsBean" : {
         "properties" : {
           "b2" : {
@@ -1856,7 +1848,7 @@
             "type" : "integer"
           },
           "intStream" : {
-            "$ref" : "#/components/schemas/oap_util_Stream"
+            "$ref" : "#/components/schemas/StreamInteger"
           },
           "map" : {
             "additionalProperties" : {
@@ -1872,7 +1864,7 @@
             "type" : "string"
           },
           "stringStream" : {
-            "$ref" : "#/components/schemas/oap_util_Stream"
+            "$ref" : "#/components/schemas/StreamString"
           }
         },
         "type" : "object"

diff --git a/...-openapi-ws/src/test/resources/oap/ws/openapi/OpenapiWSTest/openapiWithoutDeprecated.json b/...-openapi-ws/src/test/resources/oap/ws/openapi/OpenapiWSTest/openapiWithoutDeprecated.json
@@ -1622,15 +1622,15 @@
         },
         "type" : "object"
       },
-      "Stream" : {
+      "StreamInteger" : {
         "properties" : {
           "parallel" : {
             "type" : "boolean"
           }
         },
         "type" : "object"
       },
-      "StreamInteger" : {
+      "StreamObject" : {
         "properties" : {
           "parallel" : {
             "type" : "boolean"
@@ -1814,14 +1814,6 @@
       "oap_json_ext_Ext" : {
         "type" : "object"
       },
-      "oap_util_Stream" : {
-        "properties" : {
-          "parallel" : {
-            "type" : "boolean"
-          }
-        },
-        "type" : "object"
-      },
       "oap_ws_openapi_ExampleNewWS_NewWsBean" : {
         "properties" : {
           "b2" : {
@@ -1856,7 +1848,7 @@
             "type" : "integer"
           },
           "intStream" : {
-            "$ref" : "#/components/schemas/oap_util_Stream"
+            "$ref" : "#/components/schemas/StreamInteger"
           },
           "map" : {
             "additionalProperties" : {
@@ -1872,7 +1864,7 @@
             "type" : "string"
           },
           "stringStream" : {
-            "$ref" : "#/components/schemas/oap_util_Stream"
+            "$ref" : "#/components/schemas/StreamString"
           }
         },
         "type" : "object"

diff --git a/oap-ws-sso-api-default/pom.xml b/oap-ws-sso-api-default/pom.xml
@@ -36,6 +36,11 @@
     <artifactId>oap-ws-sso-api-default</artifactId>
 
     <dependencies>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${oap.deps.jackson.version}</version>
+        </dependency>
         <dependency>
             <groupId>${project.parent.groupId}</groupId>
             <artifactId>oap-ws-sso-api</artifactId>

diff --git a/oap-ws-sso-api/pom.xml b/oap-ws-sso-api/pom.xml
@@ -62,6 +62,11 @@
             <artifactId>guava</artifactId>
             <version>${oap.deps.guava.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${oap.deps.jackson.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -71,15 +71,16 @@
     </distributionManagement>
 
     <properties>
-        <oap-ws.project.version>21.1.5</oap-ws.project.version>
-        <oap.deps.oap.version>21.1.2</oap.deps.oap.version>
+        <oap-ws.project.version>21.1.6</oap-ws.project.version>
+
+        <oap.deps.oap.version>21.1.8</oap.deps.oap.version>
 
         <oap.deps.mail.version>21.0.1</oap.deps.mail.version>
         <oap.deps.storage.version>21.0.6</oap.deps.storage.version>
 
         <oap.deps.assertj.version>3.24.2</oap.deps.assertj.version>
-        <oap.deps.guava.version>32.1.2-jre</oap.deps.guava.version>
-        <oap.deps.slf4j.version>2.0.7</oap.deps.slf4j.version>
+        <oap.deps.guava.version>33.0.0-jre</oap.deps.guava.version>
+        <oap.deps.slf4j.version>2.0.9</oap.deps.slf4j.version>
         <oap.deps.logback.version>1.4.11</oap.deps.logback.version>
         <oap.deps.httpcomponents.version>4.4.16</oap.deps.httpcomponents.version>
         <oap.deps.lombok.version>1.18.30</oap.deps.lombok.version>
@@ -98,7 +99,7 @@
         <oap.deps.commons-lang3.version>3.4</oap.deps.commons-lang3.version>
         <oap.deps.commons-codec.version>1.16.0</oap.deps.commons-codec.version>
 
-        <oap.deps.jackson.version>2.13.3</oap.deps.jackson.version>
+        <oap.deps.jackson.version>2.16.1</oap.deps.jackson.version>
         <oap.deps.maven.plugin-build-helper.version>1.10</oap.deps.maven.plugin-build-helper.version>
         <oap.deps.maven.plugin-api.version>3.8.1</oap.deps.maven.plugin-api.version>
         <oap.deps.maven.version>3.0-alpha-2</oap.deps.maven.version>
@@ -107,12 +108,12 @@
 
         <oap.deps.maven-core.version>3.9.5</oap.deps.maven-core.version>
         <oap.deps.maven-compat.version>3.9.5</oap.deps.maven-compat.version>
-        <oap.deps.maven-plugin-api.version>3.9.3</oap.deps.maven-plugin-api.version>
+        <oap.deps.maven-plugin-api.version>3.9.5</oap.deps.maven-plugin-api.version>
         <oap.deps.maven-plugin-annotations.version>3.10.2</oap.deps.maven-plugin-annotations.version>
         <oap.deps.versions-maven-plugin.version>2.11.0</oap.deps.versions-maven-plugin.version>
         <oap.deps.plexus-component-metadata.version>2.1.1</oap.deps.plexus-component-metadata.version>
         <oap.deps.software.amazon.awssdk.version>2.20.25</oap.deps.software.amazon.awssdk.version>
-        <oap.deps.com.google.gson.version>2.6.2</oap.deps.com.google.gson.version>
+        <oap.deps.com.google.gson.version>2.8.5</oap.deps.com.google.gson.version>
         <oap.deps.asm.version>9.6</oap.deps.asm.version>
     </properties>