Skip to content

Commit a8e7f9f

Browse files
authored
Minimal changes to make build work with Maven 4 (#2391)
This is the set of minimal changes to make the build work with Maven 4 Changes: * drop unmaintained extension, replace with Nisse * move ossindex plugin to verify (was at validate) -- makes dep resolution mandatory * fix using user properties the P2 repo without repo.id (makes Maven 4 fail)
1 parent a9f1a5d commit a8e7f9f

4 files changed

Lines changed: 14 additions & 8 deletions

File tree

.mvn/extensions.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<extensions>
3+
<extension>
4+
<groupId>eu.maveniverse.maven.nisse</groupId>
5+
<artifactId>extension</artifactId>
6+
<version>0.6.2</version>
7+
</extension>
8+
</extensions>

.mvn/maven.config

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
-D
2+
nisse.compat.osDetector
3+
# fix for nlp module
4+
-D
5+
eclipseP2RepoId=invalid

tika-grpc/pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -246,13 +246,6 @@
246246
</dependency>
247247
</dependencies>
248248
<build>
249-
<extensions>
250-
<extension>
251-
<groupId>kr.motd.maven</groupId>
252-
<artifactId>os-maven-plugin</artifactId>
253-
<version>1.7.1</version>
254-
</extension>
255-
</extensions>
256249
<plugins>
257250
<plugin>
258251
<groupId>org.apache.maven.plugins</groupId>

tika-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1297,7 +1297,7 @@
12971297
<executions>
12981298
<execution>
12991299
<id>audit-dependencies</id>
1300-
<phase>validate</phase>
1300+
<phase>verify</phase>
13011301
<goals>
13021302
<goal>audit</goal>
13031303
</goals>

0 commit comments

Comments
 (0)