Skip to content

Commit 374c190

Browse files
odrotbohmodrotbohm
committed
#191 - Dependency upgrades for Gosling RC1.
AspectJ 1.8.5 -> 1.8.6 Guava 17.0 -> 18.0 Jackson 2.5.1 -> 2.6.0 Querydsl 3.6.4 -> 3.6.6 RxJava 1.0.11 -> 1.0.13 Maven Antrun Plugin 1.7 -> 1.8 Maven Asciidoctor Plugin 1.5.2 -> 1.5.2.1 AsciidoctorJ Pdf 1.5.0-alpha.6 -> 1.5.0-alpha8 Maven Assembly Plugin 2.4 -> 2.5.5 Maven Compiler Plugin 3.1 -> 3.3 Maven Dependency Plugin 2.8 -> 2.10 Maven Deploy Plugin 2.8.1 -> 2.8.2 Maven JAR Plugin 2.4 -> 2.6 Maven Javadoc Plugin 2.9.1 -> 2.10.3 Maven Source Plugin 2.2.1 -> 2.4 Maven Surefire Plugin 2.17 -> 2.18.1 Wagon Maven Plugin 1.0-beta-5 -> 1.0 The Wagon SSH extension cannot be upgraded (currently 2.5, available 2.9) as all more recent version cause a NullPointerException in the JSch library. Extracted all Maven plugin versions into pluginManagement section to ensure consistent versions being used.
1 parent e32537d commit 374c190

File tree

1 file changed

+72
-22
lines changed

1 file changed

+72
-22
lines changed

Diff for: ‎parent/pom.xml

+72-22
Original file line numberDiff line numberDiff line change
@@ -87,18 +87,18 @@
8787
<dist.id>${project.artifactId}</dist.id>
8888

8989
<apt>1.1.3</apt>
90-
<aspectj>1.8.5</aspectj>
90+
<aspectj>1.8.6</aspectj>
9191
<cdi>1.0</cdi>
9292
<commons-io>2.4</commons-io>
93-
<guava>17.0</guava>
93+
<guava>18.0</guava>
9494
<hamcrest>1.3</hamcrest>
95-
<jackson>2.5.1</jackson>
95+
<jackson>2.6.0</jackson>
9696
<jodatime>2.8.1</jodatime>
9797
<junit>4.12</junit>
9898
<logback>1.1.3</logback>
9999
<mockito>1.10.19</mockito>
100-
<querydsl>3.6.4</querydsl>
101-
<rxjava>1.0.11</rxjava>
100+
<querydsl>3.6.6</querydsl>
101+
<rxjava>1.0.13</rxjava>
102102
<slf4j>1.7.12</slf4j>
103103
<spring>4.1.7.RELEASE</spring>
104104
<threetenbp>1.3</threetenbp>
@@ -218,8 +218,8 @@
218218
-->
219219

220220
<plugin>
221+
<groupId>org.apache.maven.plugins</groupId>
221222
<artifactId>maven-antrun-plugin</artifactId>
222-
<version>1.7</version>
223223
<executions>
224224

225225
<execution>
@@ -296,12 +296,11 @@
296296
<plugin>
297297
<groupId>org.asciidoctor</groupId>
298298
<artifactId>asciidoctor-maven-plugin</artifactId>
299-
<version>1.5.2</version>
300299
<dependencies>
301300
<dependency>
302301
<groupId>org.asciidoctor</groupId>
303302
<artifactId>asciidoctorj-pdf</artifactId>
304-
<version>1.5.0-alpha.6</version>
303+
<version>1.5.0-alpha.8</version>
305304
</dependency>
306305
<dependency>
307306
<groupId>org.asciidoctor</groupId>
@@ -383,7 +382,6 @@
383382
<plugin>
384383
<groupId>org.apache.maven.plugins</groupId>
385384
<artifactId>maven-assembly-plugin</artifactId>
386-
<version>2.4</version>
387385
<executions>
388386
<execution>
389387
<id>static</id>
@@ -405,7 +403,6 @@
405403
<plugin>
406404
<groupId>org.codehaus.mojo</groupId>
407405
<artifactId>wagon-maven-plugin</artifactId>
408-
<version>1.0-beta-5</version>
409406
<configuration>
410407
<fromDir>${project.build.directory}</fromDir>
411408
</configuration>
@@ -622,15 +619,75 @@
622619
<plugins>
623620

624621
<plugin>
625-
<groupId>org.codehaus.mojo</groupId>
626-
<artifactId>wagon-maven-plugin</artifactId>
627-
<version>1.0-beta-5</version>
622+
<groupId>com.springsource.bundlor</groupId>
623+
<artifactId>com.springsource.bundlor.maven</artifactId>
624+
<version>1.0.0.RELEASE</version>
628625
</plugin>
629626

