Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/MSEARCH-617' into MSEARCH-617
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/java/org/folio/search/integration/ResourceChangeFilterStrategy.java
#	src/test/java/org/folio/search/integration/ResourceChangeFilterStrategyTest.java
  • Loading branch information
GeloPakDev1 committed Nov 8, 2023
2 parents d7fc437 + 3366a02 commit ac30f21
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 22 deletions.
4 changes: 1 addition & 3 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@
* Description ([ISSUE_NUMBER](https://issues.folio.org/browse/ISSUE_NUMBER))

### Dependencies
* Bump `LIB_NAME` from `OLD_VERSION` to `NEW_VERSION`
* Add `LIB_NAME` `2.7.4`
* Remove `LIB_NAME`
* Bump `folio-spring-support` from `7.2.0` to `7.2.1`

---

Expand Down
34 changes: 19 additions & 15 deletions PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
## Purpose
_Describe the purpose of the pull request._
### Purpose
_Describe the purpose of this pull request. Why is this change necessary? What problem does it solve?_

## Approach
_How does this change fulfill the purpose?_
### Approach
_How does this change fulfill the purpose? Provide a high-level overview of the technical approach taken to address the problem._

### Changes checklist
- [ ] API paths, methods, request or response bodies changed, added, or removed
- [ ] Database schema changes
- [ ] Interface versions changes
- [ ] Interface dependencies added, or removed
- [ ] Permissions changed, added, or removed
- [ ] Check logging.
### Changes Checklist
- [ ] **API Changes**: List any API paths, methods, request or response bodies changed, added, or removed.
- [ ] **Database Schema Changes**: Specify any database schema changes and their impact.
- [ ] **Interface Version Changes**: Indicate any changes to interface versions.
- [ ] **Interface Dependencies**: Note added or removed dependencies.
- [ ] **Permissions**: Document any changes to permissions.
- [ ] **Logging**: Confirm that logging is appropriately handled.
- [ ] **NEWS**: Ensure that the `NEWS` file is updated with relevant information about the changes made in this pull request.

### TODOS and Open Questions
- [ ] Use GitHub checklists. When solved, check the box and explain the answer.
### Related Issues
_List any Jira issues related to this pull request._

### Learning
_Describe the research stage. Add links to blog posts, patterns, libraries or addons used to solve this problem._
### Learning and Resources (if applicable)
_Discuss any research conducted during the development of this pull request. Include links to relevant blog posts, patterns, libraries, or addons that were used to solve the problem._

### Screenshots (if applicable)
_If this pull request involves any visual changes or new features, consider including screenshots or GIFs to illustrate the changes._
1 change: 1 addition & 0 deletions descriptors/ModuleDescriptor-template.json
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@
"users.collection.get",
"users.item.post",
"login.item.post",
"login.item.delete",
"perms.users.get",
"perms.users.item.post",
"perms.users.assign.immutable",
Expand Down
9 changes: 5 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,15 @@
src/main/java/org/folio/search/configuration/properties/**
</sonar.exclusions>

<folio-spring-support.version>7.2.0</folio-spring-support.version>
<folio-spring-support.version>7.3.0-SNAPSHOT</folio-spring-support.version>
<folio-service-tools.version>3.1.0</folio-service-tools.version>
<folio-isbn-utils.version>1.6.0</folio-isbn-utils.version>
<folio-cql2pgjson.version>35.1.0</folio-cql2pgjson.version>
<opensearch.version>2.9.0</opensearch.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<spring-kafka.version>3.0.12</spring-kafka.version>
<!-- bump kafka.version to fix snappy-java vulnerabilities;
remove <kafka.version> when using spring-boot-starter-parent >= 3.2 -->
<kafka.version>3.5.1</kafka.version>
<apache-commons-io.version>2.15.0</apache-commons-io.version>
<apache-commons-collections.version>4.4</apache-commons-collections.version>
<marc4j.version>2.9.5</marc4j.version>
Expand All @@ -61,7 +63,7 @@
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
<maven-checkstyle-plugin.version>3.3.1</maven-checkstyle-plugin.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<maven-surefire-plugin.version>3.2.1</maven-surefire-plugin.version>
<maven-surefire-plugin.version>3.2.2</maven-surefire-plugin.version>
<maven-failsafe-plugin.version>3.1.2</maven-failsafe-plugin.version>
<maven-release-plugin.version>3.0.1</maven-release-plugin.version>
</properties>
Expand Down Expand Up @@ -101,7 +103,6 @@
<dependency>
<groupId>org.springframework.kafka</groupId>
<artifactId>spring-kafka</artifactId>
<version>${spring-kafka.version}</version>
</dependency>

<dependency>
Expand Down

0 comments on commit ac30f21

Please sign in to comment.