Skip to content

Commit 69487e7

Browse files
adrienlaueradrienlauer
committed
Update dependencies, add gpg
1 parent f113931 commit 69487e7

File tree

13 files changed

+121
-60
lines changed

13 files changed

+121
-60
lines changed

‎.travis.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@ cache:
99
- "$HOME/.m2/repository"
1010

1111
before_install:
12-
- curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.4.3/elasticsearch-2.4.3.deb && sudo dpkg -i --force-confnew elasticsearch-2.4.3.deb && sudo service elasticsearch start
13-
- sleep 5
12+
- gpg --fast-import gpg.asc
13+
- curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.4.3/elasticsearch-2.4.3.deb && sudo dpkg -i --force-confnew elasticsearch-2.4.3.deb && sudo service elasticsearch start
14+
- sleep 5
1415

1516
install:
16-
- echo "<settings><servers><server><id>bintray</id><username>\${env.BINTRAY_USER}</username><password>\${env.BINTRAY_KEY}</password></server></servers></settings>" > ~/.m2/settings.xml
17-
- if [[ $TRAVIS_PULL_REQUEST = false ]] && [[ $TRAVIS_BRANCH = master ]] || [[ $TRAVIS_TAG = v* ]]; then GOAL=deploy; else GOAL=install; fi
18-
- if [[ $TRAVIS_TAG = v* ]]; then ADDITIONAL_PROFILES=release; mvn -q -U org.seedstack:seedstack-maven-plugin:release; else ADDITIONAL_PROFILES=snapshots; fi
17+
- echo "<settings><servers><server><id>ossrh</id><username>\${env.SONATYPE_USER}</username><password>\${env.SONATYPE_PASSWORD}</password></server></servers></settings>" > ~/.m2/settings.xml
18+
- if [[ $TRAVIS_PULL_REQUEST = false ]] && [[ $TRAVIS_BRANCH = master || $TRAVIS_BRANCH = dev-* ]] || [[ $TRAVIS_TAG = v* ]]; then GOAL=deploy; else GOAL=install; fi
19+
- if [[ $TRAVIS_TAG = v* ]]; then ADDITIONAL_PROFILES=release; mvn -q -U org.seedstack:seedstack-maven-plugin:release; fi
1920

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

2223
after_success: mvn -q coveralls:report -DrepoToken=$COVERALLS_TOKEN

‎CHANGELOG.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
# Version 3.1.0 (2020-10-29)
1+
# Version 3.1.0 (2021-05-09)
22

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

65
# Version 3.0.0 (2017-01-13)

