|
6 | 6 | <parent>
|
7 | 7 | <groupId>org.jboss</groupId>
|
8 | 8 | <artifactId>jboss-parent</artifactId>
|
9 |
| - <version>36</version> |
| 9 | + <version>39</version> |
10 | 10 | </parent>
|
11 | 11 |
|
12 | 12 | <groupId>org.infinispan.protostream</groupId>
|
|
101 | 101 | <jboss.snapshots.repo.id>jboss-snapshots-repository</jboss.snapshots.repo.id>
|
102 | 102 | <jboss.snapshots.repo.url>https://repository.jboss.org/nexus/content/repositories/snapshots/</jboss.snapshots.repo.url>
|
103 | 103 |
|
104 |
| - <version.java>1.8</version.java> |
105 |
| - <version.maven.compiler>3.9.0</version.maven.compiler> |
106 |
| - <version.maven.jar>3.2.0</version.maven.jar> |
107 |
| - <version.maven.javadoc>3.3.1</version.maven.javadoc> |
108 |
| - <version.maven.source>3.2.0</version.maven.source> |
109 |
| - <version.maven.resources>3.2.0</version.maven.resources> |
110 |
| - <version.maven.antrun>3.0.0</version.maven.antrun> |
| 104 | + <!-- overwrite plugins version from jboss-parent --> |
| 105 | + <maven.compiler.target>1.8</maven.compiler.target> |
| 106 | + <maven.compiler.source>1.8</maven.compiler.source> |
| 107 | + <version.compiler.plugin>3.9.0</version.compiler.plugin> |
| 108 | + <version.jar.plugin>3.2.0</version.jar.plugin> |
| 109 | + <version.javadoc.plugin>3.3.1</version.javadoc.plugin> |
| 110 | + <version.source.plugin>3.2.0</version.source.plugin> |
| 111 | + <version.antrun.plugin>3.0.0</version.antrun.plugin> |
| 112 | + <version.surefire.plugin>3.0.0-M5</version.surefire.plugin> |
| 113 | + <version.shade.plugin>3.2.4</version.shade.plugin> |
| 114 | + |
| 115 | + <!-- plugins version --> |
111 | 116 | <version.maven.nexus-staging>1.6.12</version.maven.nexus-staging>
|
112 |
| - <version.maven.surefire>3.0.0-M5</version.maven.surefire> |
113 | 117 | <version.maven.animalsniffer>1.18</version.maven.animalsniffer>
|
114 |
| - <version.maven.shade>3.2.4</version.maven.shade> |
115 | 118 |
|
116 | 119 | <version.protobuf>3.19.4</version.protobuf>
|
117 | 120 | <version.javax.annotation-api>1.3.2</version.javax.annotation-api>
|
|
349 | 352 | <plugins>
|
350 | 353 | <plugin>
|
351 | 354 | <artifactId>maven-compiler-plugin</artifactId>
|
352 |
| - <version>${version.maven.compiler}</version> |
353 |
| - <configuration> |
354 |
| - <source>${version.java}</source> |
355 |
| - <target>${version.java}</target> |
356 |
| - <release>8</release> |
| 355 | + <configuration combine.self="append"> |
357 | 356 | <encoding>UTF-8</encoding>
|
358 | 357 | <!-- both maven and javac are buggy regarding handling of APs with incremental compilation -->
|
359 | 358 | <useIncrementalCompilation>false</useIncrementalCompilation>
|
|
362 | 361 | </configuration>
|
363 | 362 | </plugin>
|
364 | 363 |
|
365 |
| - <plugin> |
366 |
| - <groupId>org.apache.maven.plugins</groupId> |
367 |
| - <artifactId>maven-jar-plugin</artifactId> |
368 |
| - <version>${version.maven.jar}</version> |
369 |
| - </plugin> |
370 |
| - |
371 |
| - <plugin> |
372 |
| - <groupId>org.apache.maven.plugins</groupId> |
373 |
| - <artifactId>maven-javadoc-plugin</artifactId> |
374 |
| - <version>${version.maven.javadoc}</version> |
375 |
| - </plugin> |
376 |
| - |
377 | 364 | <plugin>
|
378 | 365 | <groupId>org.sonatype.plugins</groupId>
|
379 | 366 | <artifactId>nexus-staging-maven-plugin</artifactId>
|
380 | 367 | <version>${version.maven.nexus-staging}</version>
|
381 | 368 | </plugin>
|
382 | 369 |
|
383 |
| - <plugin> |
384 |
| - <artifactId>maven-antrun-plugin</artifactId> |
385 |
| - <version>${version.maven.antrun}</version> |
386 |
| - </plugin> |
387 |
| - |
388 |
| - <plugin> |
389 |
| - <artifactId>maven-resources-plugin</artifactId> |
390 |
| - <version>${version.maven.resources}</version> |
391 |
| - </plugin> |
392 |
| - |
393 |
| - <plugin> |
394 |
| - <groupId>org.apache.maven.plugins</groupId> |
395 |
| - <artifactId>maven-surefire-plugin</artifactId> |
396 |
| - <version>${version.maven.surefire}</version> |
397 |
| - </plugin> |
398 |
| - |
399 | 370 | <plugin>
|
400 | 371 | <groupId>org.apache.maven.plugins</groupId>
|
401 | 372 | <artifactId>maven-surefire-report-plugin</artifactId>
|
402 |
| - <version>${version.maven.surefire}</version> |
| 373 | + <version>${version.surefire.plugin}</version> |
403 | 374 | <executions>
|
404 | 375 | <execution>
|
405 | 376 | <phase>verify</phase>
|
|
433 | 404 | </execution>
|
434 | 405 | </executions>
|
435 | 406 | </plugin>
|
436 |
| - |
437 |
| - <plugin> |
438 |
| - <groupId>org.apache.maven.plugins</groupId> |
439 |
| - <artifactId>maven-shade-plugin</artifactId> |
440 |
| - <version>${version.maven.shade}</version> |
441 |
| - </plugin> |
442 | 407 | </plugins>
|
443 | 408 | </pluginManagement>
|
444 | 409 |
|
|
467 | 432 | <configuration>
|
468 | 433 | <rules>
|
469 | 434 | <requireJavaVersion>
|
470 |
| - <version>[${version.java},)</version> |
| 435 | + <version>[${maven.compiler.source},)</version> |
471 | 436 | </requireJavaVersion>
|
472 | 437 | <requireMavenVersion>
|
473 | 438 | <version>[3.5.4,)</version>
|
|
492 | 457 | <plugin>
|
493 | 458 | <groupId>org.apache.maven.plugins</groupId>
|
494 | 459 | <artifactId>maven-source-plugin</artifactId>
|
495 |
| - <version>${version.maven.source}</version> |
496 | 460 | <executions>
|
497 | 461 | <execution>
|
498 | 462 | <id>attach-sources</id>
|
|
0 commit comments