Skip to content

Commit bebc380

Browse files
cstamastballison
authored andcommitted
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) (cherry picked from commit a8e7f9f)
1 parent 4bd175b commit bebc380

4 files changed

Lines changed: 14 additions & 13 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 & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
# .mvn/maven.config
2-
3-
# This line ensures Nisse emits the os.detected.* properties
4-
# for backward compatibility with the old OS Detector plugin.
5-
-Dnisse.compat.osDetector
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
@@ -245,13 +245,6 @@
245245
</dependency>
246246
</dependencies>
247247
<build>
248-
<extensions>
249-
<extension>
250-
<groupId>kr.motd.maven</groupId>
251-
<artifactId>os-maven-plugin</artifactId>
252-
<version>1.7.1</version>
253-
</extension>
254-
</extensions>
255248
<plugins>
256249
<plugin>
257250
<groupId>org.apache.maven.plugins</groupId>

tika-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1305,7 +1305,7 @@
13051305
<executions>
13061306
<execution>
13071307
<id>audit-dependencies</id>
1308-
<phase>validate</phase>
1308+
<phase>verify</phase>
13091309
<goals>
13101310
<goal>audit</goal>
13111311
</goals>

0 commit comments

Comments
 (0)