Skip to content

Commit

Permalink
Merge branch 'hotfix-1.10.x' into hotfix-2.0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
@npomaroli
npomaroli committed Sep 20, 2023
2 parents 6e6ee38 + 68303e6 commit 8d192e4
Show file tree
Hide file tree
Showing 46 changed files with 573 additions and 563 deletions.
6 changes: 6 additions & 0 deletions LTS-CHANGELOG.adoc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ include::content/docs/variables.adoc-include[]
The LTS changelog lists releases which are only accessible via a commercial subscription.
All fixes and changes in LTS releases will be released the next minor release. Changes from LTS 1.4.x will be included in release 1.5.0.

[[v1.10.15]]
== 1.10.15 (20.09.2023)

icon:check[] Core: When running in the massive concurrent publishing process, it is possible to run into a race condition when some field containers are already processed while being referenced by the edge,
throwing an NPE. This has now been fixed.

[[v1.10.14]]
== 1.10.14 (04.09.2023)

Expand Down
596 changes: 298 additions & 298 deletions doc/src/main/docs/generated/api/api.raml
View file

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions doc/src/main/docs/generated/api/request/api/v2/microschemas/request-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,6 @@
"type" : "object",
"id" : "urn:jsonschema:com:gentics:mesh:core:rest:schema:FieldSchema",
"properties" : {
"name" : {
"type" : "string",
"required" : true,
"description" : "Name of the field."
},
"type" : {
"type" : "string",
"required" : true,
"description" : "Type of the field."
},
"required" : {
"type" : "boolean"
},
Expand All @@ -55,6 +45,16 @@
"elasticsearch" : {
"type" : "object",
"$ref" : "urn:jsonschema:io:vertx:core:json:JsonObject"
},
"name" : {
"type" : "string",
"required" : true,
"description" : "Name of the field."
},
"type" : {
"type" : "string",
"required" : true,
"description" : "Type of the field."
}
}
}
Expand Down
20 changes: 10 additions & 10 deletions ...docs/generated/api/request/api/v2/microschemas/{microschemaUuid}/diff/request-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,6 @@
"type" : "object",
"id" : "urn:jsonschema:com:gentics:mesh:core:rest:schema:FieldSchema",
"properties" : {
"name" : {
"type" : "string",
"required" : true,
"description" : "Name of the field."
},
"type" : {
"type" : "string",
"required" : true,
"description" : "Type of the field."
},
"required" : {
"type" : "boolean"
},
Expand All @@ -55,6 +45,16 @@
"elasticsearch" : {
"type" : "object",
"$ref" : "urn:jsonschema:io:vertx:core:json:JsonObject"
},
"name" : {
"type" : "string",
"required" : true,
"description" : "Name of the field."
},
"type" : {
"type" : "string",
"required" : true,
"description" : "Type of the field."
}
}
}
Expand Down
20 changes: 10 additions & 10 deletions ...main/docs/generated/api/request/api/v2/microschemas/{microschemaUuid}/request-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,6 @@
"type" : "object",
"id" : "urn:jsonschema:com:gentics:mesh:core:rest:schema:FieldSchema",
"properties" : {
"name" : {
"type" : "string",
"required" : true,
"description" : "Name of the field."
},
"type" : {
"type" : "string",
"required" : true,
"description" : "Type of the field."
},
"required" : {
"type" : "boolean"
},
Expand All @@ -58,6 +48,16 @@
"elasticsearch" : {
"type" : "object",
"$ref" : "urn:jsonschema:io:vertx:core:json:JsonObject"
},
"name" : {
"type" : "string",
"required" : true,
"description" : "Name of the field."
},
"type" : {
"type" : "string",
"required" : true,
"description" : "Type of the field."
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions doc/src/main/docs/generated/api/request/api/v2/projects/request-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
"versionUuid" : {
"type" : "string"
},
"uuid" : {
"type" : "string"
},
"name" : {
"type" : "string"
},
"set" : {
"type" : "boolean"
},
"uuid" : {
"type" : "string"
}
}
},
Expand Down
20 changes: 10 additions & 10 deletions doc/src/main/docs/generated/api/request/api/v2/schemas/request-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,16 +54,6 @@
"type" : "object",
"id" : "urn:jsonschema:com:gentics:mesh:core:rest:schema:FieldSchema",
"properties" : {
"name" : {
"type" : "string",
"required" : true,
"description" : "Name of the field."
},
"type" : {
"type" : "string",
"required" : true,
"description" : "Type of the field."
},
"required" : {
"type" : "boolean"
},
Expand All @@ -74,6 +64,16 @@
"elasticsearch" : {
"type" : "object",
"$ref" : "urn:jsonschema:io:vertx:core:json:JsonObject"
},
"name" : {
"type" : "string",
"required" : true,
"description" : "Name of the field."
},
"type" : {
"type" : "string",
"required" : true,
"description" : "Type of the field."
}
}
}
Expand Down
20 changes: 10 additions & 10 deletions doc/src/main/docs/generated/api/request/api/v2/schemas/{schemaUuid}/diff/request-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,16 +103,6 @@
"type" : "object",
"id" : "urn:jsonschema:com:gentics:mesh:core:rest:schema:FieldSchema",
"properties" : {
"name" : {
"type" : "string",
"required" : true,
"description" : "Name of the field."
},
"type" : {
"type" : "string",
"required" : true,
"description" : "Type of the field."
},
"required" : {
"type" : "boolean"
},
Expand All @@ -123,6 +113,16 @@
"elasticsearch" : {
"type" : "object",
"$ref" : "urn:jsonschema:io:vertx:core:json:JsonObject"
},
"name" : {
"type" : "string",
"required" : true,
"description" : "Name of the field."
},
"type" : {
"type" : "string",
"required" : true,
"description" : "Type of the field."
}
}
}
Expand Down
20 changes: 10 additions & 10 deletions doc/src/main/docs/generated/api/request/api/v2/schemas/{schemaUuid}/request-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,6 @@
"type" : "object",
"id" : "urn:jsonschema:com:gentics:mesh:core:rest:schema:FieldSchema",
"properties" : {
"name" : {
"type" : "string",
"required" : true,
"description" : "Name of the field."
},
"type" : {
"type" : "string",
"required" : true,
"description" : "Type of the field."
},
"required" : {
"type" : "boolean"
},
Expand All @@ -79,6 +69,16 @@
"elasticsearch" : {
"type" : "object",
"$ref" : "urn:jsonschema:io:vertx:core:json:JsonObject"
},
"name" : {
"type" : "string",
"required" : true,
"description" : "Name of the field."
},
"type" : {
"type" : "string",
"required" : true,
"description" : "Type of the field."
}
}
}
Expand Down
20 changes: 10 additions & 10 deletions .../main/docs/generated/api/request/api/v2/utilities/validateMicroschema/request-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,6 @@
"type" : "object",
"id" : "urn:jsonschema:com:gentics:mesh:core:rest:schema:FieldSchema",
"properties" : {
"name" : {
"type" : "string",
"required" : true,
"description" : "Name of the field."
},
"type" : {
"type" : "string",
"required" : true,
"description" : "Type of the field."
},
"required" : {
"type" : "boolean"
},
Expand All @@ -55,6 +45,16 @@
"elasticsearch" : {
"type" : "object",
"$ref" : "urn:jsonschema:io:vertx:core:json:JsonObject"
},
"name" : {
"type" : "string",
"required" : true,
"description" : "Name of the field."
},
"type" : {
"type" : "string",
"required" : true,
"description" : "Type of the field."
}
}
}
Expand Down
20 changes: 10 additions & 10 deletions doc/src/main/docs/generated/api/request/api/v2/utilities/validateSchema/request-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,6 @@
"type" : "object",
"id" : "urn:jsonschema:com:gentics:mesh:core:rest:schema:FieldSchema",
"properties" : {
"name" : {
"type" : "string",
"required" : true,
"description" : "Name of the field."
},
"type" : {
"type" : "string",
"required" : true,
"description" : "Type of the field."
},
"required" : {
"type" : "boolean"
},
Expand All @@ -79,6 +69,16 @@
"elasticsearch" : {
"type" : "object",
"$ref" : "urn:jsonschema:io:vertx:core:json:JsonObject"
},
"name" : {
"type" : "string",
"required" : true,
"description" : "Name of the field."
},
"type" : {
"type" : "string",
"required" : true,
"description" : "Type of the field."
}
}
}
Expand Down
6 changes: 3 additions & 3 deletions doc/src/main/docs/generated/api/request/api/v2/{project}/nodes/request-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,14 @@
"versionUuid" : {
"type" : "string"
},
"uuid" : {
"type" : "string"
},
"name" : {
"type" : "string"
},
"set" : {
"type" : "boolean"
},
"uuid" : {
"type" : "string"
}
}
}
Expand Down
20 changes: 10 additions & 10 deletions doc/src/main/docs/generated/api/response/api/v2/microschemas/200/request-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,6 @@
"type" : "object",
"id" : "urn:jsonschema:com:gentics:mesh:core:rest:schema:FieldSchema",
"properties" : {
"name" : {
"type" : "string",
"required" : true,
"description" : "Name of the field."
},
"type" : {
"type" : "string",
"required" : true,
"description" : "Type of the field."
},
"required" : {
"type" : "boolean"
},
Expand All @@ -110,6 +100,16 @@
"elasticsearch" : {
"type" : "object",
"$ref" : "urn:jsonschema:io:vertx:core:json:JsonObject"
},
"name" : {
"type" : "string",
"required" : true,
"description" : "Name of the field."
},
"type" : {
"type" : "string",
"required" : true,
"description" : "Type of the field."
}
}
}
Expand Down
20 changes: 10 additions & 10 deletions doc/src/main/docs/generated/api/response/api/v2/microschemas/201/request-schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,16 +82,6 @@
"type" : "object",
"id" : "urn:jsonschema:com:gentics:mesh:core:rest:schema:FieldSchema",
"properties" : {
"name" : {
"type" : "string",
"required" : true,
"description" : "Name of the field."
},
"type" : {
"type" : "string",
"required" : true,
"description" : "Type of the field."
},
"required" : {
"type" : "boolean"
},
Expand All @@ -102,6 +92,16 @@
"elasticsearch" : {
"type" : "object",
"$ref" : "urn:jsonschema:io:vertx:core:json:JsonObject"
},
"name" : {
"type" : "string",
"required" : true,
"description" : "Name of the field."
},
"type" : {
"type" : "string",
"required" : true,
"description" : "Type of the field."
}
}
}
Expand Down
Loading

0 comments on commit 8d192e4

Please sign in to comment.