Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/gradle/java-client/org.apache.htt…
Browse files Browse the repository at this point in the history
…pcomponents.core5-httpcore5-5.3.1

Signed-off-by: Thomas Farr <[email protected]>
  • Loading branch information
Xtansia authored Nov 7, 2024
2 parents cc76872 + 5c04563 commit 3c05837
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/backport.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
installation_id: 22958780

- name: Backport
uses: VachaShah/backport@v2.1.0
uses: VachaShah/backport@v2.2.0
with:
github_token: ${{ steps.github_app_token.outputs.token }}
head_template: backport/backport-<%= number %>-to-<%= base %>
2 changes: 1 addition & 1 deletion .github/workflows/code-generation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
installation_id: 22958780

- name: Create Pull Request
uses: peter-evans/create-pull-request@v6
uses: peter-evans/create-pull-request@v7
with:
token: ${{ steps.github_app_token.outputs.token || secrets.GITHUB_TOKEN }}
committer: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/increment-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
sed -i "s/systemProp.version = $CURRENT_VERSION/systemProp.version = $NEXT_VERSION/g" gradle.properties
- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
uses: peter-evans/create-pull-request@v7
with:
token: ${{ steps.github_app_token.outputs.token }}
base: ${{ env.BASE_X }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v3
- name: lychee Link Checker
id: lychee
uses: lycheeverse/lychee-action@v1.5.0
uses: lycheeverse/lychee-action@v2.0.2
with:
args: --accept=200,403,429 "**/*.html" "**/*.md" "**/*.txt" "**/*.json" --exclude-mail
fail: true
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

## [Unreleased 3.0]
### Dependencies
- Bumps `org.junit:junit-bom` from 5.10.2 to 5.11.2
- Bumps `org.junit:junit-bom` from 5.10.2 to 5.11.3
- Bumps `org.eclipse.parsson:parsson` from 1.1.6 to 1.1.7
- Bumps `org.hamcrest:hamcrest` from 2.2 to 3.0
- Bumps `com.github.jk1.dependency-license-report` from 2.8 to 2.9
- Bumps `org.apache.httpcomponents.client5:httpclient5` from 5.4 to 5.4.1
- Bumps `org.apache.httpcomponents.core5:httpcore5` from 5.3 to 5.3.1

This section is for maintaining a changelog for all breaking changes for the client that cannot be released in the 2.x line. All other non-breaking changes should be added to [Unreleased 2.x] section.
Expand Down
2 changes: 1 addition & 1 deletion java-client/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ dependencies {
}
testImplementation("org.opensearch.client", "opensearch-rest-client", opensearchVersion)

api("org.apache.httpcomponents.client5:httpclient5:5.4") {
api("org.apache.httpcomponents.client5:httpclient5:5.4.1") {
exclude(group = "org.apache.httpcomponents.core5")
}
api("org.apache.httpcomponents.core5:httpcore5:5.3.1")
Expand Down
2 changes: 1 addition & 1 deletion java-codegen/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ dependencies {
implementation("org.commonmark", "commonmark", "0.23.0")

// EPL-2.0
testImplementation(platform("org.junit:junit-bom:5.11.2"))
testImplementation(platform("org.junit:junit-bom:5.11.3"))
testImplementation("org.junit.jupiter", "junit-jupiter")
testRuntimeOnly("org.junit.platform", "junit-platform-launcher")
}
Expand Down

0 comments on commit 3c05837

Please sign in to comment.