Merge pull request #22 from alex268/master

Upgrade dependencies and fix logging problems
ydb-platform · Feb 2, 2024 · 88d6f6f · 88d6f6f
2 parents b08478d + 9bebfc2
commit 88d6f6f
Show file tree

Hide file tree

Showing 12 changed files with 62 additions and 57 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -22,10 +22,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'

diff --git a/.github/workflows/validate.yaml b/.github/workflows/validate.yaml
@@ -19,10 +19,10 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: ${{ matrix.java }}
           distribution: 'temurin'

diff --git a/jdbc/pom.xml b/jdbc/pom.xml
@@ -15,8 +15,8 @@
     <packaging>pom</packaging>
 
     <properties>
-        <ydb.jdbc.version>2.0.2</ydb.jdbc.version>
-        <slf4j.version>1.7.25</slf4j.version>
+        <ydb.jdbc.version>2.0.6</ydb.jdbc.version>
+        <slf4j.version>1.7.36</slf4j.version>
     </properties>
 
     <modules>

diff --git a/jdbc/spring-data-jpa-v5/src/main/resources/log4j2.xml b/jdbc/spring-data-jpa-v5/src/main/resources/log4j2.xml
diff --git a/jdbc/spring-data-jpa-v5/src/test/resources/application-test.properties b/jdbc/spring-data-jpa-v5/src/test/resources/application-test.properties
@@ -1,5 +1,5 @@
 spring.jpa.show-sql=true
-spring.jpa.properties.hibernate.format_sql=true
+spring.jpa.properties.hibernate.format_sql=false
 spring.jpa.properties.hibernate.highlight_sql=true
 
 spring.jpa.properties.hibernate.hbm2ddl.auto=create
diff --git a/jdbc/spring-data-jpa-v5/src/test/resources/logback.xml b/jdbc/spring-data-jpa-v5/src/test/resources/logback.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d %5p %40.40c:%4L - %m%n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- https://www.testcontainers.org/supported_docker_environment/logging_config/ -->
+    <logger name="org.testcontainers" level="warn" />
+    <logger name="com.github.dockerjava" level="warn"/>
+    <logger name="com.github.dockerjava.zerodep.shaded.org.apache.hc.client5.http.wire" level="off"/>
+
+    <logger name="org.hibernate.SQL" additivity="true" level="debug" />
+
+    <root level="warn">
+        <appender-ref ref="console" />
+    </root>
+</configuration>
diff --git a/jdbc/spring-data-jpa/pom.xml b/jdbc/spring-data-jpa/pom.xml
@@ -13,7 +13,6 @@
         <maven.compiler.release>17</maven.compiler.release>
         <kotlin.version>1.9.22</kotlin.version>
         <hibernate.ydb.dialect.version>0.9.1</hibernate.ydb.dialect.version>
-        <ydb.jdbc.driver.version>2.0.5</ydb.jdbc.driver.version>
         <spring.boot.version>3.2.1</spring.boot.version>
     </properties>
     <dependencies>
@@ -44,18 +43,13 @@
         </dependency>
         <dependency>
             <groupId>tech.ydb.jdbc</groupId>
-            <artifactId>ydb-jdbc-driver</artifactId>
-            <version>${ydb.jdbc.driver.version}</version>
+            <artifactId>ydb-jdbc-driver-shaded</artifactId>
         </dependency>
         <dependency>
             <groupId>com.github.javafaker</groupId>
             <artifactId>javafaker</artifactId>
             <version>1.0.2</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlinx</groupId>
             <artifactId>kotlinx-coroutines-core</artifactId>
@@ -72,6 +66,13 @@
             <version>1.19.1</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>${spring.boot.version}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>tech.ydb.test</groupId>
             <artifactId>ydb-junit5-support</artifactId>
@@ -83,12 +84,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <version>${spring.boot.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <build>
         <sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>

diff --git a/jdbc/spring-data-jpa/src/main/resources/log4j2.xml b/jdbc/spring-data-jpa/src/main/resources/log4j2.xml
diff --git a/jdbc/spring-data-jpa/src/test/resources/application-test.properties b/jdbc/spring-data-jpa/src/test/resources/application-test.properties
@@ -1,5 +1,5 @@
 spring.jpa.show-sql=true
-spring.jpa.properties.hibernate.format_sql=true
+spring.jpa.properties.hibernate.format_sql=false
 spring.jpa.properties.hibernate.highlight_sql=true
 
 spring.jpa.properties.hibernate.hbm2ddl.auto=create
diff --git a/jdbc/spring-data-jpa/src/test/resources/logback.xml b/jdbc/spring-data-jpa/src/test/resources/logback.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d %5p %40.40c:%4L - %m%n</pattern>
+        </encoder>
+    </appender>
+
+    <!-- https://www.testcontainers.org/supported_docker_environment/logging_config/ -->
+    <logger name="org.testcontainers" level="warn" />
+    <logger name="com.github.dockerjava" level="warn"/>
+    <logger name="com.github.dockerjava.zerodep.shaded.org.apache.hc.client5.http.wire" level="off"/>
+
+    <logger name="org.hibernate.SQL" additivity="true" level="debug" />
+
+    <root level="info">
+        <appender-ref ref="console" />
+    </root>
+</configuration>
diff --git a/pom.xml b/pom.xml
@@ -15,10 +15,10 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <log4j.version>2.20.0</log4j.version>
+        <log4j.version>2.22.1</log4j.version>
         <jcommander.version>1.82</jcommander.version>
 
-        <ydb.sdk.version>2.1.7</ydb.sdk.version>
+        <ydb.sdk.version>2.1.11</ydb.sdk.version>
     </properties>
 
     <modules>
@@ -66,7 +66,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.11.0</version>
+                    <version>3.12.1</version>
                     <configuration>
                         <target>1.8</target>
                         <source>1.8</source>
@@ -81,7 +81,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.2.5</version>
                     <configuration>
                         <environmentVariables>
                             <TESTCONTAINERS_REUSE_ENABLE>true</TESTCONTAINERS_REUSE_ENABLE>
@@ -91,7 +91,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.5.0</version>
+                    <version>3.6.1</version>
                     <executions>
                         <execution>
                             <id>copy-dependencies</id>

diff --git a/ydb-cookbook/src/main/java/tech/ydb/examples/simple/AlterTable.java b/ydb-cookbook/src/main/java/tech/ydb/examples/simple/AlterTable.java
@@ -1,14 +1,14 @@
 package tech.ydb.examples.simple;
 
 import java.time.Duration;
+
 import tech.ydb.core.grpc.GrpcTransport;
 import tech.ydb.examples.SimpleExample;
 import tech.ydb.table.Session;
 import tech.ydb.table.TableClient;
 import tech.ydb.table.description.TableColumn;
 import tech.ydb.table.description.TableDescription;
 import tech.ydb.table.settings.AlterTableSettings;
-import tech.ydb.table.values.OptionalType;
 import tech.ydb.table.values.PrimitiveType;
 
 
@@ -42,8 +42,8 @@ protected void run(GrpcTransport transport, String pathPrefix) {
 
         session.alterTable(tablePath, new AlterTableSettings()
                 .setTraceId("some-trace-id")
-                .addColumn("name", OptionalType.of(PrimitiveType.Text))
-                .addColumn("age", OptionalType.of(PrimitiveType.Uint32))
+                .addNullableColumn("name", PrimitiveType.Text)
+                .addNullableColumn("age", PrimitiveType.Uint32)
                 .dropColumn("value")
             ).join().expectSuccess("cannot alter table");