Skip to content

Commit

Permalink
update (regression) versions (#237)
Browse files Browse the repository at this point in the history
- update maven wrapper
- update spring-boot version to 2.7.17
- added regression tests on JDK 21
- added regression tests for spring boot 3.1
- updated elasticsearch and opensearch regression versions
  • Loading branch information
xtermi2 authored Nov 13, 2023
1 parent 4a282c6 commit 3a60122
Show file tree
Hide file tree
Showing 19 changed files with 499 additions and 168 deletions.
41 changes: 21 additions & 20 deletions .github/workflows/maven-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
build-with-jdk:
strategy:
matrix:
java: [ 8, 11, 17, 18, 19, 20 ]
java: [ 8, 11, 17, 21 ]
fail-fast: false
runs-on: ubuntu-22.04
steps:
Expand All @@ -40,8 +40,8 @@ jobs:
build-with-es:
strategy:
matrix:
elasticsearchVersion: [ "8.6.2", "8.5.3", "8.4.3", "8.3.3", "8.2.3", "8.1.3", "8.0.1", "7.17.9", "7.16.3", "7.15.2", "7.14.2",
"7.13.4", "7.12.1", "7.11.2", "7.10.2", "7.9.3", "7.8.1", "7.7.1", "7.6.2", "7.5.2" ]
elasticsearchVersion: [ "8.11.1", "8.10.4", "8.9.2", "8.8.2", "8.7.1", "8.6.2", "8.5.3", "8.4.3", "8.3.3", "8.2.3", "8.1.3", "8.0.1",
"7.17.15", "7.5.2" ]
fail-fast: false
runs-on: ubuntu-22.04
steps:
Expand Down Expand Up @@ -77,22 +77,23 @@ jobs:
# - name: Build and test with Maven
# run: .\mvnw.cmd --settings .cicd.settings.xml -e -B -V install

build-with-macos:
runs-on: macos-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Set up JDK 8
uses: actions/setup-java@v3
with:
distribution: zulu
java-version: 8
- name: Install Docker
# docker is not installed by default https://github.com/actions/runner-images/issues/17
uses: docker-practice/actions-setup-docker@master
timeout-minutes: 12
- name: Build and test with Maven
run: $MVN_CMD install
# macos builds are very flaky :/
# build-with-macos:
# runs-on: macos-latest
# steps:
# - name: Checkout
# uses: actions/checkout@v4
# - name: Set up JDK 8
# uses: actions/setup-java@v3
# with:
# distribution: zulu
# java-version: 8
# - name: Install Docker
# # docker is not installed by default https://github.com/actions/runner-images/issues/17
# uses: docker-practice/actions-setup-docker@master
# timeout-minutes: 12
# - name: Build and test with Maven
# run: $MVN_CMD install

release-dry-run:
# this will just build like the real release job, but not do a release (dry run)
Expand Down Expand Up @@ -126,7 +127,7 @@ jobs:

release:
# Release to maven central and create Github release
needs: [ build-with-jdk, build-with-es, build-with-macos ]
needs: [ build-with-jdk, build-with-es ]
if: ${{ github.repository == 'senacor/elasticsearch-evolution' && github.event_name == 'push' && github.ref == 'refs/heads/release' }}
runs-on: ubuntu-22.04
steps:
Expand Down
Binary file modified .mvn/wrapper/maven-wrapper.jar
Binary file not shown.
8 changes: 4 additions & 4 deletions .mvn/wrapper/maven-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.0/apache-maven-3.9.0-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
24 changes: 13 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ Successful executed migration scripts will not be executed again!

## 2 Features

- tested on Java 8, 11, 17, 18, 19 and 20
- runs on Spring-Boot 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7 and 3.0 (and of course without Spring-Boot)
- runs on Elasticsearch version 7.5.x - 8.6.x
- tested on Java 8, 11, 17, and 21
- runs on Spring-Boot 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 3.0 and 3.1 (and of course without Spring-Boot)
- runs on Elasticsearch version 7.5.x - 8.11.x
- runs on Opensearch version 1.x and 2.x
- highly configurable (e.g. location(s) of your migration files, migration files format pattern)
- placeholder substitution in migration scripts
Expand All @@ -31,12 +31,12 @@ Successful executed migration scripts will not be executed again!
- ready to use default configuration
- line comments in migration files

| Compatibility | Spring Boot | Elasticsearch | Opensearch |
|----------------------------------|----------------------------------------|----------------------|------------|
| elasticsearch-evolution >= 0.4.2 | 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 3.0 | 7.5.x - 8.6.x | 1.x - 2.x |
| elasticsearch-evolution >= 0.4.0 | 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7 | 7.5.x - 8.6.x | 1.x - 2.x |
| elasticsearch-evolution 0.3.x | 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7 | 7.5.x - 7.17.x | |
| elasticsearch-evolution 0.2.x | 1.5, 2.0, 2.1, 2.2, 2.3, 2.4 | 7.0.x - 7.4.x, 6.8.x | |
| Compatibility | Spring Boot | Elasticsearch | Opensearch |
|----------------------------------|---------------------------------------------|----------------------|------------|
| elasticsearch-evolution >= 0.4.2 | 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7, 3.0, 3.1 | 7.5.x - 8.11.x | 1.x - 2.x |
| elasticsearch-evolution >= 0.4.0 | 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7 | 7.5.x - 8.6.x | 1.x - 2.x |
| elasticsearch-evolution 0.3.x | 2.1, 2.2, 2.3, 2.4, 2.5, 2.6, 2.7 | 7.5.x - 7.17.x | |
| elasticsearch-evolution 0.2.x | 1.5, 2.0, 2.1, 2.2, 2.3, 2.4 | 7.0.x - 7.4.x, 6.8.x | |

NOTE: When you run on Java 11 and using spring-boot 2.2 or 2.3 and you hit [this issue](https://github.com/ronmamo/reflections/issues/279), you have 2 options:

Expand Down Expand Up @@ -294,10 +294,12 @@ ElasticsearchEvolution.configure()
### v0.4.3-SNAPSHOT

- support out of order migration execution.
- version updates (spring-boot 2.7.10)
- version updates (spring-boot 2.7.17)
- added regression tests against OpenSearch 2.6.0
- drop older Elasticsearch and OpenSearch versions in regression tests. Only test against the last 3 minor versions of the latest major release.
- added regression tests on JDK 20
- added regression tests on JDK 21
- added regression tests for spring boot 3.1
- update org.reflections:reflections from 0.9.12 to 0.10.2 [#233](https://github.com/senacor/elasticsearch-evolution/pull/233) thanks @RiVogel

### v0.4.2

Expand Down
6 changes: 6 additions & 0 deletions elasticsearch-evolution-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,12 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<!-- support JDK 21 -->
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,15 @@ 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<SearchContainer> SUPPORTED_SEARCH_VERSIONS = Collections.unmodifiableSortedSet(new TreeSet<>(Arrays.asList(
ofOpensearch("2.6.0"),
ofOpensearch("2.5.0"),
ofOpensearch("2.4.1"),
ofOpensearch("1.3.9"),

ofElasticsearch("8.6.2"),
ofElasticsearch("8.5.3"),
ofElasticsearch("8.4.3"),
ofElasticsearch("7.17.9")
ofOpensearch("2.11.0"),
ofOpensearch("2.10.0"),
ofOpensearch("2.9.0"),
ofOpensearch("1.3.12"),

ofElasticsearch("8.11.1"),
ofElasticsearch("8.10.4"),
ofElasticsearch("8.9.1"),
ofElasticsearch("7.17.15")
)));

@Override
Expand Down
Loading

0 comments on commit 3a60122

Please sign in to comment.