Update for SeedStack 20.7

Nheverest · Nheverest · commit 844fe70838bc · 2020-10-12T14:07:52.000+02:00
License management
travis: openjdk11
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ sudo: true
 
 language: java
 
-jdk: oraclejdk8
+jdk: openjdk11
 
 cache:
   directories:
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Version 3.1.0 (2020-10-01)
+
+* [chg] Update for SeedStack 20.7
+
 # Version 3.0.0 (2017-01-13)
 
 * [brk] Update to new configuration system.
diff --git a/pom.xml b/pom.xml
@@ -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
@@ -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>
@@ -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>
@@ -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>
@@ -80,6 +81,12 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>${hibernate-validator.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>org.skyscreamer</groupId>
             <artifactId>jsonassert</artifactId>
@@ -88,10 +95,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>
diff --git a/src/main/java/org/seedstack/elasticsearch/ElasticSearchConfig.java b/src/main/java/org/seedstack/elasticsearch/ElasticSearchConfig.java
@@ -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
diff --git a/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchClientProxy.java b/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchClientProxy.java
@@ -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
diff --git a/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchErrorCode.java b/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchErrorCode.java
@@ -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
diff --git a/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchModule.java b/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchModule.java
@@ -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
diff --git a/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchPlugin.java b/src/main/java/org/seedstack/elasticsearch/internal/ElasticSearchPlugin.java
@@ -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
diff --git a/src/main/resources/org/seedstack/elasticsearch/ElasticSearchConfig.properties b/src/main/resources/org/seedstack/elasticsearch/ElasticSearchConfig.properties
@@ -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
diff --git a/src/main/resources/org/seedstack/elasticsearch/internal/ElasticSearchErrorCode.properties b/src/main/resources/org/seedstack/elasticsearch/internal/ElasticSearchErrorCode.properties
@@ -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
diff --git a/src/test/java/org/seedstack/elasticsearch/ElasticSearchIT.java b/src/test/java/org/seedstack/elasticsearch/ElasticSearchIT.java
@@ -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
@@ -14,8 +14,9 @@
 import org.elasticsearch.common.xcontent.XContentBuilder;
 import org.json.JSONException;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.seedstack.seed.SeedException;
-import org.seedstack.seed.it.AbstractSeedIT;
+import org.seedstack.seed.testing.junit4.SeedITRunner;
 import org.skyscreamer.jsonassert.JSONAssert;
 
 import javax.inject.Inject;
@@ -25,7 +26,8 @@
 
 import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
 
-public class ElasticSearchIT extends AbstractSeedIT {
+@RunWith(SeedITRunner.class)
+public class ElasticSearchIT {
     @Inject
     @Named("client1")
     Client remoteClient;
diff --git a/src/test/resources/application.yaml b/src/test/resources/application.yaml
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`		`-/**`
`2`		`- * Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>`
	`1`	`+/*`
	`2`	`+ * Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>`
`3`	`3`	`*`
`4`	`4`	`* This Source Code Form is subject to the terms of the Mozilla Public`
`5`	`5`	`* License, v. 2.0. If a copy of the MPL was not distributed with this`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# Copyright (c) 2013-2016, The SeedStack authors <http://seedstack.org>`
	`2`	`+# Copyright © 2013-2020, The SeedStack authors <http://seedstack.org>`
`3`	`3`	`#`
`4`	`4`	`# This Source Code Form is subject to the terms of the Mozilla Public`
`5`	`5`	`# License, v. 2.0. If a copy of the MPL was not distributed with this`