From ac3b7ac230bb40b061eb89f5dd655fe6fcba49c2 Mon Sep 17 00:00:00 2001 From: blavenie <benoit.lavenier@e-is.pro> Date: Thu, 20 Apr 2017 14:25:46 +0200 Subject: [PATCH] [fix] add missing thrid-party license + add license header [fix] remove unused github maven plugin --- .../src/license/THIRD-PARTY.properties | 26 +++++++++++++++++++ .../service/bma/BmaTechnicalException.java | 22 ++++++++++++++++ .../core/beans/BeanCreationException.java | 22 ++++++++++++++++ .../org/duniter/core/model/SmtpConfig.java | 24 ++++++++++++++++- .../util/protocols/classpath/Handler.java | 24 ++++++++++++++++- .../java/org/duniter/core/util/url/URLs.java | 22 ++++++++++++++++ .../duniter/core/service/MailServiceTest.java | 22 ++++++++++++++++ .../core/util/http/InetAddressUtilsTest.java | 22 ++++++++++++++++ .../elasticsearch/beans/ESBeanFactory.java | 22 ++++++++++++++++ .../elasticsearch/client/Duniter4jClient.java | 22 ++++++++++++++++ .../duniter/elasticsearch/dao/BlockDao.java | 22 ++++++++++++++++ .../elasticsearch/dao/CurrencyExtendDao.java | 22 ++++++++++++++++ .../duniter/elasticsearch/dao/IndexDao.java | 22 ++++++++++++++++ .../elasticsearch/dao/IndexTypeDao.java | 22 ++++++++++++++++ .../duniter/elasticsearch/dao/TypeDao.java | 22 ++++++++++++++++ .../handler/AddSequenceAttributeHandler.java | 24 ++++++++++++++++- .../dao/handler/StringReaderHandler.java | 24 ++++++++++++++++- .../src/license/THIRD-PARTY.properties | 20 +++++++++----- pom.xml | 20 +++----------- 19 files changed, 399 insertions(+), 27 deletions(-) create mode 100644 duniter4j-client/src/license/THIRD-PARTY.properties diff --git a/duniter4j-client/src/license/THIRD-PARTY.properties b/duniter4j-client/src/license/THIRD-PARTY.properties new file mode 100644 index 00000000..73833ce8 --- /dev/null +++ b/duniter4j-client/src/license/THIRD-PARTY.properties @@ -0,0 +1,26 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache 2.0 +# - BSD License +# - CDDL +# - CDDL+GPL +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Common Development and Distribution License (CDDL) v1.0 +# - Dual license consisting of the CDDL v1.1 and GPL v2 +# - GPLv2+CE +# - General Public License (GPL) v3 +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Tue Mar 28 09:33:08 CEST 2017 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dnl.utils--j-text-utils--0.3.3=GNU General Lesser Public License (LGPL) version 3.0 +net.sf.opencsv--opencsv--2.3=GNU General Lesser Public License (LGPL) version 3.0 diff --git a/duniter4j-core-client/src/main/java/org/duniter/core/client/service/bma/BmaTechnicalException.java b/duniter4j-core-client/src/main/java/org/duniter/core/client/service/bma/BmaTechnicalException.java index a08843b9..1b409bc8 100644 --- a/duniter4j-core-client/src/main/java/org/duniter/core/client/service/bma/BmaTechnicalException.java +++ b/duniter4j-core-client/src/main/java/org/duniter/core/client/service/bma/BmaTechnicalException.java @@ -1,5 +1,27 @@ package org.duniter.core.client.service.bma; +/*- + * #%L + * Duniter4j :: Core Client API + * %% + * 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.exception.TechnicalException; /** diff --git a/duniter4j-core-shared/src/main/java/org/duniter/core/beans/BeanCreationException.java b/duniter4j-core-shared/src/main/java/org/duniter/core/beans/BeanCreationException.java index 624ce7e4..a98784ac 100644 --- a/duniter4j-core-shared/src/main/java/org/duniter/core/beans/BeanCreationException.java +++ b/duniter4j-core-shared/src/main/java/org/duniter/core/beans/BeanCreationException.java @@ -1,5 +1,27 @@ package org.duniter.core.beans; +/*- + * #%L + * Duniter4j :: Core Shared + * %% + * 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.exception.TechnicalException; /** diff --git a/duniter4j-core-shared/src/main/java/org/duniter/core/model/SmtpConfig.java b/duniter4j-core-shared/src/main/java/org/duniter/core/model/SmtpConfig.java index 8b701560..0019dbeb 100644 --- a/duniter4j-core-shared/src/main/java/org/duniter/core/model/SmtpConfig.java +++ b/duniter4j-core-shared/src/main/java/org/duniter/core/model/SmtpConfig.java @@ -1,5 +1,27 @@ package org.duniter.core.model; +/*- + * #%L + * Duniter4j :: Core Shared + * %% + * 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% + */ + public class SmtpConfig { @@ -75,4 +97,4 @@ public class SmtpConfig { public void setStartTLS(boolean startTLS) { this.startTLS = startTLS; } -} \ No newline at end of file +} diff --git a/duniter4j-core-shared/src/main/java/org/duniter/core/util/protocols/classpath/Handler.java b/duniter4j-core-shared/src/main/java/org/duniter/core/util/protocols/classpath/Handler.java index a0c08c28..63e05467 100644 --- a/duniter4j-core-shared/src/main/java/org/duniter/core/util/protocols/classpath/Handler.java +++ b/duniter4j-core-shared/src/main/java/org/duniter/core/util/protocols/classpath/Handler.java @@ -1,5 +1,27 @@ package org.duniter.core.util.protocols.classpath; +/*- + * #%L + * Duniter4j :: Core Shared + * %% + * 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.exception.TechnicalException; import java.io.FileNotFoundException; @@ -29,4 +51,4 @@ public class Handler extends URLStreamHandler { } return resourceUrl.openConnection(); } -} \ No newline at end of file +} diff --git a/duniter4j-core-shared/src/main/java/org/duniter/core/util/url/URLs.java b/duniter4j-core-shared/src/main/java/org/duniter/core/util/url/URLs.java index 1d4f99b7..105a73f8 100644 --- a/duniter4j-core-shared/src/main/java/org/duniter/core/util/url/URLs.java +++ b/duniter4j-core-shared/src/main/java/org/duniter/core/util/url/URLs.java @@ -1,5 +1,27 @@ package org.duniter.core.util.url; +/*- + * #%L + * Duniter4j :: Core Shared + * %% + * 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.exception.TechnicalException; import java.net.MalformedURLException; diff --git a/duniter4j-core-shared/src/test/java/org/duniter/core/service/MailServiceTest.java b/duniter4j-core-shared/src/test/java/org/duniter/core/service/MailServiceTest.java index 13dfb4a6..2953815b 100644 --- a/duniter4j-core-shared/src/test/java/org/duniter/core/service/MailServiceTest.java +++ b/duniter4j-core-shared/src/test/java/org/duniter/core/service/MailServiceTest.java @@ -1,5 +1,27 @@ package org.duniter.core.service; +/*- + * #%L + * Duniter4j :: Core Shared + * %% + * 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.model.SmtpConfig; import org.duniter.core.test.TestFixtures; import org.junit.Before; diff --git a/duniter4j-core-shared/src/test/java/org/duniter/core/util/http/InetAddressUtilsTest.java b/duniter4j-core-shared/src/test/java/org/duniter/core/util/http/InetAddressUtilsTest.java index 84db99f2..1bfcdb04 100644 --- a/duniter4j-core-shared/src/test/java/org/duniter/core/util/http/InetAddressUtilsTest.java +++ b/duniter4j-core-shared/src/test/java/org/duniter/core/util/http/InetAddressUtilsTest.java @@ -1,5 +1,27 @@ package org.duniter.core.util.http; +/*- + * #%L + * Duniter4j :: Core Shared + * %% + * 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.junit.Assert; import org.junit.Test; diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/beans/ESBeanFactory.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/beans/ESBeanFactory.java index fa8ed45f..5d369923 100644 --- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/beans/ESBeanFactory.java +++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/beans/ESBeanFactory.java @@ -1,5 +1,27 @@ package org.duniter.elasticsearch.beans; +/*- + * #%L + * Duniter4j :: ElasticSearch Core 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.beans.Bean; import org.duniter.core.beans.BeanCreationException; import org.duniter.core.beans.BeanFactory; diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/client/Duniter4jClient.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/client/Duniter4jClient.java index bb2a7705..85ee832f 100644 --- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/client/Duniter4jClient.java +++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/client/Duniter4jClient.java @@ -1,5 +1,27 @@ package org.duniter.elasticsearch.client; +/*- + * #%L + * Duniter4j :: ElasticSearch Core 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.beans.Bean; import org.duniter.core.client.model.local.LocalEntity; import org.duniter.elasticsearch.dao.handler.StringReaderHandler; diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/BlockDao.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/BlockDao.java index 34d72245..758614f7 100644 --- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/BlockDao.java +++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/BlockDao.java @@ -1,5 +1,27 @@ package org.duniter.elasticsearch.dao; +/*- + * #%L + * Duniter4j :: ElasticSearch Core 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.beans.Bean; import org.duniter.core.client.model.bma.BlockchainBlock; diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/CurrencyExtendDao.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/CurrencyExtendDao.java index d5013361..2659bdeb 100644 --- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/CurrencyExtendDao.java +++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/CurrencyExtendDao.java @@ -1,5 +1,27 @@ package org.duniter.elasticsearch.dao; +/*- + * #%L + * Duniter4j :: ElasticSearch Core 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.dao.CurrencyDao; /** diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/IndexDao.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/IndexDao.java index 5d5bb1c8..1a2b803d 100644 --- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/IndexDao.java +++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/IndexDao.java @@ -1,5 +1,27 @@ package org.duniter.elasticsearch.dao; +/*- + * #%L + * Duniter4j :: ElasticSearch Core 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.elasticsearch.dao.handler.StringReaderHandler; /** diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/IndexTypeDao.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/IndexTypeDao.java index dd4ff061..79244d80 100644 --- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/IndexTypeDao.java +++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/IndexTypeDao.java @@ -1,5 +1,27 @@ package org.duniter.elasticsearch.dao; +/*- + * #%L + * Duniter4j :: ElasticSearch Core 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.elasticsearch.dao.handler.StringReaderHandler; import org.elasticsearch.common.xcontent.XContentBuilder; diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/TypeDao.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/TypeDao.java index d03df4cf..fe3e10af 100644 --- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/TypeDao.java +++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/TypeDao.java @@ -1,5 +1,27 @@ package org.duniter.elasticsearch.dao; +/*- + * #%L + * Duniter4j :: ElasticSearch Core 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.elasticsearch.common.xcontent.XContentBuilder; import java.util.Map; diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/handler/AddSequenceAttributeHandler.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/handler/AddSequenceAttributeHandler.java index 517ce2b4..a2c9824e 100644 --- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/handler/AddSequenceAttributeHandler.java +++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/handler/AddSequenceAttributeHandler.java @@ -1,5 +1,27 @@ package org.duniter.elasticsearch.dao.handler; +/*- + * #%L + * Duniter4j :: ElasticSearch Core 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.regex.Pattern; public class AddSequenceAttributeHandler implements StringReaderHandler { @@ -23,4 +45,4 @@ public class AddSequenceAttributeHandler implements StringReaderHandler { } return line; } - } \ No newline at end of file + } diff --git a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/handler/StringReaderHandler.java b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/handler/StringReaderHandler.java index 46082040..2aea68ed 100644 --- a/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/handler/StringReaderHandler.java +++ b/duniter4j-es-core/src/main/java/org/duniter/elasticsearch/dao/handler/StringReaderHandler.java @@ -1,6 +1,28 @@ package org.duniter.elasticsearch.dao.handler; +/*- + * #%L + * Duniter4j :: ElasticSearch Core 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% + */ + public interface StringReaderHandler { String onReadLine(String line); - } \ No newline at end of file + } diff --git a/duniter4j-es-subscription/src/license/THIRD-PARTY.properties b/duniter4j-es-subscription/src/license/THIRD-PARTY.properties index 8610ec5b..c76cb971 100644 --- a/duniter4j-es-subscription/src/license/THIRD-PARTY.properties +++ b/duniter4j-es-subscription/src/license/THIRD-PARTY.properties @@ -2,19 +2,25 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - ASL, version 2 +# - Apache 2 # - Apache License 2.0 # - Apache License Version 2.0 -# - BSD License +# - Apache License, Version 2.0 +# - BSD +# - BSD licence +# - Bouncy Castle Licence # - CC0 1.0 Universal -# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - CDDL +# - CDDL+GPL +# - Common Development and Distribution License (CDDL) v1.0 +# - Dual license consisting of the CDDL v1.1 and GPL v2 # - Eclipse Public License 1.0 +# - GPLv2+CE # - General Public License (GPL) v3 -# - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - LGPL, version 2.1 # - Lesser General Public License (LGPL) v 3.0 -# - Lesser General Public License (LPGL) -# - Lesser General Public License (LPGL) v 2.1 # - MIT License +# - Mozilla Public License 1.1 (MPL 1.1) # - New BSD License # - Public Domain, per Creative Commons CC0 # - The Apache Software License, Version 2.0 @@ -22,5 +28,7 @@ # Please fill the missing licenses for dependencies : # # -#Tue Jan 05 15:24:57 CET 2016 +#Thu Apr 20 14:23:02 CEST 2017 +com.googlecode.juniversalchardet--juniversalchardet--1.0.3=Mozilla Public License 1.1 (MPL 1.1) commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +org.antlr--antlr-runtime--3.3=BSD licence diff --git a/pom.xml b/pom.xml index 50a26398..d8dcebee 100644 --- a/pom.xml +++ b/pom.xml @@ -86,8 +86,6 @@ <distribution.snapshotRepository.id>eis-nexus-deploy</distribution.snapshotRepository.id> <distribution.snapshotRepository.url>http://nexus.e-is.pro/nexus/content/repositories/duniter4j-snapshots</distribution.snapshotRepository.url> - <github.global.server>github</github.global.server> - <assembly.skip>false</assembly.skip> </properties> @@ -225,7 +223,7 @@ <dependency> <groupId>org.abstractj.kalium</groupId> <artifactId>kalium</artifactId> - <version>0.5.1</version> + <version>${kalium.version}</version> </dependency> <!-- scrypt lib --> <dependency> @@ -317,7 +315,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>license-maven-plugin</artifactId> - <version>1.12</version> + <version>1.9</version> </plugin> <plugin> @@ -418,18 +416,6 @@ <version>2.3</version> </plugin> - <plugin> - <groupId>com.github.github</groupId> - <artifactId>github-maven-core</artifactId> - <version>0.12</version> - </plugin> - - <plugin> - <groupId>com.github.github</groupId> - <artifactId>site-maven-plugin</artifactId> - <version>0.12</version> - </plugin> - <plugin> <artifactId>maven-antrun-plugin</artifactId> <version>1.8</version> @@ -754,7 +740,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>versions-maven-plugin</artifactId> - <version>2.1</version> + <version>2.3</version> <reportSets> <reportSet> <reports> -- GitLab