Skip to content

Commit

Permalink
Merge branch 'master' into all-contributors/add-zarna1parekh
Browse files Browse the repository at this point in the history
  • Loading branch information
bryanlb authored Sep 30, 2024
2 parents 7ec5e91 + 94b7fc4 commit ff555d3
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 9 deletions.
14 changes: 13 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@
"avatar_url": "https://avatars.githubusercontent.com/u/10778883?v=4",
"profile": "https://github.com/ermontross",
"contributions": [
"plugin"
"plugin",
"code",
"bug"
]
},
{
Expand Down Expand Up @@ -158,6 +160,16 @@
"contributions": [
"code"
]
},
{
"login": "baroquebobcat",
"name": "Nora Howard",
"avatar_url": "https://avatars.githubusercontent.com/u/7378?v=4",
"profile": "https://github.com/baroquebobcat",
"contributions": [
"code",
"bug"
]
}
]
}
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Licensed under [MIT](LICENSE). Copyright (c) 2024 Slack.
<td align="center" valign="top" width="14.28%"><a href="https://github.com/bryanlb"><img src="https://avatars.githubusercontent.com/u/771133?v=4?s=100" width="100px;" alt="Bryan Burkholder"/><br /><sub><b>Bryan Burkholder</b></sub></a><br /><a href="#code-bryanlb" title="Code">💻</a> <a href="#doc-bryanlb" title="Documentation">📖</a> <a href="#review-bryanlb" title="Reviewed Pull Requests">👀</a> <a href="#bug-bryanlb" title="Bug reports">🐛</a> <a href="#ideas-bryanlb" title="Ideas, Planning, & Feedback">🤔</a> <a href="#talk-bryanlb" title="Talks">📢</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/kyle-sammons"><img src="https://avatars.githubusercontent.com/u/1023070?v=4?s=100" width="100px;" alt="Kyle Sammons"/><br /><sub><b>Kyle Sammons</b></sub></a><br /><a href="#plugin-kyle-sammons" title="Plugin/utility libraries">🔌</a> <a href="#code-kyle-sammons" title="Code">💻</a> <a href="#bug-kyle-sammons" title="Bug reports">🐛</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://www.linkedin.com/in/mansu"><img src="https://avatars.githubusercontent.com/u/93836?v=4?s=100" width="100px;" alt="Suman Karumuri"/><br /><sub><b>Suman Karumuri</b></sub></a><br /><a href="#code-mansu" title="Code">💻</a> <a href="#review-mansu" title="Reviewed Pull Requests">👀</a> <a href="#ideas-mansu" title="Ideas, Planning, & Feedback">🤔</a> <a href="#talk-mansu" title="Talks">📢</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ermontross"><img src="https://avatars.githubusercontent.com/u/10778883?v=4?s=100" width="100px;" alt="Emma Montross"/><br /><sub><b>Emma Montross</b></sub></a><br /><a href="#plugin-ermontross" title="Plugin/utility libraries">🔌</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/ermontross"><img src="https://avatars.githubusercontent.com/u/10778883?v=4?s=100" width="100px;" alt="Emma Montross"/><br /><sub><b>Emma Montross</b></sub></a><br /><a href="#plugin-ermontross" title="Plugin/utility libraries">🔌</a> <a href="#code-ermontross" title="Code">💻</a> <a href="#bug-ermontross" title="Bug reports">🐛</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/danhermann"><img src="https://avatars.githubusercontent.com/u/22777892?v=4?s=100" width="100px;" alt="Dan Hermann"/><br /><sub><b>Dan Hermann</b></sub></a><br /><a href="#code-danhermann" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/kai-xing-chen"><img src="https://avatars.githubusercontent.com/u/22359229?v=4?s=100" width="100px;" alt="Kai Chen"/><br /><sub><b>Kai Chen</b></sub></a><br /><a href="#code-kx-chen" title="Code">💻</a></td>
</tr>
Expand All @@ -63,6 +63,7 @@ Licensed under [MIT](LICENSE). Copyright (c) 2024 Slack.
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/zarna1parekh"><img src="https://avatars.githubusercontent.com/u/9705210?v=4?s=100" width="100px;" alt="Zarna Parekh"/><br /><sub><b>Zarna Parekh</b></sub></a><br /><a href="#code-zarna1parekh" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/baroquebobcat"><img src="https://avatars.githubusercontent.com/u/7378?v=4?s=100" width="100px;" alt="Nora Howard"/><br /><sub><b>Nora Howard</b></sub></a><br /><a href="#code-baroquebobcat" title="Code">💻</a> <a href="#bug-baroquebobcat" title="Bug reports">🐛</a></td>
</tr>
</tbody>
</table>
Expand Down
14 changes: 7 additions & 7 deletions astra/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
<armeria.version>1.27.3</armeria.version>
<kafka.version>3.5.0</kafka.version>
<jackson.version>2.18.0</jackson.version>
<jackson.databind.version>2.17.0</jackson.databind.version>
<jackson.databind.version>2.18.0</jackson.databind.version>
<lucene.version>9.7.0</lucene.version>
<opensearch.version>2.11.1</opensearch.version>
<curator.version>5.7.0</curator.version>
<log4j.version>2.24.0</log4j.version>
<aws.sdk.version>2.28.6</aws.sdk.version>
<log4j.version>2.24.1</log4j.version>
<aws.sdk.version>2.28.11</aws.sdk.version>
<error.prone.version>2.32.0</error.prone.version>
<junit.jupiter.version>5.11.0</junit.jupiter.version>
<junit.jupiter.version>5.11.1</junit.jupiter.version>
</properties>

<repositories>
Expand Down Expand Up @@ -258,7 +258,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>33.3.0-jre</version>
<version>33.3.1-jre</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -327,7 +327,7 @@
<dependency>
<groupId>software.amazon.awssdk.crt</groupId>
<artifactId>aws-crt</artifactId>
<version>0.31.1</version>
<version>0.31.3</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
Expand Down Expand Up @@ -428,7 +428,7 @@
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.15.1</version>
<version>1.15.3</version>
</dependency>

<!-- BlobFs test dependencies -->
Expand Down

0 comments on commit ff555d3

Please sign in to comment.