Skip to content

Commit 91b9d74

Browse files
acogoluegnesacogoluegnes
committed
Merge branch '4.0.x-stable' into 4.1.x-stable
2 parents 37b7fe9 + d317c9a commit 91b9d74

File tree

1 file changed

+56
-72
lines changed

1 file changed

+56
-72
lines changed

‎pom.xml‎

Lines changed: 56 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,23 @@
6262
<awaitility.version>2.0.0</awaitility.version>
6363
<mockito.version>2.7.9</mockito.version>
6464

65+
<maven.javadoc.plugin.version>3.0.0-M1</maven.javadoc.plugin.version>
66+
<maven.release.plugin.version>2.5.3</maven.release.plugin.version>
67+
<versions.maven.plugin.version>2.3</versions.maven.plugin.version>
68+
<maven.resources.plugin.version>3.0.1</maven.resources.plugin.version>
69+
<maven.sources.plugin.version>3.0.1</maven.sources.plugin.version>
70+
<groovy.maven.plugin.version>2.0</groovy.maven.plugin.version>
71+
<groovy.all.version>2.4.8</groovy.all.version>
72+
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
73+
<keytool.maven.plugin.version>1.5</keytool.maven.plugin.version>
74+
<build.helper.maven-plugin.version>1.12</build.helper.maven-plugin.version>
75+
<maven.compiler.plugin.version>3.5.1</maven.compiler.plugin.version>
76+
<maven.surefire.plugin.version>2.19.1</maven.surefire.plugin.version>
77+
<maven.failsafe.plugin.version>2.19.1</maven.failsafe.plugin.version>
78+
<maven.gpg.plugin.version>1.6</maven.gpg.plugin.version>
79+
<maven.jar.plugin.version>3.0.2</maven.jar.plugin.version>
80+
<maven.bundle.plugin.version>2.3.7</maven.bundle.plugin.version>
81+
6582
<!--
6683
These groovy scripts are used later in this POM file to generate
6784
source files and resources for the library itself and for the
@@ -102,7 +119,6 @@
102119

103120
<!-- to sign artifacts when releasing -->
104121
<gpg.keyname>6026DFCA</gpg.keyname>
105-
<nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
106122
</properties>
107123

108124
<profiles>
@@ -185,12 +201,12 @@
185201
<plugin>
186202
<groupId>org.codehaus.gmaven</groupId>
187203
<artifactId>groovy-maven-plugin</artifactId>
188-
<version>2.0</version>
204+
<version>${groovy.maven.plugin.version}</version>
189205
<dependencies>
190206
<dependency>
191207
<groupId>org.codehaus.groovy</groupId>
192208
<artifactId>groovy-all</artifactId>
193-
<version>2.4.8</version>
209+
<version>${groovy.all.version}</version>
194210
</dependency>
195211
</dependencies>
196212
<executions>
@@ -312,6 +328,7 @@
312328
<plugin>
313329
<groupId>org.codehaus.mojo</groupId>
314330
<artifactId>keytool-maven-plugin</artifactId>
331+
<version>${keytool.maven.plugin.version}</version>
315332
<configuration>
316333
<skip>false</skip>
317334
</configuration>
@@ -340,6 +357,7 @@
340357
<plugin>
341358
<groupId>org.codehaus.mojo</groupId>
342359
<artifactId>keytool-maven-plugin</artifactId>
360+
<version>${keytool.maven.plugin.version}</version>
343361
<configuration>
344362
<skip>false</skip>
345363
</configuration>
@@ -371,7 +389,7 @@
371389
<plugin>
372390
<groupId>org.apache.maven.plugins</groupId>
373391
<artifactId>maven-failsafe-plugin</artifactId>
374-
<version>2.19.1</version>
392+
<version>${maven.failsafe.plugin.version}</version>
375393
<configuration>
376394
<systemPropertyVariables>
377395
<make.bin>${make.bin}</make.bin>
@@ -433,7 +451,7 @@
433451
<plugin>
434452
<groupId>org.apache.maven.plugins</groupId>
435453
<artifactId>maven-failsafe-plugin</artifactId>
436-
<version>2.19.1</version>
454+
<version>${maven.failsafe.plugin.version}</version>
437455
<configuration>
438456
<systemPropertyVariables>
439457
<use.nio>true</use.nio>
@@ -452,34 +470,13 @@
452470
<id>ossrh-release</id>
453471
<build>
454472
<plugins>
455-
<plugin>
456-
<groupId>org.sonatype.plugins</groupId>
457-
<artifactId>nexus-staging-maven-plugin</artifactId>
458-
<version>${nexus-staging-maven-plugin.version}</version>
459-
<configuration>
460-
<serverId>ossrh</serverId>
461-
<nexusUrl>https://oss.sonatype.org/</nexusUrl>
462-
<skipStaging>false</skipStaging>
463-
</configuration>
464-
</plugin>
465-
<plugin>
466-
<groupId>org.apache.maven.plugins</groupId>
467-
<artifactId>maven-source-plugin</artifactId>
468-
<version>3.0.1</version>
469-
<executions>
470-
<execution>
471-
<goals>
472-
<goal>jar</goal>
473-
</goals>
474-
</execution>
475-
</executions>
476-
</plugin>
477473
<plugin>
478474
<groupId>org.apache.maven.plugins</groupId>
479475
<artifactId>maven-javadoc-plugin</artifactId>
480-
<version>2.10.4</version>
476+
<version>${maven.javadoc.plugin.version}</version>
481477
<configuration>
482478
<additionalparam>${javadoc.opts}</additionalparam>
479+
<quiet>true</quiet>
483480
</configuration>
484481
<executions>
485482
<execution>
@@ -493,7 +490,7 @@
493490
<plugin>
494491
<groupId>org.apache.maven.plugins</groupId>
495492
<artifactId>maven-gpg-plugin</artifactId>
496-
<version>1.6</version>
493+
<version>${maven.gpg.plugin.version}</version>
497494
<executions>
498495
<execution>
499496
<id>sign-artifacts</id>
@@ -514,10 +511,6 @@
514511
<id>ossrh</id>
515512
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
516513
</snapshotRepository>
517-
<repository>
518-
<id>ossrh</id>
519-
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
520-
</repository>
521514
</distributionManagement>
522515
</profile>
523516

