Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CIRC-2163] Upgrade to RMB v35.3.0 #1503

Merged
merged 4 commits into from
Oct 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<properties>
<antlr4.version>4.11.1</antlr4.version>
<drools.version>7.74.1.Final</drools.version>
<rmb.version>35.2.0</rmb.version>
<rmb.version>35.3.0</rmb.version>
<vertx.version>4.5.5</vertx.version>
<log4j2.version>2.23.1</log4j2.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Expand Down Expand Up @@ -106,7 +106,12 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.12.0</version>
<version>3.17.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.17.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
3 changes: 0 additions & 3 deletions ramls/circulation-rules.raml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ types:
error: !include raml-util/schemas/error.schema
errors: !include raml-util/schemas/errors.schema

traits:
language: !include raml-util/traits/language.raml

/circulation:
/rules:
displayName: Circulation rules
Expand Down
1 change: 0 additions & 1 deletion ramls/circulation-settings.raml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ documentation:
content: <b>API for circulation settings</b>

traits:
language: !include raml-util/traits/language.raml
pageable: !include raml-util/traits/pageable.raml
searchable: !include raml-util/traits/searchable.raml
validate: !include raml-util/traits/validation.raml
Expand Down
8 changes: 1 addition & 7 deletions ramls/circulation.raml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ types:
errors: !include extended-errors.json

traits:
language: !include raml-util/traits/language.raml
pageable: !include raml-util/traits/pageable.raml
searchable: !include raml-util/traits/searchable.raml
validate: !include raml-util/traits/validation.raml
Expand All @@ -34,7 +33,6 @@ resourceTypes:
post:
description: Creates a loan by checking out an item to a loanee
is: [
language,
validate
]
body:
Expand All @@ -58,7 +56,6 @@ resourceTypes:
post:
description: Updates the due date of an existing loan
is: [
language,
validate
]
body:
Expand Down Expand Up @@ -86,7 +83,6 @@ resourceTypes:
post:
description: Updates the due date of an existing loan
is: [
language,
validate
]
body:
Expand Down Expand Up @@ -114,7 +110,6 @@ resourceTypes:
post:
description: Updates the status of an existing loan
is: [
language,
validate
]
body:
Expand Down Expand Up @@ -296,7 +291,6 @@ resourceTypes:
post:
description: Creates a request for any item from the given instance ID
is: [
language,
validate
]
body:
Expand Down Expand Up @@ -364,4 +358,4 @@ resourceTypes:
description: "Internal server error"
body:
text/plain:
example: "Internal server error"
example: "Internal server error"
3 changes: 0 additions & 3 deletions ramls/inventory-reports.raml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ documentation:
types:
items: !include items-in-transit.json

traits:
language: !include raml-util/traits/language.raml

resourceTypes:
collection-get: !include raml-util/rtypes/collection-get.raml

Expand Down
2 changes: 1 addition & 1 deletion ramls/raml-util
Submodule raml-util updated 54 files
+89 −0 .github/workflows/api-doc.yml
+59 −0 .github/workflows/api-lint.yml
+40 −0 .github/workflows/api-schema-lint.yml
+0 −65 Jenkinsfile
+2 −3 README.md
+25 −16 examples/codex/packageCollection.sample
+0 −169 examples/mod-users/userdata.json.sample
+0 −53 examples/mod-users/users.raml.sample
+0 −7 examples/moduleInfo.sample
+0 −23 examples/tagged-record-example/user.sample
+7 −0 examples/tenantAttributes.sample
+17 −0 examples/tenantJob.sample
+14 −0 library/ramltojaxrs.raml
+0 −3 ramls/codex/codex-instances-sources.raml
+0 −1 ramls/codex/codex-packages.raml
+0 −1 ramls/codex/codex.raml
+1 −2 ramls/jsonSchemas.raml
+1 −2 ramls/ramls.raml
+0 −53 ramls/tagged-record-example/users.raml
+62 −46 ramls/tenant.raml
+0 −1 rtypes/attachments.raml
+0 −1 rtypes/collection-get-with-json-response.raml
+0 −1 rtypes/collection-get.raml
+1 −2 rtypes/collection-stream.raml
+0 −1 rtypes/collection-with-json-response.raml
+0 −1 rtypes/collection.raml
+0 −1 rtypes/get-delete-with-json-response.raml
+0 −1 rtypes/get-delete.raml
+0 −1 rtypes/get-only-with-json-response.raml
+0 −1 rtypes/get-only.raml
+0 −1 rtypes/item-collection-get-with-json-response.raml
+0 −1 rtypes/item-collection-get.raml
+5 −1 rtypes/item-collection-with-json-response.raml
+5 −2 rtypes/item-collection.raml
+0 −1 rtypes/post-empty-body.raml
+1 −0 schemas/codex/codex_instance_cqlschema-ext.json
+1 −0 schemas/codex/codex_instance_cqlschema.json
+1 −0 schemas/codex/codex_package_cqlschema-ext.json
+1 −0 schemas/codex/codex_package_cqlschema.json
+3 −1 schemas/codex/packageType.json
+2 −2 schemas/codex/source.json
+1 −1 schemas/error.schema
+1 −0 schemas/errors.schema
+1 −0 schemas/metadata.schema
+0 −24 schemas/moduleInfo.schema
+1 −0 schemas/parameters.schema
+10 −1 schemas/resultInfo.schema
+1 −0 schemas/tags.schema
+24 −0 schemas/tenantAttributes.schema
+36 −0 schemas/tenantJob.schema
+1 −0 schemas/uuid.schema
+8 −0 traits/internal-error.raml
+0 −9 traits/language.raml
+9 −1 traits/pageable.raml
3 changes: 0 additions & 3 deletions ramls/requests-reports.raml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ documentation:
types:
requests: !include requests.json

traits:
language: !include raml-util/traits/language.raml

resourceTypes:
collection-get: !include raml-util/rtypes/collection-get.raml

Expand Down
3 changes: 0 additions & 3 deletions ramls/staff-slips.raml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ documentation:
types:
staff-slips: !include staff-slips-response.json

traits:
language: !include raml-util/traits/language.raml

resourceTypes:
collection-get: !include raml-util/rtypes/collection-get.raml

Expand Down