630627
<plugin>
631628
<groupId>org.asciidoctor</groupId>
632629
<artifactId>asciidoctor-maven-plugin</artifactId>
633-
<version>0.1.4</version>
630+
<version>1.5.2.1</version>
631+
</plugin>
632+
633+
<plugin>
634+
<groupId>org.apache.maven.plugins</groupId>
635+
<artifactId>maven-antrun-plugin</artifactId>
636+
<version>1.8</version>
637+
</plugin>
638+
639+
<plugin>
640+
<groupId>org.apache.maven.plugins</groupId>
641+
<artifactId>maven-assembly-plugin</artifactId>
642+
<version>2.5.5</version>
643+
</plugin>
644+
645+
<plugin>
646+
<groupId>org.apache.maven.plugins</groupId>
647+
<artifactId>maven-compiler-plugin</artifactId>
648+
<version>3.3</version>
649+
</plugin>
650+
651+
<plugin>
652+
<groupId>org.apache.maven.plugins</groupId>
653+
<artifactId>maven-dependency-plugin</artifactId>
654+
<version>2.10</version>
655+
</plugin>
656+
657+
<plugin>
658+
<groupId>org.apache.maven.plugins</groupId>
659+
<artifactId>maven-deploy-plugin</artifactId>
660+
<version>2.8.2</version>
661+
</plugin>
662+
663+
<plugin>
664+
<groupId>org.apache.maven.plugins</groupId>
665+
<artifactId>maven-jar-plugin</artifactId>
666+
<version>2.6</version>
667+
</plugin>
668+
669+
<plugin>
670+
<groupId>org.apache.maven.plugins</groupId>
671+
<artifactId>maven-javadoc-plugin</artifactId>
672+
<version>2.10.3</version>
673+
</plugin>
674+
675+
<plugin>
676+
<groupId>org.apache.maven.plugins</groupId>
677+
<artifactId>maven-source-plugin</artifactId>
678+
<version>2.4</version>
679+
</plugin>
680+
681+
<plugin>
682+
<groupId>org.apache.maven.plugins</groupId>
683+
<artifactId>maven-surefire-plugin</artifactId>
684+
<version>2.18.1</version>
685+
</plugin>
686+
687+
<plugin>
688+
<groupId>org.codehaus.mojo</groupId>
689+
<artifactId>wagon-maven-plugin</artifactId>
690+
<version>1.0</version>
634691
</plugin>
635692

636693
</plugins>
@@ -642,13 +699,11 @@
642699
<plugin>
643700
<groupId>org.apache.maven.plugins</groupId>
644701
<artifactId>maven-dependency-plugin</artifactId>
645-
<version>2.8</version>
646702
</plugin>
647703

648704
<plugin>
649705
<groupId>org.apache.maven.plugins</groupId>
650706
<artifactId>maven-compiler-plugin</artifactId>
651-
<version>3.1</version>
652707
<configuration>
653708
<source>${source.level}</source>
654709
<target>${source.level}</target>
@@ -658,7 +713,6 @@
658713
<plugin>
659714
<groupId>org.apache.maven.plugins</groupId>
660715
<artifactId>maven-surefire-plugin</artifactId>
661-
<version>2.17</version>
662716
<configuration>
663717
<useFile>false</useFile>
664718
<includes>
@@ -670,15 +724,14 @@
670724
<plugin>
671725
<groupId>org.apache.maven.plugins</groupId>
672726
<artifactId>maven-jar-plugin</artifactId>
673-
<version>2.4</version>
674727
<configuration>
675728
<useDefaultManifestFile>true</useDefaultManifestFile>
676729
</configuration>
677730
</plugin>
678731

679732
<plugin>
733+
<groupId>org.apache.maven.plugins</groupId>
680734
<artifactId>maven-source-plugin</artifactId>
681-
<version>2.2.1</version>
682735
<executions>
683736
<execution>
684737
<id>attach-sources</id>
@@ -692,7 +745,6 @@
692745
<plugin>
693746
<groupId>com.springsource.bundlor</groupId>
694747
<artifactId>com.springsource.bundlor.maven</artifactId>
695-
<version>1.0.0.RELEASE</version>
696748
<configuration>
697749
<enabled>${bundlor.enabled}</enabled>
698750
<failOnWarnings>${bundlor.failOnWarnings}</failOnWarnings>
@@ -710,7 +762,6 @@
710762
<plugin>
711763
<groupId>org.apache.maven.plugins</groupId>
712764
<artifactId>maven-javadoc-plugin</artifactId>
713-
<version>2.9.1</version>
714765
<configuration>
715766
<breakiterator>true</breakiterator>
716767
<header>${project.name}</header>
@@ -733,7 +784,6 @@
733784
<plugin>
734785
<groupId>org.apache.maven.plugins</groupId>
735786
<artifactId>maven-deploy-plugin</artifactId>
736-
<version>2.8.1</version>
737787
<configuration>
738788
<skip>true</skip>
739789
</configuration>

0 commit comments

Comments
 (0)