This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-testing-sling-mock-oak.git
The following commit(s) were added to refs/heads/master by this push:
new 02dc583 SLING-10972 shade and relocate Guava (#5)
02dc583 is described below
commit 02dc583452ba5841d479233ca158eddf9fa417bd
Author: Konrad Windszus <[email protected]>
AuthorDate: Tue Dec 7 09:59:01 2021 +0100
SLING-10972 shade and relocate Guava (#5)
---
pom.xml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/pom.xml b/pom.xml
index 01b4735..0f006a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -181,9 +181,18 @@
<artifactSet>
<includes>
<include>org.apache.jackrabbit:*</include>
+ <include>com.google.guava:*</include>
</includes>
</artifactSet>
<createSourcesJar>true</createSourcesJar>
+ <relocations>
+ <!-- to always use Guava 15, relocate (which does only
work for the embedded oak classes,
+ but not if others from the class path are used) -->
+ <relocation>
+ <pattern>com.google.common</pattern>
+
<shadedPattern>sling-mock-oak.com.google.common</shadedPattern>
+ </relocation>
+ </relocations>
</configuration>
<executions>
<execution>