Skip to content

Commit 1794a9e

Browse files
committed
fix: Updated Elasticsearch version and its related configs compatible to 7.10.2
1 parent df23faa commit 1794a9e

5 files changed

Lines changed: 11 additions & 6 deletions

File tree

.github/workflows/pr-code-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
--health-retries 5
2222
2323
elasticsearch:
24-
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.13
24+
image: docker.elastic.co/elasticsearch/elasticsearch:7.10.2
2525
env:
2626
discovery.type: single-node
2727
ES_JAVA_OPTS: "-Xms512m -Xmx512m"

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ To ensure the GitHub Actions workflows in this repository function correctly, th
189189

190190
Every pull request triggers a GitHub Actions workflow that:
191191

192-
- Spins up **Redis (6.0.8)** and **Elasticsearch (7.17.13)** containers
192+
- Spins up **Redis (6.0.8)** and **Elasticsearch (7.10.2)** containers
193193
- Runs unit tests and publishes results
194194
- Builds the project using Maven
195195
- Performs **SonarCloud** static code analysis

app/elasticsearch/ElasticSearchUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
import org.elasticsearch.client.indices.CreateIndexRequest;
3737
import org.elasticsearch.client.indices.CreateIndexResponse;
3838
import org.elasticsearch.common.settings.Settings;
39-
import org.elasticsearch.xcontent.XContentType;
39+
import org.elasticsearch.common.xcontent.XContentType;
4040
import org.elasticsearch.index.query.QueryBuilder;
4141
import org.elasticsearch.search.SearchHit;
4242
import org.elasticsearch.search.SearchHits;

pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,11 @@
110110
<artifactId>httpclient</artifactId>
111111
<version>4.5.1</version>
112112
</dependency>
113+
<dependency>
114+
<groupId>org.apache.httpcomponents</groupId>
115+
<artifactId>httpcore</artifactId>
116+
<version>4.4.12</version>
117+
</dependency>
113118
<!-- http://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
114119
<dependency>
115120
<groupId>com.fasterxml.jackson.core</groupId>
@@ -193,7 +198,7 @@
193198
<artifactId>jackson-dataformat-cbor</artifactId>
194199
</exclusion>
195200
</exclusions>
196-
<version>7.17.13</version>
201+
<version>7.10.2</version>
197202
</dependency>
198203
<dependency>
199204
<groupId>com.fasterxml.jackson.dataformat</groupId>

vmsetup.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash
22
sudo apt update
33
sudo apt install redis-server -y
4-
curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.17.13-amd64.deb
5-
sudo dpkg -i elasticsearch-7.17.13-amd64.deb
4+
curl -O https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-7.10.2-amd64.deb
5+
sudo dpkg -i elasticsearch-7.10.2-amd64.deb
66
sudo service elasticsearch start
77
sudo service elasticsearch status
88
find ./ -type f -name "logback.xml" -print0 | xargs -0 sed -i -e 's/\/data\/logs/logs/g'

0 commit comments

Comments
 (0)