Merge branch 'master' into dependabot/maven/org.apache.maven.plugins-…

…maven-gpg-plugin-3.1.0
senacor · Nov 13, 2023 · f8d7715 · f8d7715
2 parents cfa9354 + dbd59e6
commit f8d7715
Show file tree

Hide file tree

Showing 12 changed files with 37 additions and 33 deletions.
diff --git a/.github/workflows/maven-matrix.yml b/.github/workflows/maven-matrix.yml
@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up JDK ${{ matrix.java }}
         uses: actions/setup-java@v3
         with:
@@ -46,7 +46,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
@@ -65,7 +65,7 @@ jobs:
 #    runs-on: windows-latest
 #    steps:
 #      - name: Checkout
-#        uses: actions/checkout@v3
+#        uses: actions/checkout@v4
 #      - name: Set up JDK 8
 #        uses: actions/setup-java@v3
 #        with:
@@ -81,7 +81,7 @@ jobs:
     runs-on: macos-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up JDK 8
         uses: actions/setup-java@v3
         with:
@@ -100,9 +100,9 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Import GPG key to sign maven build artifacts
-        uses: crazy-max/ghaction-import-gpg@v5
+        uses: crazy-max/ghaction-import-gpg@v6
         with:
           gpg_private_key: ${{ secrets.GPG_SECRET_KEYS }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}
@@ -131,9 +131,9 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Import GPG key to sign maven build artifacts
-        uses: crazy-max/ghaction-import-gpg@v5
+        uses: crazy-max/ghaction-import-gpg@v6
         with:
           gpg_private_key: ${{ secrets.GPG_SECRET_KEYS }}
           passphrase: ${{ secrets.GPG_PASSPHRASE }}

diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml
@@ -23,7 +23,7 @@ jobs:
       COVERALLS_REPO_TOKEN_EXISTS: ${{ secrets.COVERALLS_REPO_TOKEN != '' }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up JDK 8
         # build with JDK 8 because of issue https://github.com/trautonen/coveralls-maven-plugin/issues/112
         uses: actions/setup-java@v3

diff --git a/...acor/elasticsearch/evolution/core/internal/migration/input/MigrationScriptReaderImpl.java b/...acor/elasticsearch/evolution/core/internal/migration/input/MigrationScriptReaderImpl.java
@@ -3,8 +3,9 @@
 import com.senacor.elasticsearch.evolution.core.api.MigrationException;
 import com.senacor.elasticsearch.evolution.core.api.migration.MigrationScriptReader;
 import com.senacor.elasticsearch.evolution.core.internal.model.migration.RawMigrationScript;
+import java.util.regex.Pattern;
 import org.reflections.Reflections;
-import org.reflections.scanners.ResourcesScanner;
+import org.reflections.scanners.Scanners;
 import org.reflections.util.ClasspathHelper;
 import org.reflections.util.ConfigurationBuilder;
 import org.reflections.util.FilterBuilder;
@@ -147,10 +148,13 @@ private Stream<RawMigrationScript> readScriptsFromClassPath(String location) {
             resources = emptySet();
         } else {
             Reflections reflections = new Reflections(new ConfigurationBuilder()
-                    .setScanners(new ResourcesScanner())
+                    .setScanners(Scanners.Resources)
                     .filterInputsBy(new FilterBuilder().includePackage(locationWithoutPrefixAsPackageNotation))
                     .setUrls(urls));
-            resources = reflections.getResources(this::isValidFilename);
+            resources = reflections.getResources(Pattern.compile(esMigrationPrefix + ".*"))
+                    .stream()
+                    .filter(path -> isValidFilename(Paths.get(path).getFileName().toString()))
+                    .collect(Collectors.toSet());
         }
 
         return resources.stream().flatMap(resource -> {

diff --git a/pom.xml b/pom.xml
@@ -95,16 +95,16 @@
         <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
         <jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
         <maven-gpg-plugin.version>3.1.0</maven-gpg-plugin.version>
-        <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
+        <maven-javadoc-plugin.version>3.6.2</maven-javadoc-plugin.version>
         <nexus-staging-maven-plugin.version>1.6.13</nexus-staging-maven-plugin.version>
 
         <!-- Dependency Versions -->
-        <commons-io.version>2.11.0</commons-io.version>
+        <commons-io.version>2.15.0</commons-io.version>
         <!--when updating elasticsearch versions, also update "ElasticsearchContainer" version in EmbeddedElasticsearchExtension-->
         <elasticsearch.version>7.5.2</elasticsearch.version>
-        <reflections.version>0.9.12</reflections.version>
-        <testcontainers.elasticsearch.version>1.18.0</testcontainers.elasticsearch.version>
-        <lombok.version>1.18.26</lombok.version>
+        <reflections.version>0.10.2</reflections.version>
+        <testcontainers.elasticsearch.version>1.19.1</testcontainers.elasticsearch.version>
+        <lombok.version>1.18.30</lombok.version>
     </properties>
 
     <dependencyManagement>

diff --git a/tests/test-spring-boot-2.1-scriptsInJarFile/pom.xml b/tests/test-spring-boot-2.1-scriptsInJarFile/pom.xml
@@ -16,9 +16,9 @@
     <properties>
         <java.version>1.8</java.version>
 
-        <commons-io.version>2.11.0</commons-io.version>
+        <commons-io.version>2.15.0</commons-io.version>
         <elasticsearch.version>7.5.2</elasticsearch.version>
-        <testcontainers.elasticsearch.version>1.18.0</testcontainers.elasticsearch.version>
+        <testcontainers.elasticsearch.version>1.19.1</testcontainers.elasticsearch.version>
     </properties>
 
     <dependencies>

diff --git a/tests/test-spring-boot-2.2/pom.xml b/tests/test-spring-boot-2.2/pom.xml
@@ -16,9 +16,9 @@
 	<properties>
 		<java.version>1.8</java.version>
 
-		<commons-io.version>2.11.0</commons-io.version>
+		<commons-io.version>2.15.0</commons-io.version>
 		<elasticsearch.version>7.5.2</elasticsearch.version>
-		<testcontainers.elasticsearch.version>1.18.0</testcontainers.elasticsearch.version>
+		<testcontainers.elasticsearch.version>1.19.1</testcontainers.elasticsearch.version>
 	</properties>
 
 	<dependencies>

diff --git a/tests/test-spring-boot-2.3/pom.xml b/tests/test-spring-boot-2.3/pom.xml
@@ -16,9 +16,9 @@
 	<properties>
 		<java.version>1.8</java.version>
 
-		<commons-io.version>2.11.0</commons-io.version>
+		<commons-io.version>2.15.0</commons-io.version>
 		<elasticsearch.version>7.5.2</elasticsearch.version>
-		<testcontainers.elasticsearch.version>1.18.0</testcontainers.elasticsearch.version>
+		<testcontainers.elasticsearch.version>1.19.1</testcontainers.elasticsearch.version>
 	</properties>
 
 	<dependencies>

diff --git a/tests/test-spring-boot-2.4/pom.xml b/tests/test-spring-boot-2.4/pom.xml
@@ -16,9 +16,9 @@
 	<properties>
 		<java.version>1.8</java.version>
 
-		<commons-io.version>2.11.0</commons-io.version>
+		<commons-io.version>2.15.0</commons-io.version>
 		<elasticsearch.version>7.5.2</elasticsearch.version>
-		<testcontainers.elasticsearch.version>1.18.0</testcontainers.elasticsearch.version>
+		<testcontainers.elasticsearch.version>1.19.1</testcontainers.elasticsearch.version>
 	</properties>
 
 	<dependencies>

diff --git a/tests/test-spring-boot-2.5-scriptsInJarFile/pom.xml b/tests/test-spring-boot-2.5-scriptsInJarFile/pom.xml
@@ -16,9 +16,9 @@
     <properties>
         <java.version>1.8</java.version>
 
-        <commons-io.version>2.11.0</commons-io.version>
+        <commons-io.version>2.15.0</commons-io.version>
         <elasticsearch.version>7.5.2</elasticsearch.version>
-        <testcontainers.elasticsearch.version>1.18.0</testcontainers.elasticsearch.version>
+        <testcontainers.elasticsearch.version>1.19.1</testcontainers.elasticsearch.version>
     </properties>
 
     <dependencies>

diff --git a/tests/test-spring-boot-2.6/pom.xml b/tests/test-spring-boot-2.6/pom.xml
@@ -16,9 +16,9 @@
 	<properties>
 		<java.version>1.8</java.version>
 
-		<commons-io.version>2.11.0</commons-io.version>
+		<commons-io.version>2.15.0</commons-io.version>
 		<elasticsearch.version>7.5.2</elasticsearch.version>
-		<testcontainers.elasticsearch.version>1.18.0</testcontainers.elasticsearch.version>
+		<testcontainers.elasticsearch.version>1.19.1</testcontainers.elasticsearch.version>
 	</properties>
 
 	<dependencies>

diff --git a/tests/test-spring-boot-2.7/pom.xml b/tests/test-spring-boot-2.7/pom.xml
@@ -16,9 +16,9 @@
 	<properties>
 		<java.version>1.8</java.version>
 
-		<commons-io.version>2.11.0</commons-io.version>
+		<commons-io.version>2.15.0</commons-io.version>
 		<elasticsearch.version>7.5.2</elasticsearch.version>
-		<testcontainers.elasticsearch.version>1.18.0</testcontainers.elasticsearch.version>
+		<testcontainers.elasticsearch.version>1.19.1</testcontainers.elasticsearch.version>
 	</properties>
 
 	<dependencies>

diff --git a/tests/test-spring-boot-3.0-scriptsInJarFile/pom.xml b/tests/test-spring-boot-3.0-scriptsInJarFile/pom.xml
@@ -16,9 +16,9 @@
     <properties>
         <java.version>17</java.version>
 
-        <commons-io.version>2.11.0</commons-io.version>
+        <commons-io.version>2.15.0</commons-io.version>
         <elasticsearch.version>7.5.2</elasticsearch.version>
-        <testcontainers.elasticsearch.version>1.18.0</testcontainers.elasticsearch.version>
+        <testcontainers.elasticsearch.version>1.19.1</testcontainers.elasticsearch.version>
     </properties>
 
     <dependencies>