‎gpg.asc‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
-----BEGIN PGP PRIVATE KEY BLOCK-----
2+
3+
lQIVBFURkDoBEAD77xeWlHPAay/mareRGHhlc/x7IY1T6GRge71bh8M29ha6WoXt
4+
ES+ypXXIibKlcFA/IBb9Sihw2kkCZ/KPJoG94HsjrbdHGZcCdJKNXI4UcXekLTeb
5+
yldVorR0VKe1bkv7TAfz8Qi3NZ+kBs3WQb9uNrsasm4eO2L7/A8FO08kvXnzm41l
6+
wI3OCeioiKyk3CgWptTgFvKxTueJNXmbYyDO3TPcRxEgJfoa/r5dRrqZsaPELuzI
7+
FEaSf4dfL9j2DtX/iBJ0u1ZJBax9Fa9LQxGg9GflJA2HVVDnMU9nI554aNUvRAYw
8+
zBg9awgUGX2p0Il/2oVWGdHSg/EskQDka5liJFkTD9XXSEEzNl8Wp3c+mPS46xuW
9+
xEYaQoZ5udtwjoUN5CZwm9qhwvf3RXEAzD/jMoPs3RyMekUEHJOEx+0GP1VoqV7J
10+
yrnBmvcq18mKLQHblKCAe2+whdEwJ/aZ5F5sV6RLSe/tXpDiGy8jdp2eIpkSOnEZ
11+
gyRyTDv7sw/S3EhXDsZeqxNJTakT8BHcCUX91w0bwbxOULCkS8utPh/SfenXN7JN
12+
6ER42HtNr75UQT2yA8NIYjhSdwgSPym8+YXnv+h4MSz0fuF2GTb3YF1FLEuauqhn
13+
f+bU2sBNRB2QnlSMo39DvFPNZyiZUWPIw4V7TvIct7mxNb4QWsUIn0SB5wARAQAB
14+
/wBlAEdOVQG0JUFkcmllbiBMQVVFUiA8YWRyaWVuLmxhdWVyQGdtYWlsLmNvbT6J
15+
AlUEEwEIAD8CGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAFiEEk/irS8Sp20nd
16+
IV6DcSPZWkaJV88FAmB1TN8FCRTJviUACgkQcSPZWkaJV89j/RAAymowPElwTtiV
17+
PXxI4Bg+SLkwqEzQBDqwqD0s83NbLkdvyAgvq/PVOPIOR+wA8fxmOR/zDBmWceEU
18+
yVCK6WmdVOcBy48Ql+Os2SyxQ2n7pIMioMRlbl4Hp/2xY+8a/HtCwqk5SklfLjNl
19+
Z8WdPEOyG/oPXT2poOocacOPVsP4wcqgWhleltMzGmz/+hM2avRvcYiG7FPvLUWG
20+
3npvumI3Lg93IV82fbr3WKdawGM2k1egrRblcqUxXVg42P9wy9GSCMJNuJCwLT4P
21+
cXkIqlZN8nm01oTzcGnyVzYCskIkBxktGAFExBzs/jCUlhIPmNZ6y3IKWASxtsXi
22+
iwaKiWHDXh4Ae3ueTxTb3kbAMi/xvcr/KxW8F8buf+zIwDlQMIk/HdNX/HptGk+/
23+
Gzbpo8TdSCGNeMAWxmg63aSWnVY2uVeHdj42SGkezI+8cC3ZnycR0KeFMhLiTR/m
24+
ZJXarJatxKBQgSZVk0Gyd6f+A93k0pw5qEUwOo4zKBfEBTYNprvDN0RuOTGZhB9O
25+
j99mlViAj1+YlMYalpCxUNtEz7Rtf6mG5jZMnkuSwxYTwWvsH8lOrZP6u85yohqI
26+
7VxbRx7RlsuCBmgb0RvTH8dNoQRl0RRr5LNCTvcZ1rS5LwJH2G/iwDifuEl2pPDq
27+
rvhoPYpTTPggWGffQTess7+ddo6fqI6dB0YEYJFzFwEQAKK0SFlJWMUBFcHMwvHj
28+
kCEep3IvDoOnAQIxdOqK8CO/YfQuYil20r/41mmKcYKvghFyFY3QtrZf51SnNHDP
29+
oaiG79LXrQWX743bU6Rc7v3m2EySQDnDPC6e2O1iRbXi8Zt7bHcOa21Mm7OunF5E
30+
lJKeXX1pE3wpV924cSM2rF0+1zk7tWdH2YHYEGZwRjw11kuNfCN+yq56kj6rR6/+
31+
0A/Qv7JR7K5UjcKHUYiBZYx7Incw4e4vnopWWjB6MAxcTg9GBq5n1pA0VdHGSMkm
32+
BYpxyYf8kBv0Mubx9Oha9IXFtt+5Z0s5sL+1jJwbZ53Ggnl6y1xlWryYF8i0JZT3
33+
cvsNzolodWjgdHVazIZC9jO9GnmUc3tfio3yq/KovdsFtPF8KISmV3r7+9es1OT2
34+
apMlHlUjRtnPZoxhE/RC8qjKGPjnMIzVilcdk4y3/CZNrMXBHvkl6JorlUw+8uz/
35+
QjiBLQ8WN5pk/qLTUUAnZ+NIcUWh70TP3mCae0j8vLedh1ShZ3RWgO6eX6/IUCJ1
36+
4dA/a1iOmMTslr0u0cyLUW+w/N4W3Bm9NgvvBybQiEs1adQtbSvQ1GHvl+bVA0ar
37+
RItJseaVxLeXWSFED/r2JfUHAagK6gXCWjBPiN9xwb+OkBG07m9KY+adguZH3rSA
38+
uGJ5FbKe4pYfsSHAbePQEpSXABEBAAH+BwMCP+fPaxZh6unzJXWB+dANAL7rmRF1
39+
FmCVFuTboHIzcFWBgzmDxO7nN0FYJ+BFxAzbHm0uU4u4uJV/aUoA8nopOzQ+ihVo
40+
ASBC41whDyBWz+PK6kHn6TL0x9/2aR0//q/sjOfA4Wvffz0XZr+Pofu/mutE311w
41+
88eIbFcLiTzyjWbKTnAA61aFyHUWMzsAmb0SitJjrvrSmAcF0sm/Fr9tpiQvWYIk
42+
zz9zB/cZfFqjpQwOEPqBgHuQxKiGj0uj97BdBJM5EnjZ9REgvf8IV+j8HACCtMfr
43+
dLKBUZSFsvsOuLVjkaE8UTgiLReuo0Bve+5o/Ju0ZrwfZGXs0aDUgDYAjaBWdzW5
44+
GL8zD2bsDuAY8gnnZGAH2A8p+avjd5q1Z6moTzm/ogK+HHW8QiQnb35XUO8XBXAz
45+
a3xAkXItGNoYlDUoZ3vTg8nF1p+dhjV2H0SSsV7CQrqdT8thDSWjhXjM3B8b0kBO
46+
63e2EaHssP5c13GFNxk9X05aZNxXtSgigdrHViu8ToP2fbJPYtu7YhaI8e3LRpGR
47+
rblQ68f+QyEfaI7ymm4gRT1hA93No0HWrPXuYDFg72R+FDfW+oNopgojQHwOI0Dc
48+
pFdAsq9SuKTQYod0EqHFgSXUnG1hdOBwgjh46e2R9EyqJCt9BALGZmw4cqC/vwxF
49+
gcxJTYUE9aMhlXlE1YPCDY7R+spavUc23YHncxMdGcxhXhAfJDrFRPX0BTM81u71
50+
chxr9m/feyHA9YuM13gEvrcmpTg335mgLJbP+vvoVK4+xb8rK83JCcFPV5QCpE9r
51+
ITjrXj2xF7l2ErcwafhsVowRBS1crvnACwdG5ixAFlKMxVHpZctvvt9WK7hTvf4s
52+
AmEUJoI08pGA4LLSFv0gI1q4qMOHFuS4r+l9rpZPvfGBOrzI/40Qwh/EO9essoA7
53+
PCHzZSEObwhXbXdSElnVtQB50HIhxCZWYYYnpmDDkM5yEdvkmz1Zztx/+yVRgUa6
54+
YzhDyq7MkcSboxffFQsDBvRfKtAELJOcganY8wgZLDVRpuOzFkNHBgBYODB3b8hG
55+
P3LGWyo0EQpwV5KFnytFZHq8XM5FQYUxFcdAMry6rt1yGkUMJpc/vsMb3+9SkVp2
56+
1/AQ1JEGLJFDVTbG27ybWnUD4F8TCN3ZoB6UjQWABHcVKlDEiWfEnmTZHB2RH3q0
57+
POeVUdfi5uAztGYypRAVfWLXdLVgEQyJPSBLNJQFtf5SxpNeKxA7JyBHV+81/Hpe
58+
535g52IIjcUv3D6jcXF8WODLVamWpnogOOrRMmm+6pVhL8DvHxvrv9TRXkICjAwA
59+
qDex+VjLW5uLEERD7SH/8XcPcxF2A+Qj3S1OI+XXZR+7XYTCe/4kBZcxDvHe+5zP
60+
WuP9szBcLYn3zCgQzLHW6SQSd62x1KB1pz8MW+T79CaKclWwq0w2DC1Zfhq4OYtG
61+
L+YLjwKCd8xINqupGP42b2zptG8dCJaeNycMGxMHDgDZsU0J7Vw7EU34Zy6kgoiI
62+
MiVm/eUS3g6j0BMlTngSysx2fkGDOLgrmB45R/EtZ5caJTLssV90r4ZZfYYZKo/D
63+
KMhww7JE1fORthrDNVzpsPoejjYF1lFvFTSW1dJ2vwvvTggdjyl3piyK7CkLQa0r
64+
UuAEUq56ES+MCdk2cFC+9jYnrx4FM3ySxHZ2mSncZNJKL/MvtXsYoeqQxp7+IQuo
65+
W86poRSf32S7mJy4Zav5rFLQA6TKfmN08taKE1vCKqwlNiDLTAtCD1woYJZVnxQU
66+
3WBdjTinj5oKawP/rmRYkIkEbAQYAQgAIBYhBJP4q0vEqdtJ3SFeg3Ej2VpGiVfP
67+
BQJgkXMXAhsCAkAJEHEj2VpGiVfPwXQgBBkBCAAdFiEEN3CNXqP3WVhsmY7qALLE
68+
71af0LgFAmCRcxcACgkQALLE71af0LhKvw//d6CN3RQOf7Jhc7ucl8LuZzIYgbAl
69+
KOq7qxNDYH6UhZkwTFO1fCBHvmhefWcP3iZAmFuXYFabfO+T/KHX3rtsNyW3jG54
70+
9OJ1MzeP7L7+/clacRMQtHQJE5biOlt5QyreAQ0VxqR5Bb6zwoNGbMY/0hyf7EIi
71+
pBxbDjYujk0vMpPBM43k+SOTK3ayJexyd32I0mBXnjfL5HIzeA+okRGWy6OoFvYp
72+
aJ9zzanhVn3inH9iL2gQg+PQdr9ei+axlzCJIL+AYL4eDSKkgbRO/DACWxieNqw9
73+
GoBRK8RaglZIewXk3eMe80fP1ynmYuww0uRtioKklZTMlqTLIJUM2RwSLRNQCP2A
74+
gkdgy4RecQ1rOY5IKwXP2ZX1jRBDwCwtYZUryiHOKHH8nJKsvAOqeeXvYRmjbBB5
75+
I1SFw3ac5UTlfc+yd7NDhyF8GwdROMrv/aPhbVMzyGkHzVbpETT54PxzV8b4Yq2U
76+
HFSk8AY1Sa5FSNHCXbLIOxp5yR2qqd9tqX3ckgp8gsobMG37XjI9mdggjqDsNCsN
77+
75wZ6Jwj3Fb53pQ18KK/O78LoTYNgZ7U7brqOKc75TDhcZ1VPvtV8FA4yMd9EXkm
78+
Ilm/6C+gkpB//csyzcQG2TXoNw3DN/6+L7rfNY+k98+8xxnS7lyTUrQWWdffTZAX
79+
4PO8lk8JzC9Mm711tRAA+XYg+qahzC3aPLtU68ezvq89v75rLe27jzM6BB20Y0dY
80+
qjK1FKHfNNqlW1CTnMRg9YpNliiBHVNo2xuqk17Ozy0xF6/b/I9ilQwRspVgXpB9
81+
0hozsKne4TKAR2/ymnqbyKG3znRH1UvQZzuzxIh/CM8WzXkgppGE95xqOhKUKvfG
82+
2pIJj0CXmi71ZKJSKi7ADH+djn1ZApM25dxfMOHDIAk06AByaIfum4gJL7k4jsfA
83+
pZyjFDQTryNlHk6HkXCgP6jy1xtkcpJiPq7nFozt7kdMfoImIjLQUJ7wiSdgZBqb
84+
XwquCSxipiTcJfcrVIRQ34ZyuM5Z1IB+RF3cr49Rn65bWUpfH6IldxQYb69Cmhyl
85+
Uq4vi2E9jBjDAsN3/U3sdJxIHG2Qs7cVDDJpIKiBTQ58vuupK48PcWio0MQWKFda
86+
NDK7X7mEtWvm0XqJWWCpLc/lodMt+/qlgEYxDoh1f+Hg+AxdW+UtIrj12LVDfJw+
87+
ETb3Y/mF0OlCQR56l7Zevp+0ocOvpd8KGWAqfATqaMf/+WDX7TwEJ2X0olqTAgA4
88+
qS7F7RHN99ohApUrCRL6BqGtbAtFFrzf8OOuI7/AH7Hg0+yxaTNBZdTtWfcTee0e
89+
qpkiNhkcsyZy438ObChQNBosqf7znI+BOf4GTEBDCtKyM0ZYpsV1nkTTz6xMhK8=
90+
=LXKR
91+
-----END PGP PRIVATE KEY BLOCK-----

