This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-indexer.git
The following commit(s) were added to refs/heads/master by this push:
new 0ac6a0e [MINDEXER-251] Parent 44 (#423)
0ac6a0e is described below
commit 0ac6a0e9882191d372c85b6ab2b21678e51b59f7
Author: Tamas Cservenak <[email protected]>
AuthorDate: Thu May 29 14:39:09 2025 +0200
[MINDEXER-251] Parent 44 (#423)
And perform some cleanup. Also, there should be a followup
as new modernizer cryes over indexer-core and indexer-cli
codebase.
---
https://issues.apache.org/jira/browse/MINDEXER-251
---
.github/dependabot.yml | 6 ++----
.github/workflows/maven-verify.yml | 4 ++--
indexer-cli/pom.xml | 9 +++++++++
indexer-core/pom.xml | 9 +++++++++
indexer-examples/indexer-examples-basic/pom.xml | 1 +
.../maven/index/examples/BasicUsageExample.java | 10 +++++-----
indexer-examples/indexer-examples-spring/pom.xml | 1 +
pom.xml | 20 +++++++++++++++-----
search-backend-indexer/pom.xml | 1 +
9 files changed, 45 insertions(+), 16 deletions(-)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 95c2b1a..e2a9cba 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -17,12 +17,10 @@
version: 2
updates:
-- package-ecosystem: maven
+- package-ecosystem: "maven"
directory: "/"
schedule:
- interval: daily
- time: '04:00'
- open-pull-requests-limit: 10
+ interval: "daily"
- package-ecosystem: "github-actions"
directory: "/"
diff --git a/.github/workflows/maven-verify.yml
b/.github/workflows/maven-verify.yml
index a8cc6f8..9a29a3f 100644
--- a/.github/workflows/maven-verify.yml
+++ b/.github/workflows/maven-verify.yml
@@ -27,7 +27,7 @@ jobs:
uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v4
with:
ff-run: false
- jdk-matrix: '[ "21" ]'
- maven-matrix: '[ "3.9.8" ]'
+ jdk-matrix: '[ "17", "21" ]'
+ maven-matrix: '[ "3.9.9" ]'
diff --git a/indexer-cli/pom.xml b/indexer-cli/pom.xml
index bd3ca01..c3655c1 100644
--- a/indexer-cli/pom.xml
+++ b/indexer-cli/pom.xml
@@ -54,6 +54,7 @@ under the License.
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
+ <classifier>classes</classifier>
</dependency>
<dependency>
@@ -95,6 +96,14 @@ under the License.
<build>
<plugins>
+ <plugin>
+ <groupId>org.gaul</groupId>
+ <artifactId>modernizer-maven-plugin</artifactId>
+ <configuration>
+ <!-- TODO: https://issues.apache.org/jira/browse/MINDEXER-252 -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
diff --git a/indexer-core/pom.xml b/indexer-core/pom.xml
index 0a9d435..330028b 100644
--- a/indexer-core/pom.xml
+++ b/indexer-core/pom.xml
@@ -53,6 +53,7 @@ under the License.
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
+ <classifier>classes</classifier>
<scope>provided</scope>
</dependency>
@@ -139,6 +140,14 @@ under the License.
<build>
<plugins>
+ <plugin>
+ <groupId>org.gaul</groupId>
+ <artifactId>modernizer-maven-plugin</artifactId>
+ <configuration>
+ <!-- TODO: https://issues.apache.org/jira/browse/MINDEXER-252 -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
diff --git a/indexer-examples/indexer-examples-basic/pom.xml
b/indexer-examples/indexer-examples-basic/pom.xml
index b0bb90f..c1effd7 100644
--- a/indexer-examples/indexer-examples-basic/pom.xml
+++ b/indexer-examples/indexer-examples-basic/pom.xml
@@ -61,6 +61,7 @@ under the License.
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
+ <classifier>classes</classifier>
</dependency>
<!-- Test -->
diff --git
a/indexer-examples/indexer-examples-basic/src/main/java/org/apache/maven/index/examples/BasicUsageExample.java
b/indexer-examples/indexer-examples-basic/src/main/java/org/apache/maven/index/examples/BasicUsageExample.java
index eb5f437..c611c02 100644
---
a/indexer-examples/indexer-examples-basic/src/main/java/org/apache/maven/index/examples/BasicUsageExample.java
+++
b/indexer-examples/indexer-examples-basic/src/main/java/org/apache/maven/index/examples/BasicUsageExample.java
@@ -22,7 +22,6 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
-import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
@@ -31,6 +30,7 @@ import java.net.URI;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
+import java.nio.file.Path;
import java.time.Duration;
import java.time.Instant;
import java.util.ArrayList;
@@ -101,8 +101,8 @@ public class BasicUsageExample {
public void perform() throws IOException,
InvalidVersionSpecificationException {
// Files where local cache is (if any) and Lucene Index should be
located
- File centralLocalCache = new File("target/central-cache");
- File centralIndexDir = new File("target/central-index");
+ Path centralLocalCache = Path.of("target/central-cache");
+ Path centralIndexDir = Path.of("target/central-index");
// Creators we want to use (search for fields it defines)
List<IndexCreator> indexers = new ArrayList<>();
@@ -114,8 +114,8 @@ public class BasicUsageExample {
centralContext = indexer.createIndexingContext(
"central-context",
"central",
- centralLocalCache,
- centralIndexDir,
+ centralLocalCache.toFile(),
+ centralIndexDir.toFile(),
"https://repo1.maven.org/maven2";,
null,
true,
diff --git a/indexer-examples/indexer-examples-spring/pom.xml
b/indexer-examples/indexer-examples-spring/pom.xml
index 726f1a6..ec80bf8 100644
--- a/indexer-examples/indexer-examples-spring/pom.xml
+++ b/indexer-examples/indexer-examples-spring/pom.xml
@@ -82,6 +82,7 @@ under the License.
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
+ <classifier>classes</classifier>
</dependency>
<!-- Spring dependencies start: -->
diff --git a/pom.xml b/pom.xml
index c2e76bf..d211d52 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@ under the License.
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>43</version>
+ <version>44</version>
<relativePath />
</parent>
@@ -93,13 +93,15 @@ under the License.
</distributionManagement>
<properties>
+
<checkstyle.includeTestSourceDirectory>false</checkstyle.includeTestSourceDirectory>
+
<javaVersion>11</javaVersion>
<!-- Remove these two below when MPOM-449 fixed -->
<maven.compiler.source>${javaVersion}</maven.compiler.source>
<maven.compiler.target>${javaVersion}</maven.compiler.target>
<maven.compiler.release>${javaVersion}</maven.compiler.release>
- <minimalMavenBuildVersion>[3.8.7,)</minimalMavenBuildVersion>
- <minimalJavaBuildVersion>[17.0.6,)</minimalJavaBuildVersion>
+ <minimalMavenBuildVersion>[3.9,)</minimalMavenBuildVersion>
+ <minimalJavaBuildVersion>[17,)</minimalJavaBuildVersion>
<surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
<failsafe.redirectTestOutputToFile>true</failsafe.redirectTestOutputToFile>
@@ -111,7 +113,7 @@ under the License.
<maven.version>3.9.9</maven.version>
<resolver.version>1.9.22</resolver.version>
<archetype.version>3.4.0</archetype.version>
- <slf4j.version>2.0.16</slf4j.version>
+ <slf4j.version>1.7.36</slf4j.version>
<maven.site.path>maven-indexer-archives/maven-indexer-LATEST</maven.site.path>
<project.build.outputTimestamp>2024-09-11T19:55:44Z</project.build.outputTimestamp>
</properties>
@@ -163,6 +165,12 @@ under the License.
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>${guice.version}</version>
+ <classifier>classes</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>9.8</version>
</dependency>
<dependency>
@@ -291,9 +299,11 @@ under the License.
<plugin>
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-plugin</artifactId>
- <version>2.9.0</version>
+ <version>3.1.0</version>
<configuration>
<javaVersion>${javaVersion}</javaVersion>
+ <!-- TODO: https://issues.apache.org/jira/browse/MINDEXER-252 -->
+ <includeTestClasses>false</includeTestClasses>
</configuration>
<executions>
<execution>
diff --git a/search-backend-indexer/pom.xml b/search-backend-indexer/pom.xml
index fcf1104..03fc7c5 100644
--- a/search-backend-indexer/pom.xml
+++ b/search-backend-indexer/pom.xml
@@ -68,6 +68,7 @@ under the License.
<dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
+ <classifier>classes</classifier>
<scope>test</scope>
</dependency>
</dependencies>
