This is an automated email from the ASF dual-hosted git repository.

xiazcy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git

commit c04df4ed97c5dd089c67b58444f4f0cb4f69778f
Merge: 32dc384732 ba6740ecbb
Author: xiazcy <xia...@gmail.com>
AuthorDate: Tue Sep 9 11:26:37 2025 -0700

    Merge branch '3.8-dev'

 gremlin-server/pom.xml |  2 +-
 pom.xml                | 31 ++++++++++++++++++++++++++++---
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --cc pom.xml
index 85ce6e0ee6,2e06601f7f..d08d5277e6
--- a/pom.xml
+++ b/pom.xml
@@@ -174,11 -175,10 +174,11 @@@ limitations under the License
          <metrics.version>3.0.2</metrics.version>
          <mockito.version>5.19.0</mockito.version>
          <netty.version>4.1.101.Final</netty.version>
 -        <slf4j.version>1.7.25</slf4j.version>
 +        <slf4j.version>2.0.16</slf4j.version>
          <snakeyaml.version>2.0</snakeyaml.version>
 -        <spark.version>3.3.2</spark.version>
 +        <spark.version>3.5.4</spark.version>
 +        <awssdk.version>2.29.3</awssdk.version>
-         <sslcontext.kickstart.version>9.1.0</sslcontext.kickstart.version>
+         <ayza.version>10.0.0</ayza.version>
  
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
          
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@@ -1609,41 -1626,16 +1609,51 @@@
                                              <artifactId>snakeyaml</artifactId>
                                              
<version>${snakeyaml.version}</version>
                                          </additionalDependency>
 +                                        <additionalDependency>
 +                                            
<groupId>software.amazon.awssdk</groupId>
 +                                            
<artifactId>http-auth-aws</artifactId>
 +                                            
<version>${awssdk.version}</version>
 +                                        </additionalDependency>
 +                                        <additionalDependency>
 +                                            
<groupId>software.amazon.awssdk</groupId>
 +                                            
<artifactId>http-auth-spi</artifactId>
 +                                            
<version>${awssdk.version}</version>
 +                                        </additionalDependency>
 +                                        <additionalDependency>
 +                                            
<groupId>software.amazon.awssdk</groupId>
 +                                            
<artifactId>http-client-spi</artifactId>
 +                                            
<version>${awssdk.version}</version>
 +                                        </additionalDependency>
 +                                        <additionalDependency>
 +                                            
<groupId>software.amazon.awssdk</groupId>
 +                                            <artifactId>auth</artifactId>
 +                                            
<version>${awssdk.version}</version>
 +                                        </additionalDependency>
 +                                        <additionalDependency>
 +                                            
<groupId>software.amazon.awssdk</groupId>
 +                                            <artifactId>utils</artifactId>
 +                                            
<version>${awssdk.version}</version>
 +                                        </additionalDependency>
 +                                        <additionalDependency>
 +                                            
<groupId>software.amazon.awssdk</groupId>
 +                                            
<artifactId>protocol-core</artifactId>
 +                                            
<version>${awssdk.version}</version>
 +                                        </additionalDependency>
 +                                        <additionalDependency>
 +                                            <groupId>org.apiguardian</groupId>
 +                                            
<artifactId>apiguardian-api</artifactId>
 +                                            <version>1.1.2</version>
 +                                        </additionalDependency>
+                                         <additionalDependency>
+                                             
<groupId>io.github.hakky54</groupId>
+                                             
<artifactId>ayza-for-netty</artifactId>
+                                             <version>${ayza.version}</version>
+                                         </additionalDependency>
+                                         <additionalDependency>
+                                             
<groupId>io.github.hakky54</groupId>
+                                             <artifactId>ayza</artifactId>
+                                             <version>${ayza.version}</version>
+                                         </additionalDependency>
                                      </additionalDependencies>
                                  </configuration>
                              </execution>
@@@ -1847,35 -1849,15 +1862,45 @@@
                                              
<version>${snakeyaml.version}</version>
                                          </additionalDependency>
                                          <additionalDependency>
+                                             
<groupId>io.github.hakky54</groupId>
+                                             
<artifactId>ayza-for-netty</artifactId>
+                                             <version>${ayza.version}</version>
+                                         </additionalDependency>
+                                         <additionalDependency>
+                                             
<groupId>io.github.hakky54</groupId>
+                                             <artifactId>ayza</artifactId>
+                                             <version>${ayza.version}</version>
+                                         </additionalDependency>
++                                        <additionalDependency>
 +                                            
<groupId>software.amazon.awssdk</groupId>
 +                                            
<artifactId>http-auth-aws</artifactId>
 +                                            
<version>${awssdk.version}</version>
 +                                        </additionalDependency>
 +                                        <additionalDependency>
 +                                            
<groupId>software.amazon.awssdk</groupId>
 +                                            
<artifactId>http-auth-spi</artifactId>
 +                                            
<version>${awssdk.version}</version>
 +                                        </additionalDependency>
 +                                        <additionalDependency>
 +                                            
<groupId>software.amazon.awssdk</groupId>
 +                                            
<artifactId>http-client-spi</artifactId>
 +                                            
<version>${awssdk.version}</version>
 +                                        </additionalDependency>
 +                                        <additionalDependency>
 +                                            
<groupId>software.amazon.awssdk</groupId>
 +                                            <artifactId>auth</artifactId>
 +                                            
<version>${awssdk.version}</version>
 +                                        </additionalDependency>
 +                                        <additionalDependency>
 +                                            
<groupId>software.amazon.awssdk</groupId>
 +                                            <artifactId>utils</artifactId>
 +                                            
<version>${awssdk.version}</version>
 +                                        </additionalDependency>
 +                                        <additionalDependency>
 +                                            
<groupId>software.amazon.awssdk</groupId>
 +                                            
<artifactId>protocol-core</artifactId>
 +                                            
<version>${awssdk.version}</version>
 +                                        </additionalDependency>
                                      </additionalDependencies>
                                  </configuration>
                              </execution>

Reply via email to