‎pom.xml‎

Lines changed: 13 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<!--
22
3-
Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
3+
Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
44
55
This Source Code Form is subject to the terms of the Mozilla Public
66
License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,15 +14,15 @@
1414
<parent>
1515
<groupId>org.seedstack.poms</groupId>
1616
<artifactId>parent-internal</artifactId>
17-
<version>3.4.9</version>
17+
<version>4.0.2</version>
1818
</parent>
1919

2020
<groupId>org.seedstack.addons.elasticsearch</groupId>
2121
<artifactId>elasticsearch</artifactId>
2222
<version>3.1.0-SNAPSHOT</version>
2323

2424
<properties>
25-
<seed.version>3.10.0</seed.version>
25+
<seed.version>3.12.0</seed.version>
2626
<compatibility.skip>true</compatibility.skip>
2727
<bintray.package>elasticsearch-addon</bintray.package>
2828
<hibernate-validator.version>6.1.5.Final</hibernate-validator.version>
@@ -118,50 +118,20 @@
118118
<tag>HEAD</tag>
119119
</scm>
120120

121-
<pluginRepositories>
122-
<pluginRepository>
123-
<snapshots>
121+
<repositories>
122+
<repository>
123+
<id>oss.sonatype.org-snapshot</id>
124+
<url>http://oss.sonatype.org/content/repositories/snapshots</url>
125+
<releases>
124126
<enabled>false</enabled>
127+
</releases>
128+
<snapshots>
129+
<enabled>true</enabled>
125130
</snapshots>
126-
<id>bintray-jfrog-jfrog-jars</id>
127-
<name>bintray-plugins</name>
128-
<url>http://dl.bintray.com/jfrog/jfrog-jars</url>
129-
</pluginRepository>
130-
</pluginRepositories>
131+
</repository>
132+
</repositories>
131133

