Merge branch 'master' into master

This commit is contained in:
sIvanovKonstantyn 2024-01-29 09:48:23 +01:00 committed by GitHub
commit 492adfa40d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 24 additions and 6 deletions

View File

@ -16,7 +16,7 @@
<modules> <modules>
<module>quarkus-project</module> <module>quarkus-project</module>
<!--<module>spring-project</module>--> <!-- Fixing in JAVA-24010 --> <module>spring-project</module>
</modules> </modules>
</project> </project>

View File

@ -103,9 +103,10 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.12.1</version>
<configuration> <configuration>
<source>${maven.compiler.source.version}</source> <source>${maven.compiler.release}</source>
<target>${maven.compiler.target.version}</target> <target>${maven.compiler.release}</target>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
@ -117,16 +118,30 @@
<name>Spring release</name> <name>Spring release</name>
<url>https://repo.spring.io/release</url> <url>https://repo.spring.io/release</url>
</repository> </repository>
<repository>
<id>spring-milestone</id>
<name>Spring Milestone</name>
<url>https://repo.spring.io/milestone</url>
</repository>
<repository>
<id>spring-snapshot</id>
<name>Spring Snapshot</name>
<url>https://repo.spring.io/snapshot</url>
</repository>
</repositories> </repositories>
<pluginRepositories> <pluginRepositories>
<pluginRepository> <pluginRepository>
<id>spring-release</id> <id>spring-milestone</id>
<name>Spring release</name> <name>Spring milestone</name>
<url>https://repo.spring.io/release</url> <url>https://repo.spring.io/milestone</url>
</pluginRepository> </pluginRepository>
</pluginRepositories> </pluginRepositories>
<profiles> <profiles>
<profile> <profile>
<id>native</id> <id>native</id>
@ -158,6 +173,7 @@
<plugin> <plugin>
<groupId>org.springframework.experimental</groupId> <groupId>org.springframework.experimental</groupId>
<artifactId>spring-aot-maven-plugin</artifactId> <artifactId>spring-aot-maven-plugin</artifactId>
<version>${spring-native.version}</version>
<executions> <executions>
<execution> <execution>
<id>test-generate</id> <id>test-generate</id>
@ -194,6 +210,7 @@
<plugin> <plugin>
<groupId>org.springframework.experimental</groupId> <groupId>org.springframework.experimental</groupId>
<artifactId>spring-aot-maven-plugin</artifactId> <artifactId>spring-aot-maven-plugin</artifactId>
<version>${spring-native.version}</version>
<executions> <executions>
<execution> <execution>
<id>test-generate</id> <id>test-generate</id>
@ -257,6 +274,7 @@
<maven-surefire-plugin.version>3.1.0</maven-surefire-plugin.version> <maven-surefire-plugin.version>3.1.0</maven-surefire-plugin.version>
<native-buildtools.version>0.9.11</native-buildtools.version> <native-buildtools.version>0.9.11</native-buildtools.version>
<jasync-r2dbc-mysql.version>2.0.8</jasync-r2dbc-mysql.version> <jasync-r2dbc-mysql.version>2.0.8</jasync-r2dbc-mysql.version>
<maven.compiler.release>17</maven.compiler.release>
</properties> </properties>
</project> </project>