Skip to content

Commit e2178eb

Browse files
davemoore-davemoore-
committed
Adding support for Elasticsearch 8.13.x. Replaced wildcard imports with specific imports. Completely removed doc mapping types.
1 parent 80066fb commit e2178eb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+187
-206
lines changed

‎.github/workflows/commit.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
# Build and test zentity for each version of Elasticsearch that its APIs support.
2525
matrix:
2626
elasticsearch:
27-
- 7.17.0
28-
- 7.16.3
29-
- 7.16.2
30-
- 7.16.1
27+
- 8.13.3
28+
- 8.13.2
29+
- 8.13.1
30+
- 8.13.0
3131

3232
# Use the latest LTS OS.
3333
runs-on: ubuntu-20.04

‎.github/workflows/deploy.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ jobs:
6767
# Build and test zentity for each version of Elasticsearch that its APIs support.
6868
matrix:
6969
elasticsearch:
70-
- 7.17.0
71-
- 7.16.3
72-
- 7.16.2
73-
- 7.16.1
70+
- 8.13.3
71+
- 8.13.2
72+
- 8.13.1
73+
- 8.13.0
7474
steps:
7575

7676
# Checkout the repository.

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ zentity was developed in IntelliJ IDEA and uses Maven to manage dependencies, te
1616

