diff --git a/hera-all/README.md b/hera-all/README.md index e9ca4516c..a136454a6 100644 --- a/hera-all/README.md +++ b/hera-all/README.md @@ -25,7 +25,7 @@ HERA是由中国区研发效能团队开源的一款应用性能观测平台(APM ## Getting started ### 部署 -[operator使用文档.pdf](readme/hera-operator-document.pdf) +[operator使用文档.md](readme%2Fdeploy%2Fhera-deploy-document.md) --- diff --git a/jcommon/es/pom.xml b/jcommon/es/pom.xml index b4006321d..5870b2676 100644 --- a/jcommon/es/pom.xml +++ b/jcommon/es/pom.xml @@ -10,14 +10,14 @@ 4.0.0 es - + 1.5-SNAPSHOT org.elasticsearch.client elasticsearch-rest-high-level-client - 7.15.2 + 7.10.0 org.apache.httpcomponents @@ -36,7 +36,7 @@ org.elasticsearch.client elasticsearch-rest-client-sniffer - 7.15.2 + 7.10.0 org.apache.httpcomponents @@ -64,8 +64,57 @@ + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.10.1 + + 1.8 + 1.8 + + true + UTF-8 + + + ${project.basedir}/src/main/java + + + + + + + + org.apache.maven.plugins + maven-source-plugin + 2.1 + + true + + + + compile + + jar + + + + + + + + + ossrh + https://s01.oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/ + + diff --git a/jcommon/es/src/main/java/com/xiaomi/mone/es/EsClient.java b/jcommon/es/src/main/java/com/xiaomi/mone/es/EsClient.java index a5d915ba2..7af4c0e6f 100644 --- a/jcommon/es/src/main/java/com/xiaomi/mone/es/EsClient.java +++ b/jcommon/es/src/main/java/com/xiaomi/mone/es/EsClient.java @@ -34,8 +34,8 @@ import org.elasticsearch.client.sniff.NodesSniffer; import org.elasticsearch.client.sniff.SniffOnFailureListener; import org.elasticsearch.client.sniff.Sniffer; +import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.common.xcontent.XContentType; -import org.elasticsearch.core.TimeValue; import org.elasticsearch.index.query.BoolQueryBuilder; import org.elasticsearch.index.query.QueryBuilder; import org.elasticsearch.index.query.QueryBuilders; diff --git a/jcommon/es/src/main/java/com/xiaomi/mone/es/EsProcessor.java b/jcommon/es/src/main/java/com/xiaomi/mone/es/EsProcessor.java index 73e04962c..7c9d7e71d 100644 --- a/jcommon/es/src/main/java/com/xiaomi/mone/es/EsProcessor.java +++ b/jcommon/es/src/main/java/com/xiaomi/mone/es/EsProcessor.java @@ -9,7 +9,7 @@ import org.elasticsearch.client.RestHighLevelClient; import org.elasticsearch.common.unit.ByteSizeUnit; import org.elasticsearch.common.unit.ByteSizeValue; -import org.elasticsearch.core.TimeValue; +import org.elasticsearch.common.unit.TimeValue; import java.util.Map; import java.util.concurrent.TimeUnit; diff --git a/jcommon/es/src/test/java/com/xiaomi/mone/es/test/EsClientTest.java b/jcommon/es/src/test/java/com/xiaomi/mone/es/test/EsClientTest.java index 1125867ce..80b6ff659 100644 --- a/jcommon/es/src/test/java/com/xiaomi/mone/es/test/EsClientTest.java +++ b/jcommon/es/src/test/java/com/xiaomi/mone/es/test/EsClientTest.java @@ -13,7 +13,7 @@ import org.elasticsearch.action.update.UpdateRequest; import org.elasticsearch.action.update.UpdateResponse; import org.elasticsearch.client.indices.GetMappingsResponse; -import org.elasticsearch.core.TimeValue; +import org.elasticsearch.common.unit.TimeValue; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.builder.SearchSourceBuilder;