Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(deps): upgrade elasticsearch to 7.16.3... #956

Merged
merged 5 commits into from
Jan 14, 2022
Merged

chore(deps): upgrade elasticsearch to 7.16.3... #956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
952f541
chore(deps): upgrade elasticsearch to 7.16.2...
cmark Dec 20, 2021
351ff71
chore(deps): remove unnecessary elasticsearch-log4j-7.16.1.jar
cmark Dec 20, 2021
dff45f6
Merge remote-tracking branch 'origin/8.x' into upgrade/elasticsearch-…
cmark Jan 12, 2022
a5bcf15
chore(deps): upgrade elasticsearch to 7.16.3 and log4j to 2.17.1
cmark Jan 14, 2022
3a46fce
chore(docker): upgrade elasticsearch image to 7.16.3
cmark Jan 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions commons/com.b2international.index/.classpath
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,32 @@
</classpathentry>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="src" path="src/"/>
<classpathentry exported="true" kind="lib" path="lib/aggs-matrix-stats-client-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/analysis-common-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/aggs-matrix-stats-client-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/analysis-common-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/antlr4-runtime-4.5.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/asm-7.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/asm-analysis-7.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/asm-commons-7.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/asm-tree-7.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/asm-util-7.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/compiler-0.9.6.jar"/>
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-cli-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-core-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-geo-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-log4j-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-rest-client-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-rest-high-level-client-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-secure-sm-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-ssl-config-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-x-content-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-cli-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-core-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-geo-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-log4j-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-rest-client-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-rest-high-level-client-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-secure-sm-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-ssl-config-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/elasticsearch-x-content-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/hppc-0.8.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jna-5.10.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/joda-time-2.10.10.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jopt-simple-5.0.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lang-mustache-client-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lang-painless-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/log4j-api-2.11.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lang-mustache-client-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lang-painless-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/log4j-api-2.17.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-common-8.10.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lucene-backward-codecs-8.10.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lucene-core-8.10.1.jar"/>
Expand All @@ -47,17 +47,17 @@
<classpathentry exported="true" kind="lib" path="lib/lucene-sandbox-8.10.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lucene-spatial3d-8.10.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/lucene-suggest-8.10.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/mapper-extras-client-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/parent-join-client-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/percolator-client-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/rank-eval-client-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/reindex-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/reindex-client-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/scripting-painless-spi-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/ssl-config-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/mapper-extras-client-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/parent-join-client-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/percolator-client-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/rank-eval-client-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/reindex-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/reindex-client-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/scripting-painless-spi-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/ssl-config-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/t-digest-3.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/transport-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/transport-netty4-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/transport-netty4-client-7.16.1.jar"/>
<classpathentry exported="true" kind="lib" path="lib/transport-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/transport-netty4-7.16.3.jar"/>
<classpathentry exported="true" kind="lib" path="lib/transport-netty4-client-7.16.3.jar"/>
<classpathentry kind="output" path="target/classes/"/>
</classpath>
53 changes: 26 additions & 27 deletions commons/com.b2international.index/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,32 +58,32 @@ Import-Package: javax.management,
org.slf4j.helpers;version="1.7.2",
org.slf4j.spi;version="1.7.2"
Bundle-ClassPath: .,
lib/aggs-matrix-stats-client-7.16.1.jar,
lib/analysis-common-7.16.1.jar,
lib/aggs-matrix-stats-client-7.16.3.jar,
lib/analysis-common-7.16.3.jar,
lib/antlr4-runtime-4.5.3.jar,
lib/asm-7.2.jar,
lib/asm-analysis-7.2.jar,
lib/asm-commons-7.2.jar,
lib/asm-tree-7.2.jar,
lib/asm-util-7.2.jar,
lib/compiler-0.9.6.jar,
lib/elasticsearch-7.16.1.jar,
lib/elasticsearch-cli-7.16.1.jar,
lib/elasticsearch-core-7.16.1.jar,
lib/elasticsearch-geo-7.16.1.jar,
lib/elasticsearch-log4j-7.16.1.jar,
lib/elasticsearch-rest-client-7.16.1.jar,
lib/elasticsearch-rest-high-level-client-7.16.1.jar,
lib/elasticsearch-secure-sm-7.16.1.jar,
lib/elasticsearch-ssl-config-7.16.1.jar,
lib/elasticsearch-x-content-7.16.1.jar,
lib/elasticsearch-7.16.3.jar,
lib/elasticsearch-cli-7.16.3.jar,
lib/elasticsearch-core-7.16.3.jar,
lib/elasticsearch-geo-7.16.3.jar,
lib/elasticsearch-log4j-7.16.3.jar,
lib/elasticsearch-rest-client-7.16.3.jar,
lib/elasticsearch-rest-high-level-client-7.16.3.jar,
lib/elasticsearch-secure-sm-7.16.3.jar,
lib/elasticsearch-ssl-config-7.16.3.jar,
lib/elasticsearch-x-content-7.16.3.jar,
lib/hppc-0.8.1.jar,
lib/jna-5.10.0.jar,
lib/joda-time-2.10.10.jar,
lib/jopt-simple-5.0.2.jar,
lib/lang-mustache-client-7.16.1.jar,
lib/lang-painless-7.16.1.jar,
lib/log4j-api-2.11.1.jar,
lib/lang-mustache-client-7.16.3.jar,
lib/lang-painless-7.16.3.jar,
lib/log4j-api-2.17.1.jar,
lib/lucene-analyzers-common-8.10.1.jar,
lib/lucene-backward-codecs-8.10.1.jar,
lib/lucene-core-8.10.1.jar,
Expand All @@ -96,19 +96,18 @@ Bundle-ClassPath: .,
lib/lucene-queryparser-8.10.1.jar,
lib/lucene-sandbox-8.10.1.jar,
lib/lucene-spatial3d-8.10.1.jar,
lib/lucene-spatial-extras-8.10.1.jar,
lib/lucene-suggest-8.10.1.jar,
lib/mapper-extras-client-7.16.1.jar,
lib/parent-join-client-7.16.1.jar,
lib/percolator-client-7.16.1.jar,
lib/rank-eval-client-7.16.1.jar,
lib/reindex-7.16.1.jar,
lib/reindex-client-7.16.1.jar,
lib/scripting-painless-spi-7.16.1.jar,
lib/ssl-config-7.16.1.jar,
lib/mapper-extras-client-7.16.3.jar,
lib/parent-join-client-7.16.3.jar,
lib/percolator-client-7.16.3.jar,
lib/rank-eval-client-7.16.3.jar,
lib/reindex-7.16.3.jar,
lib/reindex-client-7.16.3.jar,
lib/scripting-painless-spi-7.16.3.jar,
lib/ssl-config-7.16.3.jar,
lib/t-digest-3.2.jar,
lib/transport-7.16.1.jar,
lib/transport-netty4-7.16.1.jar,
lib/transport-netty4-client-7.16.1.jar,
lib/transport-7.16.3.jar,
lib/transport-netty4-7.16.3.jar,
lib/transport-netty4-client-7.16.3.jar,
lib/lz4-java-1.8.0.jar
Bundle-Activator: com.b2international.index.Activator
Binary file removed commons/com.b2international.index/lib/elasticsearch-log4j-7.16.1.jar
View file
Open in desktop
Binary file not shown.
Binary file added commons/com.b2international.index/lib/elasticsearch-log4j-7.16.3.jar
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion commons/com.b2international.index/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<packaging>eclipse-plugin</packaging>

<properties>
<elasticsearch.version>7.16.1</elasticsearch.version>
<elasticsearch.version>7.16.3</elasticsearch.version>
</properties>

<!-- NOTE: in case of dependency changes, please update "includeArtifactIds" in maven-dependency-plugin's configuration as well, listing all (exact and transitive) dependency artifacts -->
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3.7"

services:
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:7.16.1
image: docker.elastic.co/elasticsearch/elasticsearch:7.16.3
container_name: elasticsearch
environment:
cluster.name: "elastic-snowowl"
Expand Down