@@ -529,24 +522,13 @@
529522
<id>bintray-release</id>
530523
<build>
531524
<plugins>
532-
<plugin>
533-
<groupId>org.apache.maven.plugins</groupId>
534-
<artifactId>maven-source-plugin</artifactId>
535-
<version>3.0.1</version>
536-
<executions>
537-
<execution>
538-
<goals>
539-
<goal>jar</goal>
540-
</goals>
541-
</execution>
542-
</executions>
543-
</plugin>
544525
<plugin>
545526
<groupId>org.apache.maven.plugins</groupId>
546527
<artifactId>maven-javadoc-plugin</artifactId>
547-
<version>2.10.4</version>
528+
<version>${maven.javadoc.plugin.version}</version>
548529
<configuration>
549530
<additionalparam>${javadoc.opts}</additionalparam>
531+
<quiet>true</quiet>
550532
</configuration>
551533
<executions>
552534
<execution>
@@ -560,7 +542,7 @@
560542
<plugin>
561543
<groupId>org.apache.maven.plugins</groupId>
562544
<artifactId>maven-gpg-plugin</artifactId>
563-
<version>1.6</version>
545+
<version>${maven.gpg.plugin.version}</version>
564546
<executions>
565547
<execution>
566548
<id>sign-artifacts</id>
@@ -593,24 +575,13 @@
593575
<id>milestone</id>
594576
<build>
595577
<plugins>
596-
<plugin>
597-
<groupId>org.apache.maven.plugins</groupId>
598-
<artifactId>maven-source-plugin</artifactId>
599-
<version>3.0.1</version>
600-
<executions>
601-
<execution>
602-
<goals>
603-
<goal>jar</goal>
604-
</goals>
605-
</execution>
606-
</executions>
607-
</plugin>
608578
<plugin>
609579
<groupId>org.apache.maven.plugins</groupId>
610580
<artifactId>maven-javadoc-plugin</artifactId>
611-
<version>2.10.4</version>
581+
<version>${maven.javadoc.plugin.version}</version>
612582
<configuration>
613583
<additionalparam>${javadoc.opts}</additionalparam>
584+
<quiet>true</quiet>
614585
</configuration>
615586
<executions>
616587
<execution>
@@ -624,7 +595,7 @@
624595
<plugin>
625596
<groupId>org.apache.maven.plugins</groupId>
626597
<artifactId>maven-gpg-plugin</artifactId>
627-
<version>1.6</version>
598+
<version>${maven.gpg.plugin.version}</version>
628599
<executions>
629600
<execution>
630601
<id>sign-artifacts</id>
@@ -725,17 +696,17 @@
725696
<plugin>
726697
<groupId>org.apache.maven.plugins</groupId>
727698
<artifactId>maven-resources-plugin</artifactId>
728-
<version>3.0.1</version>
699+
<version>${maven.sources.plugin.version}</version>
729700
</plugin>
730701
<plugin>
731702
<groupId>org.codehaus.gmaven</groupId>
732703
<artifactId>groovy-maven-plugin</artifactId>
733-
<version>2.0</version>
704+
<version>${groovy.maven.plugin.version}</version>
734705
<dependencies>
735706
<dependency>
736707
<groupId>org.codehaus.groovy</groupId>
737708
<artifactId>groovy-all</artifactId>
738-
<version>2.4.8</version>
709+
<version>${groovy.all.version}</version>
739710
</dependency>
740711
</dependencies>
741712
<executions>
@@ -793,7 +764,7 @@
793764
<plugin>
794765
<groupId>org.codehaus.mojo</groupId>
795766
<artifactId>build-helper-maven-plugin</artifactId>
796-
<version>1.12</version>
767+
<version>${build.helper.maven-plugin.version}</version>
797768
<executions>
798769
<execution>
799770
<id>add-generated-sources-dir</id>
@@ -812,7 +783,7 @@
812783

813784
<plugin>
814785
<artifactId>maven-compiler-plugin</artifactId>
815-
<version>3.5.1</version>
786+
<version>${maven.compiler.plugin.version}</version>
816787
<configuration>
817788
<source>1.6</source>
818789
<target>1.6</target>
@@ -830,7 +801,7 @@
830801
<plugin>
831802
<groupId>org.apache.maven.plugins</groupId>
832803
<artifactId>maven-surefire-plugin</artifactId>
833-
<version>2.19.1</version>
804+
<version>${maven.surefire.plugin.version}</version>
834805
<configuration>
835806
<skip>true</skip>
836807
</configuration>
@@ -840,7 +811,7 @@
840811
<plugin>
841812
<groupId>org.codehaus.mojo</groupId>
842813
<artifactId>keytool-maven-plugin</artifactId>
843-
<version>1.5</version>
814+
<version>${keytool.maven.plugin.version}</version>
844815
<configuration>
845816
<skip>true</skip>
846817
</configuration>
@@ -880,7 +851,7 @@
880851
<plugin>
881852
<groupId>org.apache.maven.plugins</groupId>
882853
<artifactId>maven-jar-plugin</artifactId>
883-
<version>3.0.2</version>
854+
<version>${maven.jar.plugin.version}</version>
884855
<configuration>
885856
<archive>
886857
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -891,7 +862,7 @@
891862
<plugin>
892863
<groupId>org.apache.felix</groupId>
893864
<artifactId>maven-bundle-plugin</artifactId>
894-
<version>2.3.7</version>
865+
<version>${maven.bundle.plugin.version}</version>
895866
<executions>
896867
<execution>
897868
<id>bundle-manifest</id>
@@ -919,18 +890,31 @@
919890
<plugin>
920891
<groupId>org.codehaus.mojo</groupId>
921892
<artifactId>versions-maven-plugin</artifactId>
922-
<version>2.3</version>
893+
<version>${versions.maven.plugin.version}</version>
923894
</plugin>
924895

925896
<plugin>
926897
<groupId>org.apache.maven.plugins</groupId>
927898
<artifactId>maven-release-plugin</artifactId>
928-
<version>2.5.3</version>
899+
<version>${maven.release.plugin.version}</version>
929900
<configuration>
930901
<tagNameFormat>v@{project.version}</tagNameFormat>
931902
</configuration>
932903
</plugin>
933904

905+
<plugin>
906+
<groupId>org.apache.maven.plugins</groupId>
907+
<artifactId>maven-source-plugin</artifactId>
908+
<version>${maven.sources.plugin.version}</version>
909+
<executions>
910+
<execution>
911+
<goals>
912+
<goal>jar</goal>
913+
</goals>
914+
</execution>
915+
</executions>
916+
</plugin>
917+
934918
</plugins>
935919
</build>
936920

0 commit comments

Comments
 (0)