You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2022/11/04 09:35:48 UTC
[flink] branch master updated: Revert "[FLINK-29862] Upgrade to flink-shaded 16.0"
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new cf3158b21bf Revert "[FLINK-29862] Upgrade to flink-shaded 16.0"
cf3158b21bf is described below
commit cf3158b21bf16f998125dbd370509352334f9e43
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Fri Nov 4 10:35:23 2022 +0100
Revert "[FLINK-29862] Upgrade to flink-shaded 16.0"
This reverts commit 9e1ff648f18286628649a83aeaead6cbdca85259.
There are some problems with the SSL setup.
---
.../shortcodes/generated/rest_v1_dispatcher.html | 3 +-
docs/static/generated/rest_v1_dispatcher.yml | 8 +-
.../src/test/resources/rest_api_v1.snapshot | 204 +++++++--------------
.../rest/compatibility/CompatibilityRoutines.java | 1 -
.../resources/sql_gateway_rest_api_v1.snapshot | 30 +--
pom.xml | 19 +-
6 files changed, 91 insertions(+), 174 deletions(-)
diff --git a/docs/layouts/shortcodes/generated/rest_v1_dispatcher.html b/docs/layouts/shortcodes/generated/rest_v1_dispatcher.html
index 4e9742ab272..93122afd75c 100644
--- a/docs/layouts/shortcodes/generated/rest_v1_dispatcher.html
+++ b/docs/layouts/shortcodes/generated/rest_v1_dispatcher.html
@@ -1368,8 +1368,7 @@ Using 'curl' you can upload a jar via 'curl -X POST -H "Expect:" -F "jarfile=@pa
"job-accumulators" : {
"type" : "array",
"items" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:JobAccumulatorsInfo:JobAccumulator"
+ "type" : "any"
}
},
"serialized-user-task-accumulators" : {
diff --git a/docs/static/generated/rest_v1_dispatcher.yml b/docs/static/generated/rest_v1_dispatcher.yml
index def877deb82..4d7a520d316 100644
--- a/docs/static/generated/rest_v1_dispatcher.yml
+++ b/docs/static/generated/rest_v1_dispatcher.yml
@@ -89,9 +89,11 @@ paths:
$ref: '#/components/schemas/JarListInfo'
/jars/upload:
post:
- description: |-
- Uploads a jar to the cluster. The jar must be sent as multi-part data. Make sure that the "Content-Type" header is set to "application/x-java-archive", as some http libraries do not add the header by default.
- Using 'curl' you can upload a jar via 'curl -X POST -H "Expect:" -F "jarfile=@path/to/flink-job.jar" http://hostname:port/jars/upload'.
+ description: "Uploads a jar to the cluster. The jar must be sent as multi-part\
+ \ data. Make sure that the \"Content-Type\" header is set to \"application/x-java-archive\"\
+ , as some http libraries do not add the header by default.\nUsing 'curl' you\
+ \ can upload a jar via 'curl -X POST -H \"Expect:\" -F \"jarfile=@path/to/flink-job.jar\"\
+ \ http://hostname:port/jars/upload'."
operationId: uploadJar
requestBody:
content:
diff --git a/flink-runtime-web/src/test/resources/rest_api_v1.snapshot b/flink-runtime-web/src/test/resources/rest_api_v1.snapshot
index ea1d72c05e0..b952536a663 100644
--- a/flink-runtime-web/src/test/resources/rest_api_v1.snapshot
+++ b/flink-runtime-web/src/test/resources/rest_api_v1.snapshot
@@ -11,12 +11,10 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyResponseBody"
+ "type" : "any"
}
}, {
"url" : "/config",
@@ -30,8 +28,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -81,8 +78,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -119,8 +115,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -138,8 +133,7 @@
}
},
"operation" : {
- "type" : "object",
- "id" : "urn:jsonschema:java:lang:Object"
+ "type" : "any"
}
}
}
@@ -157,8 +151,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -181,8 +174,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -238,8 +230,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -268,12 +259,10 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyResponseBody"
+ "type" : "any"
}
}, {
"url" : "/jars/:jarid/plan",
@@ -477,8 +466,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "array",
@@ -507,8 +495,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -567,8 +554,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -609,8 +595,7 @@
} ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "any"
@@ -627,8 +612,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -663,8 +647,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -759,8 +742,7 @@
} ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "any"
@@ -777,8 +759,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -806,8 +787,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -954,12 +934,10 @@
} ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyResponseBody"
+ "type" : "any"
}
}, {
"url" : "/jobs/:jobid/accumulators",
@@ -978,8 +956,7 @@
} ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -988,8 +965,7 @@
"job-accumulators" : {
"type" : "array",
"items" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:JobAccumulatorsInfo:JobAccumulator"
+ "type" : "any"
}
},
"user-task-accumulators" : {
@@ -1032,8 +1008,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -1417,8 +1392,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -1496,8 +1470,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -1610,8 +1583,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -1768,8 +1740,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -1787,8 +1758,7 @@
}
},
"operation" : {
- "type" : "object",
- "id" : "urn:jsonschema:java:lang:Object"
+ "type" : "any"
}
}
}
@@ -1806,8 +1776,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "any"
@@ -1862,8 +1831,7 @@
} ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -1972,8 +1940,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -2010,8 +1977,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "array",
@@ -2042,8 +2008,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -2104,8 +2069,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -2133,8 +2097,7 @@
} ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "any"
@@ -2153,8 +2116,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -2182,8 +2144,7 @@
} ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -2210,8 +2171,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -2229,8 +2189,7 @@
}
},
"operation" : {
- "type" : "object",
- "id" : "urn:jsonschema:java:lang:Object"
+ "type" : "any"
}
}
}
@@ -2291,8 +2250,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -2310,8 +2268,7 @@
}
},
"operation" : {
- "type" : "object",
- "id" : "urn:jsonschema:java:lang:Object"
+ "type" : "any"
}
}
}
@@ -2329,8 +2286,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -2399,8 +2355,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -2427,8 +2382,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -2580,8 +2534,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -2626,8 +2579,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -2708,8 +2660,7 @@
} ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -2758,8 +2709,7 @@
} ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "any"
@@ -2780,8 +2730,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -2856,8 +2805,7 @@
} ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "any"
@@ -2880,8 +2828,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -2989,8 +2936,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -3098,8 +3044,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -3155,8 +3100,7 @@
} ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "any"
@@ -3177,8 +3121,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -3235,8 +3178,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -3366,8 +3308,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "any"
@@ -3384,8 +3325,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -3469,8 +3409,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -3488,8 +3427,7 @@
}
},
"operation" : {
- "type" : "object",
- "id" : "urn:jsonschema:java:lang:Object"
+ "type" : "any"
}
}
}
@@ -3505,8 +3443,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -3653,8 +3590,7 @@
} ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "any"
@@ -3673,8 +3609,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -3905,8 +3840,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -3949,8 +3883,7 @@
} ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "any"
@@ -3969,8 +3902,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
diff --git a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/compatibility/CompatibilityRoutines.java b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/compatibility/CompatibilityRoutines.java
index bb40a3eb072..19a00a627d8 100644
--- a/flink-runtime/src/test/java/org/apache/flink/runtime/rest/compatibility/CompatibilityRoutines.java
+++ b/flink-runtime/src/test/java/org/apache/flink/runtime/rest/compatibility/CompatibilityRoutines.java
@@ -230,7 +230,6 @@ enum CompatibilityRoutines {
final JsonNode curProperties = curProperty.get("properties");
if (oldProperties != null) {
- assertThat(curProperties).as("New object has no properties.").isNotNull();
for (Iterator<Map.Entry<String, JsonNode>> it = oldProperties.fields();
it.hasNext(); ) {
final Map.Entry<String, JsonNode> oldPropertyWithKey = it.next();
diff --git a/flink-table/flink-sql-gateway/src/test/resources/sql_gateway_rest_api_v1.snapshot b/flink-table/flink-sql-gateway/src/test/resources/sql_gateway_rest_api_v1.snapshot
index ae9bf88d5ca..306d8410c4e 100644
--- a/flink-table/flink-sql-gateway/src/test/resources/sql_gateway_rest_api_v1.snapshot
+++ b/flink-table/flink-sql-gateway/src/test/resources/sql_gateway_rest_api_v1.snapshot
@@ -11,8 +11,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -38,8 +37,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -102,8 +100,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -128,8 +125,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -157,12 +153,10 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyResponseBody"
+ "type" : "any"
}
}, {
"url" : "/sessions/:session_handle/operations/:operation_handle/cancel",
@@ -180,8 +174,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -208,8 +201,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -238,8 +230,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
@@ -272,8 +263,7 @@
"queryParameters" : [ ]
},
"request" : {
- "type" : "object",
- "id" : "urn:jsonschema:org:apache:flink:runtime:rest:messages:EmptyRequestBody"
+ "type" : "any"
},
"response" : {
"type" : "object",
diff --git a/pom.xml b/pom.xml
index ebb6393bd8f..c9a95f8ba0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,8 +122,8 @@ under the License.
<flink.forkCountUnitTest>4</flink.forkCountUnitTest>
<flink.reuseForks>true</flink.reuseForks>
<flink.surefire.baseArgLine>-XX:+UseG1GC -Xms256m</flink.surefire.baseArgLine>
- <flink.shaded.version>16.0</flink.shaded.version>
- <flink.shaded.jackson.version>2.13.4</flink.shaded.jackson.version>
+ <flink.shaded.version>15.0</flink.shaded.version>
+ <flink.shaded.jackson.version>2.12.4</flink.shaded.jackson.version>
<target.java.version>1.8</target.java.version>
<slf4j.version>1.7.32</slf4j.version>
<log4j.version>2.17.1</log4j.version>
@@ -139,7 +139,7 @@ under the License.
<scala.binary.version>2.12</scala.binary.version>
<chill.version>0.7.6</chill.version>
<!-- keep FlinkContainersBuilder#buildZookeeperContainer() in sync -->
- <zookeeper.version>3.5.10</zookeeper.version>
+ <zookeeper.version>3.5.9</zookeeper.version>
<curator.version>5.2.0</curator.version>
<avro.version>1.11.1</avro.version>
<!-- Version for transitive Jackson dependencies that are not used within Flink itself.-->
@@ -210,6 +210,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-force-shading</artifactId>
+ <version>${flink.shaded.version}</version>
</dependency>
<!-- Root dependencies for all projects -->
@@ -347,16 +348,10 @@ under the License.
-->
<dependencies>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-force-shading</artifactId>
- <version>${flink.shaded.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-asm-9</artifactId>
- <version>9.3-${flink.shaded.version}</version>
+ <version>9.2-${flink.shaded.version}</version>
</dependency>
<dependency>
@@ -380,13 +375,13 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-netty</artifactId>
- <version>4.1.82.Final-${flink.shaded.version}</version>
+ <version>4.1.70.Final-${flink.shaded.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-netty-tcnative-dynamic</artifactId>
- <version>2.0.54.Final-${flink.shaded.version}</version>
+ <version>2.0.44.Final-${flink.shaded.version}</version>
<scope>test</scope>
</dependency>