This is an automated email from the ASF dual-hosted git repository. olli pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-clam.git
commit 7af85726d01c86053dc26ff3f773fb71dbc3f318 Author: Oliver Lietz <[email protected]> AuthorDate: Thu Aug 27 20:13:58 2020 +0200 improve Truth setup --- pom.xml | 31 +++++++++++++++++----- .../sling/clam/it/tests/ClamTestSupport.java | 6 ++++- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index be9ad83..a09dd58 100644 --- a/pom.xml +++ b/pom.xml @@ -300,12 +300,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>com.google.truth</groupId> - <artifactId>truth</artifactId> - <version>1.0.1</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId> <version>1.13.0</version> @@ -347,6 +341,31 @@ <version>2.6.2</version> <scope>test</scope> </dependency> + <!-- testing – truth and dependencies --> + <dependency> + <groupId>com.google.truth</groupId> + <artifactId>truth</artifactId> + <version>1.0</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>28.1-jre</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>failureaccess</artifactId> + <version>1.0.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.googlecode.java-diff-utils</groupId> + <artifactId>diffutils</artifactId> + <version>1.3.0</version> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/src/test/java/org/apache/sling/clam/it/tests/ClamTestSupport.java b/src/test/java/org/apache/sling/clam/it/tests/ClamTestSupport.java index bcd903e..3ca1ce9 100644 --- a/src/test/java/org/apache/sling/clam/it/tests/ClamTestSupport.java +++ b/src/test/java/org/apache/sling/clam/it/tests/ClamTestSupport.java @@ -71,6 +71,11 @@ public abstract class ClamTestSupport extends TestSupport { protected ModifiableCompositeOption baseConfiguration() { return composite( + // Truth first to prevent version issues with Guava + wrappedBundle(mavenBundle().groupId("com.google.truth").artifactId("truth").versionAsInProject()), + mavenBundle().groupId("com.google.guava").artifactId("guava").versionAsInProject(), + mavenBundle().groupId("com.google.guava").artifactId("failureaccess").versionAsInProject(), + mavenBundle().groupId("com.googlecode.java-diff-utils").artifactId("diffutils").versionAsInProject(), super.baseConfiguration(), quickstart(), // Sling Clam @@ -91,7 +96,6 @@ public abstract class ClamTestSupport extends TestSupport { awaitility(), restassured(), testcontainers(), - wrappedBundle(mavenBundle().groupId("com.google.truth").artifactId("truth").versionAsInProject()), vmOption(System.getProperty("jacoco.command")) ); }
