diff options
7 files changed, 23 insertions, 23 deletions
@@ -7,7 +7,7 @@ <artifactId>galaxy</artifactId> <packaging>jar</packaging> <name>galaxy</name> - <version>2.0.1</version> + <version>2.0.2</version> <description>galaxy tools for common</description> <url>http://www.zdjizhi.com/galaxy-tool</url> @@ -25,7 +25,7 @@ <repository> <id>nexus</id> <name>Team Nexus Repository</name> - <url>http://192.168.40.153:8099/content/repositories/galaxy-tool</url> + <url>http://192.168.40.153:8099/content/repositories/releases</url> </repository> </repositories> @@ -33,7 +33,7 @@ <repository> <id>nexus</id> <name>releases</name> - <url>http://192.168.40.153:8099/content/repositories/galaxy-tool</url> + <url>http://192.168.40.153:8099/content/repositories/releases</url> <uniqueVersion>true</uniqueVersion> </repository> </distributionManagement> @@ -239,11 +239,12 @@ </exclusions> </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <version>33.0.0-jre</version> - </dependency> + <dependency> + <groupId>com.geedgenetworks.shaded.com.google.guava</groupId> + <artifactId>guava-shaded</artifactId> + <version>33.0.0-jre</version> + <classifier>jre</classifier> + </dependency> <dependency> <groupId>com.alibaba.fastjson2</groupId> diff --git a/src/main/java/com/geedgenetworks/utils/AbstractDatabaseReader.java b/src/main/java/com/geedgenetworks/utils/AbstractDatabaseReader.java index 28be192..4104b67 100644 --- a/src/main/java/com/geedgenetworks/utils/AbstractDatabaseReader.java +++ b/src/main/java/com/geedgenetworks/utils/AbstractDatabaseReader.java @@ -1,6 +1,6 @@ package com.geedgenetworks.utils; -import com.google.common.collect.ObjectArrays; +import com.geedgenetworks.shaded.com.google.common.collect.ObjectArrays; import com.maxmind.db.CHMCache; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/geedgenetworks/utils/AsnLookup.java b/src/main/java/com/geedgenetworks/utils/AsnLookup.java index 6bb9e9b..37fecab 100644 --- a/src/main/java/com/geedgenetworks/utils/AsnLookup.java +++ b/src/main/java/com/geedgenetworks/utils/AsnLookup.java @@ -1,9 +1,10 @@ package com.geedgenetworks.utils; -import com.google.common.base.Joiner; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import com.geedgenetworks.model.LocationResponse; +import com.geedgenetworks.shaded.com.google.common.base.Joiner; +import com.geedgenetworks.shaded.com.google.common.collect.Lists; +import com.geedgenetworks.shaded.com.google.common.collect.Maps; + import java.io.File; import java.io.IOException; import java.io.InputStream; diff --git a/src/main/java/com/geedgenetworks/utils/DateUtils.java b/src/main/java/com/geedgenetworks/utils/DateUtils.java index a8b8321..a0060d7 100644 --- a/src/main/java/com/geedgenetworks/utils/DateUtils.java +++ b/src/main/java/com/geedgenetworks/utils/DateUtils.java @@ -1,6 +1,5 @@ package com.geedgenetworks.utils; - -import com.google.common.collect.Lists; +import com.geedgenetworks.shaded.com.google.common.collect.Lists; import org.joda.time.*; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; diff --git a/src/main/java/com/geedgenetworks/utils/FormatUtils.java b/src/main/java/com/geedgenetworks/utils/FormatUtils.java index 41837bd..4a2f00f 100644 --- a/src/main/java/com/geedgenetworks/utils/FormatUtils.java +++ b/src/main/java/com/geedgenetworks/utils/FormatUtils.java @@ -6,11 +6,10 @@ import java.util.List; import java.util.Map.Entry; import java.util.Set; +import com.geedgenetworks.shaded.com.google.common.net.InternetDomainName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.net.InternetDomainName; - public class FormatUtils { protected final Logger logger = LoggerFactory.getLogger(this.getClass()); diff --git a/src/main/java/com/geedgenetworks/utils/IpLookupV2.java b/src/main/java/com/geedgenetworks/utils/IpLookupV2.java index 41db7f9..68c99dd 100644 --- a/src/main/java/com/geedgenetworks/utils/IpLookupV2.java +++ b/src/main/java/com/geedgenetworks/utils/IpLookupV2.java @@ -4,10 +4,11 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONWriter; import com.geedgenetworks.model.LocationResponse; -import com.google.common.base.Function; -import com.google.common.base.Joiner; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; +import com.geedgenetworks.shaded.com.google.common.base.Function; +import com.geedgenetworks.shaded.com.google.common.base.Joiner; +import com.geedgenetworks.shaded.com.google.common.collect.Lists; +import com.geedgenetworks.shaded.com.google.common.collect.Maps; + import java.io.File; import java.io.IOException; import java.io.InputStream; diff --git a/src/test/java/com/geedgenetworks/test/DateUtilTest.java b/src/test/java/com/geedgenetworks/test/DateUtilTest.java index ab38f73..32ce03a 100644 --- a/src/test/java/com/geedgenetworks/test/DateUtilTest.java +++ b/src/test/java/com/geedgenetworks/test/DateUtilTest.java @@ -3,9 +3,8 @@ package com.geedgenetworks.test; import java.util.Collections; import java.util.Date; import java.util.List; - -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; +import com.geedgenetworks.shaded.com.google.common.collect.Iterables; +import com.geedgenetworks.shaded.com.google.common.collect.Lists; import com.geedgenetworks.utils.DateUtils; import com.geedgenetworks.utils.TimeConstants; import org.apache.log4j.Logger; |