Merge branch 'master' into dev

# Conflicts:
#	pom.xml
This commit is contained in:
everywhere.z
2024-11-27 17:14:08 +08:00
4 changed files with 13 additions and 2 deletions

View File

@@ -39,7 +39,7 @@
</scm>
<properties>
<revision>2.12.4.2</revision>
<revision>2.12.4.3</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<maven.compiler.source>8</maven.compiler.source>
@@ -374,7 +374,6 @@
<artifactId>maven-site-plugin</artifactId>
<version>3.7.1</version>
</plugin>
<!-- Javadoc -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>