Merge remote-tracking branch 'origin/dev' into dev
# Conflicts: # pom.xml # src/main/java/xyz/zhouxy/plusone/commons/util/ArrayUtil.java # src/main/java/xyz/zhouxy/plusone/commons/util/Enumeration.java # src/main/java/xyz/zhouxy/plusone/commons/util/RestfulResult.java # src/test/java/xyz/zhouxy/plusone/commons/EnumerationTests.java # src/test/java/xyz/zhouxy/plusone/commons/util/RestfulResultTest.java
This commit is contained in:
6
pom.xml
6
pom.xml
@@ -14,16 +14,10 @@
|
||||
<maven.compiler.target>1.8</maven.compiler.target>
|
||||
<lombok.version>1.18.24</lombok.version>
|
||||
<jackson.version>2.13.4</jackson.version>
|
||||
<google-jsr305.version>3.0.2</google-jsr305.version>
|
||||
<guava.version>31.1-jre</guava.version>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.google.code.findbugs</groupId>
|
||||
<artifactId>jsr305</artifactId>
|
||||
<version>${google-jsr305.version}</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.google.guava</groupId>
|
||||
<artifactId>guava</artifactId>
|
||||
|
Reference in New Issue
Block a user