Skip to content

Commit 6eba58f

Browse files
feat: Add trivial schema files for lib components. Update manifests to remove build metadata (#2379)
Signed-off-by: 1000TurquoisePogs <sgrady@rocketsoftware.com> Co-authored-by: achmelo <37397715+achmelo@users.noreply.github.com>
1 parent c2a479d commit 6eba58f

File tree

11 files changed

+50
-36
lines changed

11 files changed

+50
-36
lines changed

api-catalog-package/src/main/resources/manifest.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ schemas:
1313
repository:
1414
type: git
1515
url: https://github.com/zowe/api-layer.git
16-
build:
17-
branch: "{{build.branch}}"
18-
number: "{{build.number}}"
19-
commitHash: "{{build.commitHash}}"
20-
timestamp: "{{build.timestamp}}"
2116
commands:
2217
start: bin/start.sh
2318
validate: bin/validate.sh

apiml-common-lib-package/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ task packageCommonLib(type: Zip) {
2424

2525
into('/') {
2626
from "$resourceDir/manifest.yaml"
27+
from "../schemas/apiml-common-lib-schema.json"
2728
}
2829

2930
into('bin/') {

apiml-common-lib-package/src/main/resources/manifest.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,5 @@ license: EPL-2.0
1111
repository:
1212
type: git
1313
url: https://github.com/zowe/api-layer.git
14-
build:
15-
branch: "{{build.branch}}"
16-
number: "{{build.number}}"
17-
commitHash: "{{build.commitHash}}"
18-
timestamp: "{{build.timestamp}}"
14+
schemas:
15+
configs: "apiml-common-lib-schema.json"

apiml-sample-extension-package/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ task packageSampleExtension(type: Zip) {
2828

2929
into('/') {
3030
from "$resourceDir/manifest.yaml"
31+
from "../schemas/apiml-sample-extension-schema.json"
3132
}
3233

3334
into('bin/') {

apiml-sample-extension-package/src/main/resources/manifest.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,9 @@ license: EPL-2.0
1111
repository:
1212
type: git
1313
url: https://github.com/zowe/api-layer.git
14-
build:
15-
branch: "{{build.branch}}"
16-
number: "{{build.number}}"
17-
commitHash: "{{build.commitHash}}"
18-
timestamp: "{{build.timestamp}}"
1914
# The following block contains all the extensions directory path
2015
# (or file path) that will be included in the API ML
2116
gatewaySharedLibs:
2217
- bin/apiml-sample-extension.jar
23-
18+
schemas:
19+
configs: "apiml-sample-extension-schema.json"

caching-service-package/src/main/resources/manifest.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ schemas:
1313
repository:
1414
type: git
1515
url: https://github.com/zowe/api-layer.git
16-
build:
17-
branch: "{{build.branch}}"
18-
number: "{{build.number}}"
19-
commitHash: "{{build.commitHash}}"
20-
timestamp: "{{build.timestamp}}"
2116
commands:
2217
start: bin/start.sh
2318
validate: bin/validate.sh

discovery-package/src/main/resources/manifest.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ schemas:
1313
repository:
1414
type: git
1515
url: https://github.com/zowe/api-layer.git
16-
build:
17-
branch: "{{build.branch}}"
18-
number: "{{build.number}}"
19-
commitHash: "{{build.commitHash}}"
20-
timestamp: "{{build.timestamp}}"
2116
commands:
2217
start: bin/start.sh
2318
validate: bin/validate.sh

gateway-package/src/main/resources/manifest.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ schemas:
1313
repository:
1414
type: git
1515
url: https://github.com/zowe/api-layer.git
16-
build:
17-
branch: "{{build.branch}}"
18-
number: "{{build.number}}"
19-
commitHash: "{{build.commitHash}}"
20-
timestamp: "{{build.timestamp}}"
2116
commands:
2217
start: bin/start.sh
2318
validate: bin/validate.sh

metrics-service-package/src/main/resources/manifest.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ schemas:
1313
repository:
1414
type: git
1515
url: https://github.com/zowe/api-layer.git
16-
build:
17-
branch: "{{build.branch}}"
18-
number: "{{build.number}}"
19-
commitHash: "{{build.commitHash}}"
20-
timestamp: "{{build.timestamp}}"
2116
commands:
2217
start: bin/start.sh
2318
validate: bin/validate.sh

schemas/apiml-common-lib-schema.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"$schema": "https://json-schema.org/draft/2019-09/schema",
3+
"$id": "https://zowe.org/schemas/v2/apiml-common-lib",
4+
"allOf": [
5+
{ "$ref": "https://zowe.org/schemas/v2/server-base" },
6+
{
7+
"type": "object",
8+
"properties": {
9+
"components": {
10+
"type": "object",
11+
"additionalProperties": true,
12+
"properties": {
13+
"apiml-common-lib": {
14+
"$ref": "https://zowe.org/schemas/v2/server-base#zoweComponent"
15+
}
16+
}
17+
}
18+
}
19+
}
20+
]
21+
}
22+

0 commit comments

Comments
 (0)