132134
<profiles>
133-
<profile>
134-
<id>snapshots</id>
135-
<repositories>
136-
<repository>
137-
<snapshots>
138-
<enabled>true</enabled>
139-
</snapshots>
140-
<releases>
141-
<enabled>false</enabled>
142-
</releases>
143-
<id>ojo-libs-snapshot</id>
144-
<name>ojo-snapshots</name>
145-
<url>https://oss.jfrog.org/artifactory/libs-snapshot</url>
146-
</repository>
147-
</repositories>
148-
</profile>
149-
<profile>
150-
<id>bintray</id>
151-
<repositories>
152-
<repository>
153-
<snapshots>
154-
<enabled>false</enabled>
155-
</snapshots>
156-
<releases>
157-
<enabled>true</enabled>
158-
</releases>
159-
<id>bintray-seedstack-jars</id>
160-
<name>bintray</name>
161-
<url>http://dl.bintray.com/seedstack/jars</url>
162-
</repository>
163-
</repositories>
164-
</profile>
165135
<profile>
166136
<id>v2</id>
167137
<activation>

‎src/main/java/org/seedstack/elasticsearch/ElasticSearchConfig.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
2+
* Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchClientProxy.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
2+
* Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchErrorCode.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
2+
* Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchModule.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
2+
* Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchPlugin.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
2+
* Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
33
*
44
* This Source Code Form is subject to the terms of the Mozilla Public
55
* License, v. 2.0. If a copy of the MPL was not distributed with this

‎src/main/resources/org/seedstack/elasticsearch/ElasticSearchConfig.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>
2+
# Copyright © 2013-2021, The SeedStack authors <http://seedstack.org>
33
#
44
# This Source Code Form is subject to the terms of the Mozilla Public
55
# License, v. 2.0. If a copy of the MPL was not distributed with this

0 commit comments

Comments
 (0)