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

Fix #4 #5

Merged
merged 2 commits into from
Jan 28, 2021
Merged

Fix #4 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
844fe70
Update for SeedStack 20.7
Nheverest Sep 19, 2020
9febd4a
added compability with elasticsearch TransportClient from v2 to v7
Nheverest Oct 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sudo: true

language: java

jdk: oraclejdk8
jdk: openjdk11

cache:
directories:
Expand All @@ -17,6 +17,6 @@ install:
- if [[ $TRAVIS_PULL_REQUEST = false ]] && [[ $TRAVIS_BRANCH = master ]] || [[ $TRAVIS_TAG = v* ]]; then GOAL=deploy; else GOAL=install; fi
- if [[ $TRAVIS_TAG = v* ]]; then ADDITIONAL_PROFILES=release; mvn -q -U org.seedstack:seedstack-maven-plugin:release; else ADDITIONAL_PROFILES=snapshots; fi

script: mvn -q -U -T 2 -Pbuild-number,compatibility,bintray,javadoc,$ADDITIONAL_PROFILES $GOAL jacoco:report
script: mvn -q -U -T 2 -Pbuild-number,compatibility,bintray,javadoc,v2,$ADDITIONAL_PROFILES $GOAL jacoco:report

after_success: mvn -q coveralls:report -DrepoToken=$COVERALLS_TOKEN
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# Version 3.1.0 (2020-10-29)

* [chg] Update for SeedStack 20.7
* [chg] Compatibility with transport client from elasticsearch v2 to v7

# Version 3.0.0 (2017-01-13)

* [brk] Update to new configuration system.
Expand Down
12 changes: 12 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,18 @@

ElasticSearch official persistence integration for SeedStack.

This addon provides a transport client compatible with elasticsearch from v2 to v7.

It has been tested against following elasticsearch servers:

- 2.4.6
- 5.6.2
- 6.8.10
- 7.9.1

Profiles have added in order to help build the addon with various elasticsearch jar versions.
By default, Profile v2 is used in travis build configuration.

# Copyright and license

This source code is copyrighted by [The SeedStack Authors](https://github.com/seedstack/seedstack/blob/master/AUTHORS) and
Expand Down
175 changes: 164 additions & 11 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--

Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>

This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
Expand All @@ -14,19 +14,18 @@
<parent>
<groupId>org.seedstack.poms</groupId>
<artifactId>parent-internal</artifactId>
<version>3.0.0</version>
<version>3.4.9</version>
</parent>

<groupId>org.seedstack.addons.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.0-SNAPSHOT</version>

<properties>
<seed.version>3.0.1</seed.version>

<seed.version>3.10.0</seed.version>
<compatibility.skip>true</compatibility.skip>

<bintray.package>elasticsearch-addon</bintray.package>
<hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
</properties>

<build>
Expand All @@ -51,6 +50,7 @@
<includedLicense>IGNORED_LICENSE</includedLicense>
</includedLicenses>
<licenseMerges>
<licenseMerge>Apache 2|Apache 2.0</licenseMerge>
<licenseMerge>Apache 2|Apache License, Version 2.0</licenseMerge>
<licenseMerge>Apache 2|The Apache Software License, Version 2.0</licenseMerge>
<licenseMerge>Apache 2|Apache License 2.0</licenseMerge>
Expand All @@ -59,6 +59,7 @@
<licenseMerge>BSD|The New BSD License</licenseMerge>
<licenseMerge>CDDL|CDDL + GPLv2 with classpath exception</licenseMerge>
<licenseMerge>LGPL 3.0|GNU Lesser Public License</licenseMerge>
<licenseMerge>MIT License|The MIT License</licenseMerge>
<licenseMerge>IGNORED_LICENSE|MPL 1.1</licenseMerge>
</licenseMerges>
</configuration>
Expand All @@ -74,10 +75,14 @@
<version>${seed.version}</version>
</dependency>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>2.4.3</version>
<scope>provided</scope>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>${hibernate-validator.version}</version>
</dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.26</version>
</dependency>

<dependency>
Expand All @@ -88,10 +93,16 @@
</dependency>
<dependency>
<groupId>org.seedstack.seed</groupId>
<artifactId>seed-testing</artifactId>
<artifactId>seed-testing-junit4</artifactId>
<version>${seed.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>${assertj.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
Expand Down Expand Up @@ -151,5 +162,147 @@
</repository>
</repositories>
</profile>
<profile>
<id>v2</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>2.4.3</version>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>v5</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>5.6.16</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>transport</artifactId>
<version>5.6.16</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.11.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.11.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>v60</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>6.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>transport</artifactId>
<version>6.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.11.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.11.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>v68</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>6.8.10</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>transport</artifactId>
<version>6.8.10</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.11.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.11.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>v79</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<dependencies>
<dependency>
<groupId>org.elasticsearch</groupId>
<artifactId>elasticsearch</artifactId>
<version>7.9.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>transport</artifactId>
<version>7.9.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.11.1</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.11.1</version>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
</profiles>
</project>
4 changes: 2 additions & 2 deletions src/main/java/org/seedstack/elasticsearch/ElasticSearchConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
/*
* Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchClientProxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
/*
* Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchErrorCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
/*
* Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
Expand All @@ -16,5 +16,7 @@ enum ElasticSearchErrorCode implements ErrorCode {
FORBIDDEN_CLIENT_CLOSE,
INVALID_HOST,
INVALID_PORT,
CANNOT_CREATE_CLIENT, UNKNOWN_HOST
CANNOT_CREATE_CLIENT, UNKNOWN_HOST,
NO_TRANSPORT_CLIENT_FOUND,
CANNOT_CREATE_ADDRESS;
}
4 changes: 2 additions & 2 deletions src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>
/*
* Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
Expand Down