From 65c3e9b170e62077f684dd95a2183ae68f99d940 Mon Sep 17 00:00:00 2001 From: Andreas Keefer Date: Thu, 11 Mar 2021 17:12:00 +0100 Subject: [PATCH 01/11] prepare 0.3.2-SNAPSHOT release --- README.md | 6 +++++- elasticsearch-evolution-core/pom.xml | 2 +- pom.xml | 2 +- spring-boot-starter-elasticsearch-evolution/pom.xml | 2 +- tests/migration-scripts/pom.xml | 2 +- tests/pom.xml | 2 +- tests/test-spring-boot-2.1-scriptsInJarFile/pom.xml | 2 +- tests/test-spring-boot-2.2/pom.xml | 2 +- tests/test-spring-boot-2.3/pom.xml | 2 +- tests/test-spring-boot-2.4/pom.xml | 2 +- 10 files changed, 14 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 1beb883b..d69b17c0 100644 --- a/README.md +++ b/README.md @@ -277,7 +277,11 @@ ElasticsearchEvolution.configure() ## 6 changelog -### v0.3.1-SNAPSHOT +### v0.3.2-SNAPSHOT + +- ... + +### v0.3.1 - fixed issue [#29](https://github.com/senacor/elasticsearch-evolution/issues/29) - fixed issue [#27](https://github.com/senacor/elasticsearch-evolution/issues/27) diff --git a/elasticsearch-evolution-core/pom.xml b/elasticsearch-evolution-core/pom.xml index 7fc359d2..689db4e2 100644 --- a/elasticsearch-evolution-core/pom.xml +++ b/elasticsearch-evolution-core/pom.xml @@ -6,7 +6,7 @@ com.senacor.elasticsearch.evolution elasticsearch-evolution-parent - 0.3.1 + 0.3.2-SNAPSHOT ../ elasticsearch-evolution-core diff --git a/pom.xml b/pom.xml index 0871a85d..a7e1f03c 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.senacor.elasticsearch.evolution elasticsearch-evolution-parent - 0.3.1 + 0.3.2-SNAPSHOT pom org.springframework.boot diff --git a/spring-boot-starter-elasticsearch-evolution/pom.xml b/spring-boot-starter-elasticsearch-evolution/pom.xml index ae1188d7..89755b88 100644 --- a/spring-boot-starter-elasticsearch-evolution/pom.xml +++ b/spring-boot-starter-elasticsearch-evolution/pom.xml @@ -6,7 +6,7 @@ com.senacor.elasticsearch.evolution elasticsearch-evolution-parent - 0.3.1 + 0.3.2-SNAPSHOT ../ spring-boot-starter-elasticsearch-evolution diff --git a/tests/migration-scripts/pom.xml b/tests/migration-scripts/pom.xml index 8e76637c..b2b0726f 100644 --- a/tests/migration-scripts/pom.xml +++ b/tests/migration-scripts/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.senacor.elasticsearch.evolution migration-scripts - 0.3.1 + 0.3.2-SNAPSHOT jar containing migration files jar diff --git a/tests/pom.xml b/tests/pom.xml index 1462e984..ea29f610 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ com.senacor.elasticsearch.evolution elasticsearch-evolution-parent - 0.3.1 + 0.3.2-SNAPSHOT ../ tests diff --git a/tests/test-spring-boot-2.1-scriptsInJarFile/pom.xml b/tests/test-spring-boot-2.1-scriptsInJarFile/pom.xml index 7d0aa9d9..c58a3aa6 100644 --- a/tests/test-spring-boot-2.1-scriptsInJarFile/pom.xml +++ b/tests/test-spring-boot-2.1-scriptsInJarFile/pom.xml @@ -10,7 +10,7 @@ com.senacor.elasticsearch.evolution test-spring-boot-2.1-scriptsInJarFile - 0.3.1 + 0.3.2-SNAPSHOT Demo project for Spring Boot diff --git a/tests/test-spring-boot-2.2/pom.xml b/tests/test-spring-boot-2.2/pom.xml index a5279396..a0497222 100644 --- a/tests/test-spring-boot-2.2/pom.xml +++ b/tests/test-spring-boot-2.2/pom.xml @@ -10,7 +10,7 @@ com.senacor.elasticsearch.evolution test-spring-boot-2.2 - 0.3.1 + 0.3.2-SNAPSHOT Demo project for Spring Boot diff --git a/tests/test-spring-boot-2.3/pom.xml b/tests/test-spring-boot-2.3/pom.xml index 4a0a9bd2..0f3a704d 100644 --- a/tests/test-spring-boot-2.3/pom.xml +++ b/tests/test-spring-boot-2.3/pom.xml @@ -10,7 +10,7 @@ com.senacor.elasticsearch.evolution test-spring-boot-2.3 - 0.3.1 + 0.3.2-SNAPSHOT Demo project for Spring Boot diff --git a/tests/test-spring-boot-2.4/pom.xml b/tests/test-spring-boot-2.4/pom.xml index 06128c28..5b8fe3fd 100644 --- a/tests/test-spring-boot-2.4/pom.xml +++ b/tests/test-spring-boot-2.4/pom.xml @@ -10,7 +10,7 @@ com.senacor.elasticsearch.evolution test-spring-boot-2.4 - 0.3.1 + 0.3.2-SNAPSHOT Demo project for Spring Boot From b09f63cb842d6b8724cb7192ab608133b2c3829a Mon Sep 17 00:00:00 2001 From: Andreas Keefer Date: Thu, 11 Mar 2021 17:14:15 +0100 Subject: [PATCH 02/11] update docu --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d69b17c0..afad406a 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ First add the latest version of Elasticsearch-Evolution spring boot starter as a com.senacor.elasticsearch.evolution spring-boot-starter-elasticsearch-evolution - 0.3.0 + 0.3.1 ``` @@ -75,7 +75,7 @@ First add the latest version of Elasticsearch-Evolution core as a dependency: com.senacor.elasticsearch.evolution elasticsearch-evolution-core - 0.3.0 + 0.3.1 ``` From e52101862348ca7705456f086bce7baf783c5f8d Mon Sep 17 00:00:00 2001 From: Andreas Keefer Date: Thu, 11 Mar 2021 17:17:51 +0100 Subject: [PATCH 03/11] updated copyright year in license --- LICENSE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index b5766c03..af387c80 100644 --- a/LICENSE +++ b/LICENSE @@ -186,7 +186,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright [yyyy] [name of copyright owner] + Copyright 2021 Andreas Keefer Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -202,7 +202,7 @@ ---------- -Copyright (c) 2019 Andreas Keefer +Copyright (c) 2021 Andreas Keefer "Anti 996" License Version 1.0 (Draft) From 861daf89f2a93a8e1d768aa355a83dde2fce8c86 Mon Sep 17 00:00:00 2001 From: Andreas Keefer Date: Thu, 11 Mar 2021 17:30:21 +0100 Subject: [PATCH 04/11] updated developer and license in pom.xml --- pom.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a7e1f03c..c83c393f 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,11 @@ http://www.apache.org/licenses/LICENSE-2.0.txt repo + + Anti 996 License, Version 1.0 (Draft) + https://github.com/996icu/996.ICU/blob/master/LICENSE/ + repo + @@ -51,8 +56,8 @@ Andreas Keefer - andreas.keefer@senacor.com - https://senacor.com/ + andreas.keefer@proxora.com + https://www.proxora.com/ From 9bbd7b126ddc84103280046e794f4bfc69f9d29e Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 19 Mar 2021 04:50:25 +0000 Subject: [PATCH 05/11] Bump spring-boot-starter-parent from 2.4.3 to 2.4.4 Bumps [spring-boot-starter-parent](https://github.com/spring-projects/spring-boot) from 2.4.3 to 2.4.4. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.4.3...v2.4.4) Signed-off-by: dependabot-preview[bot] --- tests/test-spring-boot-2.1-scriptsInJarFile/pom.xml | 2 +- tests/test-spring-boot-2.2/pom.xml | 2 +- tests/test-spring-boot-2.3/pom.xml | 2 +- tests/test-spring-boot-2.4/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/test-spring-boot-2.1-scriptsInJarFile/pom.xml b/tests/test-spring-boot-2.1-scriptsInJarFile/pom.xml index c58a3aa6..c4b24713 100644 --- a/tests/test-spring-boot-2.1-scriptsInJarFile/pom.xml +++ b/tests/test-spring-boot-2.1-scriptsInJarFile/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.18.RELEASE + 2.4.4 com.senacor.elasticsearch.evolution diff --git a/tests/test-spring-boot-2.2/pom.xml b/tests/test-spring-boot-2.2/pom.xml index a0497222..346e2081 100644 --- a/tests/test-spring-boot-2.2/pom.xml +++ b/tests/test-spring-boot-2.2/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.2.13.RELEASE + 2.4.4 com.senacor.elasticsearch.evolution diff --git a/tests/test-spring-boot-2.3/pom.xml b/tests/test-spring-boot-2.3/pom.xml index 0f3a704d..f65b2126 100644 --- a/tests/test-spring-boot-2.3/pom.xml +++ b/tests/test-spring-boot-2.3/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.9.RELEASE + 2.4.4 com.senacor.elasticsearch.evolution diff --git a/tests/test-spring-boot-2.4/pom.xml b/tests/test-spring-boot-2.4/pom.xml index 5b8fe3fd..8d19d625 100644 --- a/tests/test-spring-boot-2.4/pom.xml +++ b/tests/test-spring-boot-2.4/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.3 + 2.4.4 com.senacor.elasticsearch.evolution From f8936485497c89c639cbbd6bf54afcdaf20fbece Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 19 Mar 2021 04:50:49 +0000 Subject: [PATCH 06/11] Bump spring-boot-dependencies from 2.4.3 to 2.4.4 Bumps [spring-boot-dependencies](https://github.com/spring-projects/spring-boot) from 2.4.3 to 2.4.4. - [Release notes](https://github.com/spring-projects/spring-boot/releases) - [Commits](https://github.com/spring-projects/spring-boot/compare/v2.4.3...v2.4.4) Signed-off-by: dependabot-preview[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c83c393f..ca0bd416 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.springframework.boot spring-boot-dependencies - 2.4.3 + 2.4.4 elasticsearch-evolution From 0c5cbb34f015d7a9dc1fde0120101edbbca1de7f Mon Sep 17 00:00:00 2001 From: Andreas Keefer Date: Sat, 20 Mar 2021 16:42:37 +0100 Subject: [PATCH 07/11] only update spring-boot 2.4 integration test --- tests/test-spring-boot-2.1-scriptsInJarFile/pom.xml | 2 +- tests/test-spring-boot-2.2/pom.xml | 2 +- tests/test-spring-boot-2.3/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test-spring-boot-2.1-scriptsInJarFile/pom.xml b/tests/test-spring-boot-2.1-scriptsInJarFile/pom.xml index c4b24713..c58a3aa6 100644 --- a/tests/test-spring-boot-2.1-scriptsInJarFile/pom.xml +++ b/tests/test-spring-boot-2.1-scriptsInJarFile/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.4 + 2.1.18.RELEASE com.senacor.elasticsearch.evolution diff --git a/tests/test-spring-boot-2.2/pom.xml b/tests/test-spring-boot-2.2/pom.xml index 346e2081..a0497222 100644 --- a/tests/test-spring-boot-2.2/pom.xml +++ b/tests/test-spring-boot-2.2/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.4 + 2.2.13.RELEASE com.senacor.elasticsearch.evolution diff --git a/tests/test-spring-boot-2.3/pom.xml b/tests/test-spring-boot-2.3/pom.xml index f65b2126..0f3a704d 100644 --- a/tests/test-spring-boot-2.3/pom.xml +++ b/tests/test-spring-boot-2.3/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.4 + 2.3.9.RELEASE com.senacor.elasticsearch.evolution From ff4bdaa3a98e92588378bc607e6911632b61348e Mon Sep 17 00:00:00 2001 From: Andreas Keefer Date: Fri, 26 Mar 2021 15:37:34 +0100 Subject: [PATCH 08/11] add tests foe ES 7.12.0 --- .github/workflows/maven-matrix.yml | 2 +- .../evolution/core/test/EmbeddedElasticsearchExtension.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven-matrix.yml b/.github/workflows/maven-matrix.yml index 9c169e67..c8ab33ce 100644 --- a/.github/workflows/maven-matrix.yml +++ b/.github/workflows/maven-matrix.yml @@ -40,7 +40,7 @@ jobs: build-and-test-with-es-version: strategy: matrix: - elasticsearchVersion: [ "7.11.2", "7.10.2", "7.9.3", "7.8.1", + elasticsearchVersion: [ "7.12.0", "7.11.2", "7.10.2", "7.9.3", "7.8.1", "7.7.1", "7.6.2", "7.5.2" ] fail-fast: false runs-on: ubuntu-18.04 diff --git a/elasticsearch-evolution-core/src/test/java/com/senacor/elasticsearch/evolution/core/test/EmbeddedElasticsearchExtension.java b/elasticsearch-evolution-core/src/test/java/com/senacor/elasticsearch/evolution/core/test/EmbeddedElasticsearchExtension.java index 9a0804a0..c51854d0 100644 --- a/elasticsearch-evolution-core/src/test/java/com/senacor/elasticsearch/evolution/core/test/EmbeddedElasticsearchExtension.java +++ b/elasticsearch-evolution-core/src/test/java/com/senacor/elasticsearch/evolution/core/test/EmbeddedElasticsearchExtension.java @@ -35,6 +35,7 @@ public class EmbeddedElasticsearchExtension implements TestInstancePostProcessor private static final Logger logger = LoggerFactory.getLogger(EmbeddedElasticsearchExtension.class); private static final Namespace NAMESPACE = Namespace.create(ExtensionContext.class); private static final SortedSet SUPPORTED_ES_VERSIONS = Collections.unmodifiableSortedSet(new TreeSet<>(Arrays.asList( + "7.12.0", "7.11.2", "7.10.2", "7.9.3", From c5a3a05010fdb46ecc2197974d35bf90619ca6e8 Mon Sep 17 00:00:00 2001 From: Andreas Keefer Date: Fri, 26 Mar 2021 15:54:58 +0100 Subject: [PATCH 09/11] #36 strict scan classpath location --- .../input/MigrationScriptReaderImpl.java | 7 +- .../input/MigrationScriptReaderImplTest.java | 69 +++++++++++++++++++ .../issue36/location/content.http | 1 + .../location_with_suffix/content_sub.http | 1 + 4 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 elasticsearch-evolution-core/src/test/resources/scriptreader/issue36/location/content.http create mode 100644 elasticsearch-evolution-core/src/test/resources/scriptreader/issue36/location_with_suffix/content_sub.http diff --git a/elasticsearch-evolution-core/src/main/java/com/senacor/elasticsearch/evolution/core/internal/migration/input/MigrationScriptReaderImpl.java b/elasticsearch-evolution-core/src/main/java/com/senacor/elasticsearch/evolution/core/internal/migration/input/MigrationScriptReaderImpl.java index 6d1d2841..fd63644f 100644 --- a/elasticsearch-evolution-core/src/main/java/com/senacor/elasticsearch/evolution/core/internal/migration/input/MigrationScriptReaderImpl.java +++ b/elasticsearch-evolution-core/src/main/java/com/senacor/elasticsearch/evolution/core/internal/migration/input/MigrationScriptReaderImpl.java @@ -127,7 +127,12 @@ && isValidFilename(pathToCheck.getFileName().toString())) } private Stream readScriptsFromClassPath(String location) { - String locationWithoutPrefixAsPackageNotation = location.substring(CLASSPATH_PREFIX.length()) + if (!location.endsWith("/")) { + // fixes https://github.com/senacor/elasticsearch-evolution/issues/36 + // otherwise e.g. "...location_some_suffix" will also be found when search for "...location". + location = location + "/"; + } + final String locationWithoutPrefixAsPackageNotation = location.substring(CLASSPATH_PREFIX.length()) .replace("/", "."); final Collection urls = ClasspathHelper.forPackage(locationWithoutPrefixAsPackageNotation); diff --git a/elasticsearch-evolution-core/src/test/java/com/senacor/elasticsearch/evolution/core/internal/migration/input/MigrationScriptReaderImplTest.java b/elasticsearch-evolution-core/src/test/java/com/senacor/elasticsearch/evolution/core/internal/migration/input/MigrationScriptReaderImplTest.java index 3cad5215..6b43367e 100644 --- a/elasticsearch-evolution-core/src/test/java/com/senacor/elasticsearch/evolution/core/internal/migration/input/MigrationScriptReaderImplTest.java +++ b/elasticsearch-evolution-core/src/test/java/com/senacor/elasticsearch/evolution/core/internal/migration/input/MigrationScriptReaderImplTest.java @@ -103,6 +103,39 @@ void handlingDuplicates() { new RawMigrationScript().setFileName("content.other").setContent("content!")); } + @Test + void exclude_locations_with_suffix() { + MigrationScriptReaderImpl reader = new MigrationScriptReaderImpl( + singletonList("classpath:scriptreader/issue36/location"), + StandardCharsets.UTF_8, + "c", + singletonList(".http")); + + List actual = reader.read(); + + // should not contain anything from "classpath:scriptreader/issue36/location_with_suffix" + assertThat(actual) + .containsExactlyInAnyOrder( + new RawMigrationScript().setFileName("content.http").setContent("content!")); + } + + @Test + void handle_locations_with_suffix() { + MigrationScriptReaderImpl reader = new MigrationScriptReaderImpl( + Arrays.asList("classpath:scriptreader/issue36/location", + "classpath:scriptreader/issue36/location_with_suffix"), + StandardCharsets.UTF_8, + "c", + singletonList(".http")); + + List actual = reader.read(); + + assertThat(actual) + .containsExactlyInAnyOrder( + new RawMigrationScript().setFileName("content.http").setContent("content!"), + new RawMigrationScript().setFileName("content_sub.http").setContent("sub content!")); + } + @Test void withWrongProtocol() { MigrationScriptReaderImpl reader = new MigrationScriptReaderImpl( @@ -135,6 +168,42 @@ void normalPath() throws URISyntaxException { new RawMigrationScript().setFileName("content_sub.http").setContent("sub content!")); } + @Test + void exclude_locations_with_suffix() throws URISyntaxException { + URL resourceDirectory = resolveURL("scriptreader"); + String absolutePathToScriptreader = Paths.get(resourceDirectory.toURI()).toFile().getAbsolutePath(); + MigrationScriptReaderImpl reader = new MigrationScriptReaderImpl( + singletonList("file:"+absolutePathToScriptreader+"/issue36/location"), + StandardCharsets.UTF_8, + "c", + singletonList(".http")); + + List actual = reader.read(); + + // should not contain anything from "classpath:scriptreader/issue36/location_with_suffix" + assertThat(actual) + .containsExactlyInAnyOrder( + new RawMigrationScript().setFileName("content.http").setContent("content!")); + } + + @Test + void handle_locations_with_suffix() throws URISyntaxException { + URL resourceDirectory = resolveURL("scriptreader"); + String absolutePathToScriptreader = Paths.get(resourceDirectory.toURI()).toFile().getAbsolutePath(); + MigrationScriptReaderImpl reader = new MigrationScriptReaderImpl( + Arrays.asList("file:"+absolutePathToScriptreader+"/issue36/location", + "file:"+absolutePathToScriptreader+"/issue36/location_with_suffix"), + StandardCharsets.UTF_8, + "c", + singletonList(".http")); + + List actual = reader.read(); + + assertThat(actual) + .containsExactlyInAnyOrder( + new RawMigrationScript().setFileName("content.http").setContent("content!"), + new RawMigrationScript().setFileName("content_sub.http").setContent("sub content!")); + } @Test void invalidPath() { diff --git a/elasticsearch-evolution-core/src/test/resources/scriptreader/issue36/location/content.http b/elasticsearch-evolution-core/src/test/resources/scriptreader/issue36/location/content.http new file mode 100644 index 00000000..ff15cec3 --- /dev/null +++ b/elasticsearch-evolution-core/src/test/resources/scriptreader/issue36/location/content.http @@ -0,0 +1 @@ +content! \ No newline at end of file diff --git a/elasticsearch-evolution-core/src/test/resources/scriptreader/issue36/location_with_suffix/content_sub.http b/elasticsearch-evolution-core/src/test/resources/scriptreader/issue36/location_with_suffix/content_sub.http new file mode 100644 index 00000000..00afaff7 --- /dev/null +++ b/elasticsearch-evolution-core/src/test/resources/scriptreader/issue36/location_with_suffix/content_sub.http @@ -0,0 +1 @@ +sub content! \ No newline at end of file From 1b8f08e5d2a987810bb0d163dbe88e8f6e2f560e Mon Sep 17 00:00:00 2001 From: Andreas Keefer Date: Fri, 26 Mar 2021 16:05:05 +0100 Subject: [PATCH 10/11] build/test/run with java 16 --- .github/workflows/maven-matrix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven-matrix.yml b/.github/workflows/maven-matrix.yml index c8ab33ce..f7562bcf 100644 --- a/.github/workflows/maven-matrix.yml +++ b/.github/workflows/maven-matrix.yml @@ -14,7 +14,7 @@ jobs: build-and-test-with-jdk: strategy: matrix: - java: [ 8, 9, 10, 11, 12, 13, 14, 15 ] + java: [ 8, 9, 10, 11, 12, 13, 14, 15, 16 ] fail-fast: false runs-on: ubuntu-18.04 steps: From 25caa522a5e8817c0ce4cbae3e417be12b545684 Mon Sep 17 00:00:00 2001 From: Andreas Keefer Date: Fri, 26 Mar 2021 16:22:01 +0100 Subject: [PATCH 11/11] prepare 0.3.2 release --- README.md | 14 ++++++++++---- elasticsearch-evolution-core/pom.xml | 2 +- pom.xml | 2 +- .../pom.xml | 2 +- tests/migration-scripts/pom.xml | 2 +- tests/pom.xml | 2 +- .../test-spring-boot-2.1-scriptsInJarFile/pom.xml | 2 +- tests/test-spring-boot-2.2/pom.xml | 2 +- tests/test-spring-boot-2.3/pom.xml | 2 +- tests/test-spring-boot-2.4/pom.xml | 2 +- 10 files changed, 19 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index afad406a..b4a48f67 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Successful executed migration scripts will not be executed again! ## 2 Features -- tested on Java 8, 9, 10, 11, 12, 13, 14 and 15 +- tested on Java 8, 9, 10, 11, 12, 13, 14, 15 and 16 - runs on Spring-Boot 2.1, 2.2, 2.3 and 2.4 (and of course without Spring-Boot) - runs on Elasticsearch version 7.5.0+ - highly configurable (e.g. location(s) of your migration files, migration files format pattern) @@ -51,7 +51,7 @@ First add the latest version of Elasticsearch-Evolution spring boot starter as a com.senacor.elasticsearch.evolution spring-boot-starter-elasticsearch-evolution - 0.3.1 + 0.3.2 ``` @@ -75,7 +75,7 @@ First add the latest version of Elasticsearch-Evolution core as a dependency: com.senacor.elasticsearch.evolution elasticsearch-evolution-core - 0.3.1 + 0.3.2 ``` @@ -277,10 +277,16 @@ ElasticsearchEvolution.configure() ## 6 changelog -### v0.3.2-SNAPSHOT +### v0.3.3-SNAPSHOT - ... +### v0.3.2 + +- fixed issue [#36](https://github.com/senacor/elasticsearch-evolution/issues/36) +- added java 16 compatibility tests +- added Elasticsearch 7.12 compatibility tests + ### v0.3.1 - fixed issue [#29](https://github.com/senacor/elasticsearch-evolution/issues/29) diff --git a/elasticsearch-evolution-core/pom.xml b/elasticsearch-evolution-core/pom.xml index 689db4e2..d4d203e1 100644 --- a/elasticsearch-evolution-core/pom.xml +++ b/elasticsearch-evolution-core/pom.xml @@ -6,7 +6,7 @@ com.senacor.elasticsearch.evolution elasticsearch-evolution-parent - 0.3.2-SNAPSHOT + 0.3.2 ../ elasticsearch-evolution-core diff --git a/pom.xml b/pom.xml index ca0bd416..0d481d11 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.senacor.elasticsearch.evolution elasticsearch-evolution-parent - 0.3.2-SNAPSHOT + 0.3.2 pom org.springframework.boot diff --git a/spring-boot-starter-elasticsearch-evolution/pom.xml b/spring-boot-starter-elasticsearch-evolution/pom.xml index 89755b88..34817f3b 100644 --- a/spring-boot-starter-elasticsearch-evolution/pom.xml +++ b/spring-boot-starter-elasticsearch-evolution/pom.xml @@ -6,7 +6,7 @@ com.senacor.elasticsearch.evolution elasticsearch-evolution-parent - 0.3.2-SNAPSHOT + 0.3.2 ../ spring-boot-starter-elasticsearch-evolution diff --git a/tests/migration-scripts/pom.xml b/tests/migration-scripts/pom.xml index b2b0726f..4dbf35d4 100644 --- a/tests/migration-scripts/pom.xml +++ b/tests/migration-scripts/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.senacor.elasticsearch.evolution migration-scripts - 0.3.2-SNAPSHOT + 0.3.2 jar containing migration files jar diff --git a/tests/pom.xml b/tests/pom.xml index ea29f610..faa7adf6 100644 --- a/tests/pom.xml +++ b/tests/pom.xml @@ -6,7 +6,7 @@ com.senacor.elasticsearch.evolution elasticsearch-evolution-parent - 0.3.2-SNAPSHOT + 0.3.2 ../ tests diff --git a/tests/test-spring-boot-2.1-scriptsInJarFile/pom.xml b/tests/test-spring-boot-2.1-scriptsInJarFile/pom.xml index c58a3aa6..02718e86 100644 --- a/tests/test-spring-boot-2.1-scriptsInJarFile/pom.xml +++ b/tests/test-spring-boot-2.1-scriptsInJarFile/pom.xml @@ -10,7 +10,7 @@ com.senacor.elasticsearch.evolution test-spring-boot-2.1-scriptsInJarFile - 0.3.2-SNAPSHOT + 0.3.2 Demo project for Spring Boot diff --git a/tests/test-spring-boot-2.2/pom.xml b/tests/test-spring-boot-2.2/pom.xml index a0497222..931d6841 100644 --- a/tests/test-spring-boot-2.2/pom.xml +++ b/tests/test-spring-boot-2.2/pom.xml @@ -10,7 +10,7 @@ com.senacor.elasticsearch.evolution test-spring-boot-2.2 - 0.3.2-SNAPSHOT + 0.3.2 Demo project for Spring Boot diff --git a/tests/test-spring-boot-2.3/pom.xml b/tests/test-spring-boot-2.3/pom.xml index 0f3a704d..efbd24e9 100644 --- a/tests/test-spring-boot-2.3/pom.xml +++ b/tests/test-spring-boot-2.3/pom.xml @@ -10,7 +10,7 @@ com.senacor.elasticsearch.evolution test-spring-boot-2.3 - 0.3.2-SNAPSHOT + 0.3.2 Demo project for Spring Boot diff --git a/tests/test-spring-boot-2.4/pom.xml b/tests/test-spring-boot-2.4/pom.xml index 8d19d625..5e5f46e7 100644 --- a/tests/test-spring-boot-2.4/pom.xml +++ b/tests/test-spring-boot-2.4/pom.xml @@ -10,7 +10,7 @@ com.senacor.elasticsearch.evolution test-spring-boot-2.4 - 0.3.2-SNAPSHOT + 0.3.2 Demo project for Spring Boot