Skip to content

Commit 0103ab9

Browse files
pruivotristantarrant
authored andcommitted
IPROTO-231 Upgrade jboss-parent to version 39
1 parent 3c71b53 commit 0103ab9

File tree

1 file changed

+16
-52
lines changed

1 file changed

+16
-52
lines changed

parent/pom.xml

+16-52
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.jboss</groupId>
88
<artifactId>jboss-parent</artifactId>
9-
<version>36</version>
9+
<version>39</version>
1010
</parent>
1111

1212
<groupId>org.infinispan.protostream</groupId>
@@ -101,17 +101,20 @@
101101
<jboss.snapshots.repo.id>jboss-snapshots-repository</jboss.snapshots.repo.id>
102102
<jboss.snapshots.repo.url>https://repository.jboss.org/nexus/content/repositories/snapshots/</jboss.snapshots.repo.url>
103103

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 -->
111116
<version.maven.nexus-staging>1.6.12</version.maven.nexus-staging>
112-
<version.maven.surefire>3.0.0-M5</version.maven.surefire>
113117
<version.maven.animalsniffer>1.18</version.maven.animalsniffer>
114-
<version.maven.shade>3.2.4</version.maven.shade>
115118

116119
<version.protobuf>3.19.4</version.protobuf>
117120
<version.javax.annotation-api>1.3.2</version.javax.annotation-api>
@@ -349,11 +352,7 @@
349352
<plugins>
350353
<plugin>
351354
<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">
357356
<encoding>UTF-8</encoding>
358357
<!-- both maven and javac are buggy regarding handling of APs with incremental compilation -->
359358
<useIncrementalCompilation>false</useIncrementalCompilation>
@@ -362,44 +361,16 @@
362361
</configuration>
363362
</plugin>
364363

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-
377364
<plugin>
378365
<groupId>org.sonatype.plugins</groupId>
379366
<artifactId>nexus-staging-maven-plugin</artifactId>
380367
<version>${version.maven.nexus-staging}</version>
381368
</plugin>
382369

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-
399370
<plugin>
400371
<groupId>org.apache.maven.plugins</groupId>
401372
<artifactId>maven-surefire-report-plugin</artifactId>
402-
<version>${version.maven.surefire}</version>
373+
<version>${version.surefire.plugin}</version>
403374
<executions>
404375
<execution>
405376
<phase>verify</phase>
@@ -433,12 +404,6 @@
433404
</execution>
434405
</executions>
435406
</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>
442407
</plugins>
443408
</pluginManagement>
444409

@@ -467,7 +432,7 @@
467432
<configuration>
468433
<rules>
469434
<requireJavaVersion>
470-
<version>[${version.java},)</version>
435+
<version>[${maven.compiler.source},)</version>
471436
</requireJavaVersion>
472437
<requireMavenVersion>
473438
<version>[3.5.4,)</version>
@@ -492,7 +457,6 @@
492457
<plugin>
493458
<groupId>org.apache.maven.plugins</groupId>
494459
<artifactId>maven-source-plugin</artifactId>
495-
<version>${version.maven.source}</version>
496460
<executions>
497461
<execution>
498462
<id>attach-sources</id>

0 commit comments

Comments
 (0)