1717
1. Install [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
1818
2. Install [IntelliJ IDEA](https://www.jetbrains.com/idea/download/)
19-
3. Install [JDK 11](https://www.oracle.com/java/technologies/javase-jdk11-downloads.html)
19+
3. Install [JDK 17](https://www.oracle.com/java/technologies/downloads/#java17)
2020

2121
**Create the project on IntelliJ IDEA:**
2222

‎NOTICE‎

Lines changed: 1 addition & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,5 @@
11
zentity
2-
Copyright © 2018-2022 Dave Moore
3-
https://zentity.io
4-
5-
Licensed under the Apache License, Version 2.0 (the "License");
6-
you may not use this file except in compliance with the License.
7-
You may obtain a copy of the License at
8-
9-
http://www.apache.org/licenses/LICENSE-2.0
10-
11-
Unless required by applicable law or agreed to in writing, software
12-
distributed under the License is distributed on an "AS IS" BASIS,
13-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
See the License for the specific language governing permissions and
15-
limitations under the License.
16-
zentity
17-
Copyright © 2018-${current.year} Dave Moore
18-
https://zentity.io
19-
20-
Licensed under the Apache License, Version 2.0 (the "License");
21-
you may not use this file except in compliance with the License.
22-
You may obtain a copy of the License at
23-
24-
http://www.apache.org/licenses/LICENSE-2.0
25-
26-
Unless required by applicable law or agreed to in writing, software
27-
distributed under the License is distributed on an "AS IS" BASIS,
28-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
29-
See the License for the specific language governing permissions and
30-
limitations under the License.
31-
zentity
32-
Copyright © 2018-2022 Dave Moore
33-
https://zentity.io
34-
35-
Licensed under the Apache License, Version 2.0 (the "License");
36-
you may not use this file except in compliance with the License.
37-
You may obtain a copy of the License at
38-
39-
http://www.apache.org/licenses/LICENSE-2.0
40-
41-
Unless required by applicable law or agreed to in writing, software
42-
distributed under the License is distributed on an "AS IS" BASIS,
43-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
44-
See the License for the specific language governing permissions and
45-
limitations under the License.
46-
zentity
47-
Copyright © 2018-2021 Dave Moore
2+
Copyright © 2018-2024 Dave Moore
483
https://zentity.io
494

505
Licensed under the Apache License, Version 2.0 (the "License");

‎pom.xml‎

Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,21 @@
1818
<zentity.author>Dave Moore</zentity.author>
1919
<zentity.classname>org.elasticsearch.plugin.zentity.ZentityPlugin</zentity.classname>
2020
<zentity.website>${project.url}</zentity.website>
21-
<zentity.version>1.8.2</zentity.version>
21+
<zentity.version>1.8.3-dev</zentity.version>
2222

2323
<!-- Dependency versions -->
24-
<elasticsearch.version>7.17.0</elasticsearch.version>
25-
<jackson.core.version>2.10.5</jackson.core.version>
26-
<jackson.databind.version>2.10.5.1</jackson.databind.version>
27-
<jdk.version>1.11</jdk.version>
28-
<log4j.version>2.11.1</log4j.version>
29-
<commons-io.version>2.8.0</commons-io.version>
24+
<elasticsearch.version>8.13.0</elasticsearch.version>
25+
<jackson.core.version>2.17.0</jackson.core.version>
26+
<jackson.databind.version>2.17.0</jackson.databind.version>
27+
<jdk.version>1.17</jdk.version>
28+
<commons-io.version>2.16.1</commons-io.version>
3029
<testcontainers.version>1.16.0</testcontainers.version>
3130

3231
<!-- Maven plugin versions -->
3332
<maven.antrun.version>3.0.0</maven.antrun.version>
34-
<maven.assembly.version>3.3.0</maven.assembly.version>
35-
<maven.build-helper.version>3.2.0</maven.build-helper.version>
33+
<maven.assembly.version>3.7.1</maven.assembly.version>
34+
<maven.build-helper.version>3.5.0</maven.build-helper.version>
35+
<maven.compiler.version>3.13.0</maven.compiler.version>
3636
<maven.junit.version>2.7.8</maven.junit.version>
3737
<maven.license.codehaus.version>2.0.0</maven.license.codehaus.version>
3838
<maven.license.mycila.version>3.0</maven.license.mycila.version>
@@ -51,7 +51,7 @@
5151
<groupId>org.elasticsearch</groupId>
5252
<artifactId>elasticsearch</artifactId>
5353
<version>${elasticsearch.version}</version>
54-
<scope>provided</scope>
54+
<scope>provided</scope><!-- Provided by Elasticsearch -->
5555
</dependency>
5656
<dependency>
5757
<groupId>com.fasterxml.jackson.core</groupId>
@@ -63,22 +63,16 @@
6363
<groupId>com.fasterxml.jackson.core</groupId>
6464
<artifactId>jackson-databind</artifactId>
6565
<version>${jackson.databind.version}</version>
66-
<scope>compile</scope><!-- Not provided by Elasticsearch -->
66+
<scope>compile</scope>
6767
</dependency>
6868

6969
<!-- Test infrastructure -->
7070
<dependency>
71-
<groupId>org.elasticsearch.client</groupId>
72-
<artifactId>elasticsearch-rest-high-level-client</artifactId>
71+
<groupId>co.elastic.clients</groupId>
72+
<artifactId>elasticsearch-java</artifactId>
7373
<version>${elasticsearch.version}</version>
7474
<scope>test</scope>
7575
</dependency>
76-
<dependency>
77-
<groupId>org.apache.logging.log4j</groupId>
78-
<artifactId>log4j-core</artifactId>
79-
<version>${log4j.version}</version>
80-
<scope>test</scope>
81-
</dependency>
8276
<dependency>
8377
<groupId>commons-io</groupId>
8478
<artifactId>commons-io</artifactId>
@@ -98,6 +92,7 @@
9892
<plugin>
9993
<groupId>org.apache.maven.plugins</groupId>
10094
<artifactId>maven-compiler-plugin</artifactId>
95+
<version>${maven.compiler.version}</version>
10196
<configuration>
10297
<source>9</source>
10398
<target>9</target>

‎src/main/java/io/zentity/common/AbstractGroupedActionListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* zentity
3-
* Copyright © 2018-2022 Dave Moore
3+
* Copyright © 2018-2024 Dave Moore
44
* https://zentity.io
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");

‎src/main/java/io/zentity/common/AsyncCollectionRunner.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* zentity
3-
* Copyright © 2018-2022 Dave Moore
3+
* Copyright © 2018-2024 Dave Moore
44
* https://zentity.io
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");

‎src/main/java/io/zentity/common/Json.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* zentity
3-
* Copyright © 2018-2022 Dave Moore
3+
* Copyright © 2018-2024 Dave Moore
44
* https://zentity.io
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");

‎src/main/java/io/zentity/common/Patterns.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* zentity
3-
* Copyright © 2018-2022 Dave Moore
3+
* Copyright © 2018-2024 Dave Moore
44
* https://zentity.io
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");

‎src/main/java/io/zentity/common/StreamUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
22
* zentity
3-
* Copyright © 2018-2022 Dave Moore
3+
* Copyright © 2018-2024 Dave Moore
44
* https://zentity.io
55
*
66
* Licensed under the Apache License, Version 2.0 (the "License");

0 commit comments

Comments
 (0)