Repository: syncope Updated Branches: refs/heads/master 52bb4b309 -> d0d090981
Tomcat 9, cargo 1.6.5 and surefire / failsafe back to 2.19.1 as temporary downgrade for junit-platform-surefire-provider Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/21dff179 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/21dff179 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/21dff179 Branch: refs/heads/master Commit: 21dff17927ab0df646de8d550aaaeb386571fe45 Parents: 52bb4b3 Author: Francesco Chicchiriccò <ilgro...@apache.org> Authored: Tue Oct 24 10:46:56 2017 +0200 Committer: Francesco Chicchiriccò <ilgro...@apache.org> Committed: Tue Oct 24 10:46:56 2017 +0200 ---------------------------------------------------------------------- pom.xml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/21dff179/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index edd7463..92bc222 100644 --- a/pom.xml +++ b/pom.xml @@ -481,7 +481,7 @@ under the License. <cargo.log>${log.directory}/cargo.log</cargo.log> <cargo.output>${log.directory}/cargo-output.log</cargo.output> - <tomcat.version>8.5.23</tomcat.version> + <tomcat.version>9.0.1</tomcat.version> <phantomjs.driver.version>1.2.0</phantomjs.driver.version> <phantomjs.version>2.1.1</phantomjs.version> @@ -1795,10 +1795,10 @@ under the License. <plugin> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-maven2-plugin</artifactId> - <version>1.6.4</version> + <version>1.6.5</version> <configuration> <container> - <containerId>tomcat8x</containerId> + <containerId>tomcat9x</containerId> <zipUrlInstaller> <url>http://central.maven.org/maven2/org/apache/tomcat/tomcat/${tomcat.version}/tomcat-${tomcat.version}.zip</url> <downloadDir>${settings.localRepository}/org/codehaus/cargo/cargo-container-archives</downloadDir> @@ -1811,10 +1811,12 @@ under the License. </configuration> </plugin> + <!-- Keep the following plugins on 2.19.1 / 1.0.1 until + https://github.com/junit-team/junit5/issues/809 is properly fixed --> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.20.1</version> + <version>2.19.1</version> <configuration> <redirectTestOutputToFile>true</redirectTestOutputToFile> <encoding>utf-8</encoding> @@ -1825,14 +1827,14 @@ under the License. <dependency> <groupId>org.junit.platform</groupId> <artifactId>junit-platform-surefire-provider</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.0.1</version> </dependency> </dependencies> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <version>2.20.1</version> + <version>2.19.1</version> <configuration> <redirectTestOutputToFile>true</redirectTestOutputToFile> <encoding>utf-8</encoding> @@ -1843,7 +1845,7 @@ under the License. <dependency> <groupId>org.junit.platform</groupId> <artifactId>junit-platform-surefire-provider</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.0.1</version> </dependency> </dependencies> <executions>
