Author: sseifert
Date: Thu Oct 1 20:33:56 2015
New Revision: 1706320
URL: http://svn.apache.org/viewvc?rev=1706320&view=rev
Log:
SLING-4824/SLING-4827 do not embed org.apache.sling.jcr.resource dependency;
it's a dependency of sling mock and not sling-mock-jackrabbit/oak and version
used should be controlled by sling-mock
Modified:
sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml
sling/trunk/testing/mocks/sling-mock-oak/pom.xml
Modified: sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml?rev=1706320&r1=1706319&r2=1706320&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock-jackrabbit/pom.xml Thu Oct 1 20:33:56
2015
@@ -134,7 +134,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.4</version>
+ <version>2.4.1</version>
<configuration>
<!--
embed all jackrabbit artifacts to prevent classpath clashes
@@ -146,7 +146,6 @@
<artifactSet>
<includes>
<include>org.apache.jackrabbit:*</include>
-
<include>org.apache.sling:org.apache.sling.jcr.resource</include>
</includes>
</artifactSet>
</configuration>
Modified: sling/trunk/testing/mocks/sling-mock-oak/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/sling-mock-oak/pom.xml?rev=1706320&r1=1706319&r2=1706320&view=diff
==============================================================================
--- sling/trunk/testing/mocks/sling-mock-oak/pom.xml (original)
+++ sling/trunk/testing/mocks/sling-mock-oak/pom.xml Thu Oct 1 20:33:56 2015
@@ -147,7 +147,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>2.4</version>
+ <version>2.4.1</version>
<configuration>
<!--
embed all jackrabbit artifacts to prevent classpath clashes
@@ -159,7 +159,6 @@
<artifactSet>
<includes>
<include>org.apache.jackrabbit:*</include>
-
<include>org.apache.sling:org.apache.sling.jcr.resource</include>
</includes>
</artifactSet>
</configuration>
