Skip to content

Commit

Permalink
Merge branch 'postgresql-dialect' into support-latency-metrics
Browse files Browse the repository at this point in the history
  • Loading branch information
hengfengli authored Feb 26, 2024
2 parents 7c32521 + 8f7dcb9 commit 6b1fbf9
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 12 deletions.
13 changes: 10 additions & 3 deletions benchmarks/latency-comparison/java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>26.32.0</version>
<version>26.33.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -70,7 +70,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-spanner-pgadapter</artifactId>
<version>0.30.0</version>
<version>0.31.0</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
Expand All @@ -94,13 +94,20 @@
<artifactId>commons-cli</artifactId>
<version>1.6.0</version>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.1.1</version>
<version>3.2.0</version>
<configuration>
<mainClass>com.google.cloud.spanner.pgadapter.latency.LatencyBenchmark</mainClass>
<cleanupDaemonThreads>false</cleanupDaemonThreads>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
</excludedTests>
<excludedIntegrationTests/>

<junixsocket.version>2.8.3</junixsocket.version>
<junixsocket.version>2.9.0</junixsocket.version>
<opentelemetry.exporter.version>0.27.0</opentelemetry.exporter.version>
</properties>

Expand Down Expand Up @@ -77,7 +77,7 @@
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>26.32.0</version>
<version>26.33.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion samples/java/cloud-run/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>3.2.2</version>
<version>3.2.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions samples/java/hibernate/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
<version>1.19.5</version>
<version>1.19.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -85,7 +85,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.1.1</version>
<version>3.2.0</version>
<configuration>
<mainClass>com.google.cloud.postgres.SampleApplication</mainClass>
<cleanupDaemonThreads>false</cleanupDaemonThreads>
Expand Down
4 changes: 2 additions & 2 deletions samples/java/jdbc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers-bom</artifactId>
<version>1.19.5</version>
<version>1.19.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -80,7 +80,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
<version>3.1.1</version>
<version>3.2.0</version>
<configuration>
<mainClass>com.google.cloud.spanner.pgadapter.sample.SampleApplication</mainClass>
<cleanupDaemonThreads>false</cleanupDaemonThreads>
Expand Down
2 changes: 1 addition & 1 deletion samples/java/spring-data-jpa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.2.2</version>
<version>3.2.3</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>com.google.cloud.spanner</groupId>
Expand Down
2 changes: 1 addition & 1 deletion samples/python/psycopg3/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
psycopg~=3.1.18
testcontainers~=3.7.1
google~=3.0.0
google.auth~=2.28.0
google.auth~=2.28.1

0 comments on commit 6b1fbf9

Please sign in to comment.