diff options
| author | gujinkai <[email protected]> | 2024-04-01 16:04:59 +0800 |
|---|---|---|
| committer | gujinkai <[email protected]> | 2024-04-01 16:27:21 +0800 |
| commit | 77c546b73343e8d7ae9eba9a57f2fca906b3269f (patch) | |
| tree | 7304da9b082d7d319cc8ce4bdf6d207f8308a9a6 | |
| parent | e0e2e57c453440ddcd679182660c7ed972286e89 (diff) | |
feature: upgrade the version of jdk and groot and galaxy
| -rw-r--r-- | platform-base/pom.xml | 12 | ||||
| -rw-r--r-- | platform-etl/src/main/java/com/zdjizhi/etl/utils/ip/IPUtils.java | 2 | ||||
| -rw-r--r-- | platform-schedule/pom.xml | 6 | ||||
| -rw-r--r-- | pom.xml | 8 |
4 files changed, 23 insertions, 5 deletions
diff --git a/platform-base/pom.xml b/platform-base/pom.xml index 0c9f483..a46c47e 100644 --- a/platform-base/pom.xml +++ b/platform-base/pom.xml @@ -28,6 +28,18 @@ <dependency> <groupId>com.geedgenetworks</groupId> + <artifactId>groot-core</artifactId> + <version>${groot.version}</version> + <exclusions> + <exclusion> + <groupId>*</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> + </dependency> + + <dependency> + <groupId>com.geedgenetworks</groupId> <artifactId>groot-common</artifactId> <version>${groot.version}</version> <exclusions> diff --git a/platform-etl/src/main/java/com/zdjizhi/etl/utils/ip/IPUtils.java b/platform-etl/src/main/java/com/zdjizhi/etl/utils/ip/IPUtils.java index 8859a31..c6dfd68 100644 --- a/platform-etl/src/main/java/com/zdjizhi/etl/utils/ip/IPUtils.java +++ b/platform-etl/src/main/java/com/zdjizhi/etl/utils/ip/IPUtils.java @@ -1,6 +1,6 @@ package com.zdjizhi.etl.utils.ip; -import com.geedgenetworks.domain.LocationResponse; +import com.geedgenetworks.model.LocationResponse; import com.geedgenetworks.utils.IpLookupV2; import com.geedgenetworks.utils.StringUtil; import com.zdjizhi.base.common.CnRecordLog; diff --git a/platform-schedule/pom.xml b/platform-schedule/pom.xml index 228fc7c..8978e82 100644 --- a/platform-schedule/pom.xml +++ b/platform-schedule/pom.xml @@ -113,6 +113,12 @@ <include>com/geedgenetworks/common/**</include> </includes> </filter> + <filter> + <artifact>com.geedgenetworks:groot-core</artifact> + <includes> + <include>com/geedgenetworks/core/metrics/**</include> + </includes> + </filter> </filters> <transformers> <transformer @@ -20,7 +20,7 @@ <properties> <flink.version>1.13.1</flink.version> - <zdjizhi.version>1.2.2</zdjizhi.version> + <zdjizhi.version>2.0.2</zdjizhi.version> <opencsv.version>3.3</opencsv.version> <scala.version>2.12</scala.version> <hadoop.version>2.7.1</hadoop.version> @@ -31,7 +31,7 @@ <mockito.version>4.0.0</mockito.version> <jooq.version>0.9.15</jooq.version> - <groot.version>1.0.0_rc2</groot.version> + <groot.version>1.1.0</groot.version> </properties> <repositories> @@ -361,8 +361,8 @@ <artifactId>maven-compiler-plugin</artifactId> <version>3.8.0</version> <configuration> - <source>1.8</source> - <target>1.8</target> + <source>11</source> + <target>11</target> <!-- The semantics of this option are reversed, see MCOMPILER-209. --> <useIncrementalCompilation>false</useIncrementalCompilation> <compilerArgs> |