Skip to content

Commit

Permalink
Merge pull request #1088 from godaddy/dependabot/maven/server/java/mi…
Browse files Browse the repository at this point in the history
…nor-and-patch-18fcc900b3

build(deps): bump the minor-and-patch group across 2 directories with 17 updates
  • Loading branch information
aka-bo authored Nov 25, 2024
2 parents fc16180 + c8a4f99 commit ae9e1c0
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 31 deletions.
22 changes: 11 additions & 11 deletions server/java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<junit.jupiter.version>5.9.3</junit.jupiter.version>
<junit.jupiter.api.version>5.9.3</junit.jupiter.api.version>
<junit.jupiter.version>5.11.3</junit.jupiter.version>
<junit.jupiter.api.version>5.11.3</junit.jupiter.api.version>
<io.grpc.version>1.68.1</io.grpc.version>
<protobuf.version>3.25.5</protobuf.version>
<appencryption.version>0.3.1</appencryption.version>
<info.picocli.version>4.7.5</info.picocli.version>
<info.picocli.version>4.7.6</info.picocli.version>
<gson.version>2.11.0</gson.version>
<json.version>20231013</json.version>
<hikaricp.version>6.2.1</hikaricp.version>
<io.netty.version>4.1.103.Final</io.netty.version>
<commons.lang3.version>3.14.0</commons.lang3.version>
<slf4j.version>2.0.9</slf4j.version>
<jacoco.version>0.8.10</jacoco.version>
<io.netty.version>4.1.115.Final</io.netty.version>
<commons.lang3.version>3.17.0</commons.lang3.version>
<slf4j.version>2.0.16</slf4j.version>
<jacoco.version>0.8.12</jacoco.version>
<checkstyle.config>${project.basedir}/checkstyle.xml</checkstyle.config>
<suppressions.config>${project.basedir}/suppressions.xml</suppressions.config>
</properties>
Expand Down Expand Up @@ -178,7 +178,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>5.3.1</version>
<version>5.14.2</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down Expand Up @@ -215,7 +215,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.10.1</version>
<version>3.13.0</version>
<configuration>
<source>8</source>
<target>8</target>
Expand All @@ -224,7 +224,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.2.2</version>
<version>3.6.0</version>
<executions>
<execution>
<id>validate</id>
Expand All @@ -246,7 +246,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0</version>
<version>3.5.2</version>
<configuration>
<useSystemClassLoader>false</useSystemClassLoader>
</configuration>
Expand Down
11 changes: 6 additions & 5 deletions tests/cross-language/java/checkstyle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,12 @@
<property name="message" value="Line has trailing spaces."/>
</module>

<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html -->
<module name="LineLength">
<property name="max" value="130"/>
</module>

<!-- Checks for Headers -->
<!-- See http://checkstyle.sf.net/config_header.html -->
<!-- <module name="Header"> -->
Expand Down Expand Up @@ -109,11 +115,6 @@
<property name="processJavadoc" value="false"/>
</module>

<!-- Checks for Size Violations. -->
<!-- See http://checkstyle.sf.net/config_sizes.html -->
<module name="LineLength">
<property name="max" value="130"/>
</module>
<module name="MethodLength"/>
<module name="ParameterNumber"/>

Expand Down
10 changes: 5 additions & 5 deletions tests/cross-language/java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
<java.version>17</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<cucumber.version>5.4.0</cucumber.version>
<junit.jupiter.version>5.1.0</junit.jupiter.version>
<junit.jupiter.version>5.11.3</junit.jupiter.version>
<hikaricp.version>6.2.1</hikaricp.version>
<mysql.connector.version>8.0.28</mysql.connector.version>
<mysql.connector.version>8.0.30</mysql.connector.version>
<checkstyle.config>${project.basedir}/checkstyle.xml</checkstyle.config>
</properties>

Expand All @@ -41,7 +41,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.0.0</version>
<version>3.6.0</version>
<executions>
<execution>
<id>validate</id>
Expand All @@ -62,7 +62,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.7.0</version>
<version>3.13.0</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
Expand All @@ -71,7 +71,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.1</version>
<version>3.3.1</version>
<executions>
<execution>
<id>attach-sources</id>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ public void iDecryptTheEncryptedData() {

// Create a session for this test
try (SessionFactory sessionFactory = SessionFactory
.newBuilder(DefaultProductId, DefaultServiceId)
.withMetastore(metastore)
.withCryptoPolicy(cryptoPolicy)
.withKeyManagementService(keyManagementService)
.build()) {
.newBuilder(DefaultProductId, DefaultServiceId)
.withMetastore(metastore)
.withCryptoPolicy(cryptoPolicy)
.withKeyManagementService(keyManagementService)
.build()) {

// Now create an actual session for a partition (which in our case is a dummy id). This session is used
// for a transaction and is closed automatically after use due to the AutoCloseable implementation.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ public void iEncryptTheData() {

// Create a session for the test
try (SessionFactory sessionFactory = SessionFactory
.newBuilder(DefaultProductId, DefaultServiceId)
.withMetastore(metastore)
.withCryptoPolicy(cryptoPolicy)
.withKeyManagementService(keyManagementService)
.build()) {
.newBuilder(DefaultProductId, DefaultServiceId)
.withMetastore(metastore)
.withCryptoPolicy(cryptoPolicy)
.withKeyManagementService(keyManagementService)
.build()) {

// Now create an actual session for a partition (which in our case is a dummy id). This session is used
// for a transaction and is closed automatically after use due to the AutoCloseable implementation.
Expand Down

0 comments on commit ae9e1c0

Please sign in to comment.