Commit f8e1345b authored by Stephane Nicoll's avatar Stephane Nicoll

Unify versions used in integration tests

This commit makes sure the integration tests use the same versions as
the one managed by `spring-boot-dependencies` (including Maven plugins).

Closes gh-8947
parent bca96932
......@@ -13,7 +13,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<version>@maven-compiler-plugin.version@</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
......@@ -22,7 +22,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<version>@maven-dependency-plugin.version@</version>
<executions>
<execution>
<id>unpack</id>
......@@ -73,17 +73,17 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>8.1.14.v20131031</version>
<version>@jetty.version@</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
<version>8.1.14.v20131031</version>
<version>@jetty.version@</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.0.5.RELEASE</version>
<version>@spring.version@</version>
</dependency>
</dependencies>
</project>
......@@ -13,7 +13,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<version>@maven-compiler-plugin.version@</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
......@@ -22,7 +22,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<version>@maven-dependency-plugin.version@</version>
<executions>
<execution>
<id>unpack</id>
......@@ -86,17 +86,17 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>8.1.14.v20131031</version>
<version>@jetty.version@</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
<version>8.1.14.v20131031</version>
<version>@jetty.version@</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.0.5.RELEASE</version>
<version>@spring.version@</version>
</dependency>
</dependencies>
</project>
......@@ -13,7 +13,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<version>@maven-compiler-plugin.version@</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
......@@ -22,7 +22,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<version>@maven-dependency-plugin.version@</version>
<executions>
<execution>
<id>unpack</id>
......@@ -98,7 +98,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.4.RELEASE</version>
<version>@spring.version@</version>
</dependency>
</dependencies>
</project>
......@@ -13,7 +13,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<version>@maven-compiler-plugin.version@</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
......@@ -22,7 +22,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<version>@maven-dependency-plugin.version@</version>
<executions>
<execution>
<id>unpack</id>
......@@ -86,7 +86,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>4.1.4.RELEASE</version>
<version>@spring.version@</version>
</dependency>
</dependencies>
</project>
......@@ -14,7 +14,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<version>@maven-compiler-plugin.version@</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
......@@ -23,7 +23,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.3</version>
<version>@maven-war-plugin.version@</version>
<configuration>
<archive>
<manifest>
......@@ -39,7 +39,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>2.10</version>
<version>@maven-dependency-plugin.version@</version>
<executions>
<execution>
<id>unpack</id>
......@@ -67,22 +67,22 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>8.1.14.v20131031</version>
<version>@jetty.version@</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-plus</artifactId>
<version>8.1.14.v20131031</version>
<version>@jetty.version@</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-annotations</artifactId>
<version>8.1.14.v20131031</version>
<version>@jetty.version@</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>4.0.5.RELEASE</version>
<version>@spring.version@</version>
</dependency>
</dependencies>
</project>
......@@ -37,6 +37,9 @@
<addTestClassPath>true</addTestClassPath>
<skipInvocation>${skipTests}</skipInvocation>
<streamLogs>true</streamLogs>
<filterProperties>
</filterProperties>
</configuration>
<executions>
<execution>
......
......@@ -28,7 +28,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>@maven-jar-plugin.version@</version>
<configuration>
<archive>
<manifest>
......
......@@ -29,7 +29,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>@maven-jar-plugin.version@</version>
<configuration>
<archive>
<manifest>
......
......@@ -28,7 +28,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>@maven-jar-plugin.version@</version>
<configuration>
<archive>
<manifest>
......
......@@ -31,7 +31,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>@maven-jar-plugin.version@</version>
<configuration>
<archive>
<manifest>
......
......@@ -28,7 +28,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>@maven-jar-plugin.version@</version>
<configuration>
<archive>
<manifestEntries>
......
......@@ -33,7 +33,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>@maven-jar-plugin.version@</version>
<configuration>
<archive>
<manifestEntries>
......
......@@ -28,7 +28,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>@maven-jar-plugin.version@</version>
<configuration>
<archive>
<manifestEntries>
......@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.4.1</version>
<version>@log4j2.version@</version>
</dependency>
</dependencies>
</project>
......@@ -30,7 +30,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>@maven-jar-plugin.version@</version>
<configuration>
<archive>
<manifest>
......
......@@ -25,7 +25,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>@maven-jar-plugin.version@</version>
<configuration>
<archive>
<manifestEntries>
......
......@@ -28,7 +28,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>@maven-jar-plugin.version@</version>
<configuration>
<archive>
<manifest>
......
......@@ -25,7 +25,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>@maven-jar-plugin.version@</version>
<configuration>
<archive>
<manifestEntries>
......
......@@ -28,7 +28,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>@maven-jar-plugin.version@</version>
<configuration>
<archive>
<manifestEntries>
......
......@@ -28,7 +28,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>@maven-jar-plugin.version@</version>
<configuration>
<archive>
<manifestEntries>
......@@ -54,7 +54,7 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.4.1</version>
<version>@log4j2.version@</version>
<scope>test</scope>
</dependency>
</dependencies>
......
......@@ -33,7 +33,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>@maven-jar-plugin.version@</version>
<configuration>
<archive>
<manifestEntries>
......
......@@ -25,7 +25,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>@maven-jar-plugin.version@</version>
<configuration>
<archive>
<manifest>
......
......@@ -28,7 +28,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>@maven-jar-plugin.version@</version>
</plugin>
</plugins>
</build>
......
......@@ -28,7 +28,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<version>@maven-jar-plugin.version@</version>
<configuration>
<archive>
<manifestEntries>
......
......@@ -13,6 +13,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>@build-helper-maven-plugin.version@</version>
<executions>
<execution>
<id>reserve-jmx-port</id>
......
......@@ -13,6 +13,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>@build-helper-maven-plugin.version@</version>
<executions>
<execution>
<id>reserve-jmx-port</id>
......
......@@ -27,7 +27,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.3</version>
<version>@maven-war-plugin.version@</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
<archive>
......
......@@ -34,7 +34,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.3</version>
<version>@maven-war-plugin.version@</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
<archive>
......
......@@ -26,7 +26,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.3</version>
<version>@maven-war-plugin.version@</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
<archive>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment