Skip to content

Commit 4ee8d67

Browse files
dkasimovskiyclaude
andcommitted
chore: bump dependencies for release 1.7.0 (part 2)
* Bump netty version from 4.2.13.Final to 4.2.15.Final * Bump spring-boot version from 3.5.11 to 3.5.12 in tarantool-spring-data-35 * Bump spring-boot version from 4.0.5 to 4.0.6 in tarantool-spring-data-40 * Bump maven-source-plugin from 3.3.1 to 3.4.0 * Bump maven-wrapper from 3.3.2 to 3.3.4 (Maven 3.9.11 to 3.9.16) Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
1 parent 5714928 commit 4ee8d67

10 files changed

Lines changed: 42 additions & 46 deletions

File tree

.mvn/wrapper/MavenWrapperDownloader.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
import java.util.concurrent.ThreadLocalRandom;
1717

1818
public final class MavenWrapperDownloader {
19-
private static final String WRAPPER_VERSION = "@@project.version@@";
19+
private static final String WRAPPER_VERSION = "3.3.4";
2020

2121
private static final boolean VERBOSE = Boolean.parseBoolean(System.getenv("MVNW_VERBOSE"));
2222

@@ -31,8 +31,11 @@ public static void main(String[] args) {
3131
try {
3232
log(" - Downloader started");
3333
final URL wrapperUrl = URI.create(args[0]).toURL();
34-
final String jarPath = args[1].replace("..", ""); // Sanitize path
35-
final Path wrapperJarPath = Paths.get(jarPath).toAbsolutePath().normalize();
34+
final Path baseDir = Paths.get(".").toAbsolutePath().normalize();
35+
final Path wrapperJarPath = baseDir.resolve(args[1]).normalize();
36+
if (!wrapperJarPath.startsWith(baseDir)) {
37+
throw new IOException("Invalid path: outside of allowed directory");
38+
}
3639
downloadFileFromURL(wrapperUrl, wrapperJarPath);
3740
log("Done");
3841
} catch (IOException e) {

.mvn/wrapper/maven-wrapper.jar

-61.6 KB
Binary file not shown.
Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,4 @@
1-
# Licensed to the Apache Software Foundation (ASF) under one
2-
# or more contributor license agreements. See the NOTICE file
3-
# distributed with this work for additional information
4-
# regarding copyright ownership. The ASF licenses this file
5-
# to you under the Apache License, Version 2.0 (the
6-
# "License"); you may not use this file except in compliance
7-
# with the License. You may obtain a copy of the License at
8-
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing,
12-
# software distributed under the License is distributed on an
13-
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14-
# KIND, either express or implied. See the License for the
15-
# specific language governing permissions and limitations
16-
# under the License.
17-
wrapperVersion=3.3.2
1+
wrapperVersion=3.3.4
182
distributionType=bin
19-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.11/apache-maven-3.9.11-bin.zip
20-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar
3+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.16/apache-maven-3.9.16-bin.zip
4+
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.4/maven-wrapper-3.3.4.jar

CHANGELOG.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
Compile:
2626
* Bump jackson version from 2.18.4 to 2.21.3
2727
* Bump msgpack version from 0.9.10 to 0.9.12
28-
* Bump netty version from 4.2.7.Final to 4.2.13.Final
28+
* Bump netty version from 4.2.7.Final to 4.2.15.Final
2929
* Bump httpclient5 version from 5.5 to 5.5.2
3030
* Bump httpcore5 version from 5.3.4 to 5.4.2
31-
* Bump spring-boot version from 3.5.8 to 3.5.10 in tarantool-spring-data-35
32-
* Pin spring-data-keyvalue version to 3.5.10 for tarantool-spring-data-35 and 4.0.4 for tarantool-spring-data-40
31+
* Bump spring-boot version from 3.5.8 to 3.5.12 in tarantool-spring-data-35
32+
* Add spring-boot version 4.0.6 in tarantool-spring-data-40
3333
* Bump micrometer version from 1.16.4 to 1.16.5
3434

3535
Tests:
@@ -42,14 +42,17 @@
4242
* Bump commons-codec version from 1.19.0 to 1.22.0
4343
* Bump opentelemetry version from 1.48.0 to 1.62.0
4444

45-
Maven:
45+
Maven:
46+
* Bump Maven version from 3.9.11 to 3.9.16
4647
* Bump maven-enforcer-plugin from 3.6.1 to 3.6.2
4748
* Bump maven-release-plugin from 3.1.1 to 3.3.1
4849
* Bump maven-compiler-plugin from 3.14.0 to 3.15.0
4950
* Bump maven-surefire-plugin from 3.5.4 to 3.5.5
5051
* Bump maven-pmd-plugin from 3.27.0 to 3.28.0
5152
* Bump spotbugs-maven-plugin from 4.9.8.1 to 4.9.8.3
5253
* Bump maven-resources-plugin from 3.3.1 to 3.5.0
54+
* Bump maven-source-plugin from 3.3.1 to 3.4.0
55+
* Bump maven-wrapper from 3.3.2 to 3.3.4
5356
* Bump jacoco-maven-plugin from 0.8.13 to 0.8.14
5457
* Bump maven-antrun-plugin from 3.1.0 to 3.2.0
5558
* Bump central-publishing-maven-plugin from 0.9.0 to 0.10.0

mvnw

Lines changed: 18 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

mvnw.cmd

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
<logging.logLevel>debug</logging.logLevel>
7979
<maven.compiler.source>8</maven.compiler.source>
8080
<maven.compiler.target>8</maven.compiler.target>
81-
<netty.version>4.2.13.Final</netty.version>
81+
<netty.version>4.2.15.Final</netty.version>
8282
<slf4j.api.version>2.0.17</slf4j.api.version>
8383
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
8484
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -440,7 +440,7 @@
440440
</plugin>
441441
<plugin>
442442
<artifactId>maven-source-plugin</artifactId>
443-
<version>3.3.1</version>
443+
<version>3.4.0</version>
444444
<configuration>
445445
<archive>
446446
<manifestEntries>

tarantool-java-sdk-bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<properties>
1515
<jackson.version>2.21.3</jackson.version>
1616
<msgpack.version>0.9.12</msgpack.version>
17-
<netty.version>4.2.13.Final</netty.version>
17+
<netty.version>4.2.15.Final</netty.version>
1818
<slf4j.api.version>2.0.17</slf4j.api.version>
1919
<testcontainers.version>2.0.5</testcontainers.version>
2020
<logback.version>1.3.16</logback.version>

tarantool-spring-data/tarantool-spring-data-35/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<properties>
1919
<maven.compiler.source>17</maven.compiler.source>
2020
<maven.compiler.target>17</maven.compiler.target>
21-
<spring.boot.version>3.5.11</spring.boot.version>
21+
<spring.boot.version>3.5.12</spring.boot.version>
2222
<shared.dir>${project.parent.parent.basedir}/tarantool-shared-resources/</shared.dir>
2323
<license.header.file>${project.parent.parent.basedir}/LICENSE_HEADER.txt</license.header.file>
2424
</properties>

tarantool-spring-data/tarantool-spring-data-40/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<properties>
1919
<!-- Recommended Java version is 25, minimal version is 17 -->
2020
<maven.compiler.release>17</maven.compiler.release>
21-
<spring.boot.version>4.0.5</spring.boot.version>
21+
<spring.boot.version>4.0.6</spring.boot.version>
2222
<shared.dir>${project.parent.parent.basedir}/tarantool-shared-resources/</shared.dir>
2323
<license.header.file>${project.parent.parent.basedir}/LICENSE_HEADER.txt</license.header.file>
2424
<!-- Spring Framework 7.x uses JUnit 6 -->

0 commit comments

Comments
 (0)