Skip to content
Snippets Groups Projects
Commit 130bf4b3 authored by Benoit Lavenier's avatar Benoit Lavenier
Browse files

[fix] fix logging config

[enh] Upgrade to elasticsearch 2.4.5
parent b2cab8ae
No related branches found
No related tags found
No related merge requests found
package org.duniter.elasticsearch.subscription.util;
/*-
* #%L
* Duniter4j :: ElasticSearch Subscription plugin
* %%
* Copyright (C) 2014 - 2017 EIS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/gpl-3.0.html>.
* #L%
*/
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
......
package org.duniter.elasticsearch.subscription.util.stringtemplate;
/*-
* #%L
* Duniter4j :: ElasticSearch Subscription plugin
* %%
* Copyright (C) 2014 - 2017 EIS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/gpl-3.0.html>.
* #L%
*/
import org.stringtemplate.v4.AttributeRenderer;
import java.text.DateFormat;
......
package org.duniter.elasticsearch.subscription.util.stringtemplate;
/*-
* #%L
* Duniter4j :: ElasticSearch Subscription plugin
* %%
* Copyright (C) 2014 - 2017 EIS
* %%
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as
* published by the Free Software Foundation, either version 3 of the
* License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public
* License along with this program. If not, see
* <http://www.gnu.org/licenses/gpl-3.0.html>.
* #L%
*/
import org.duniter.core.client.model.ModelUtils;
import org.duniter.core.util.CollectionUtils;
import org.duniter.core.util.StringUtils;
......
......@@ -68,7 +68,7 @@ java.version=1.7
# elasticsearch release. This version is checked when the plugin
# is loaded so Elasticsearch will refuse to start in the presence of
# plugins with the incorrect elasticsearch.version.
elasticsearch.version=2.3.3
elasticsearch.version=2.4.5
#
### deprecated elements for jvm plugins :
#
......
......@@ -5,5 +5,5 @@ site=false
jvm=true
classname=org.duniter.elasticsearch.user.Plugin
java.version=1.7
elasticsearch.version=2.3.3
elasticsearch.version=2.4.5
isolated=false
......@@ -20,7 +20,7 @@
<xml-apis.version>2.0.2</xml-apis.version>
<kalium.version>0.5.0_blavenie</kalium.version>
<scrypt.version>1.4.0</scrypt.version>
<elasticsearch.version>2.3.3</elasticsearch.version>
<elasticsearch.version>2.4.5</elasticsearch.version>
<jna.version>4.1.0</jna.version>
<tyrus.version>1.13</tyrus.version>
......@@ -188,11 +188,6 @@
<artifactId>nuiton-i18n</artifactId>
<version>${nuitonI18nVersion}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>4.3.2</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment