Author: olli Date: Fri Jan 13 13:10:21 2017 New Revision: 1778581 URL: http://svn.apache.org/viewvc?rev=1778581&view=rev Log: SLING-6459 Upgrade Jackrabbit to 2.14.0
add missing dependencies (temporarily) Modified: sling/trunk/bundles/jcr/oak-server/pom.xml sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java Modified: sling/trunk/bundles/jcr/oak-server/pom.xml URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/pom.xml?rev=1778581&r1=1778580&r2=1778581&view=diff ============================================================================== --- sling/trunk/bundles/jcr/oak-server/pom.xml (original) +++ sling/trunk/bundles/jcr/oak-server/pom.xml Fri Jan 13 13:10:21 2017 @@ -286,6 +286,19 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore-osgi</artifactId> + <version>4.4.5</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient-osgi</artifactId> + <version>4.5.2</version> + <scope>test</scope> + </dependency> + </dependencies> </project> Modified: sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java?rev=1778581&r1=1778580&r2=1778581&view=diff ============================================================================== --- sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java (original) +++ sling/trunk/bundles/jcr/oak-server/src/test/java/org/apache/sling/jcr/oak/server/it/OakServerTestSupport.java Fri Jan 13 13:10:21 2017 @@ -188,6 +188,10 @@ public abstract class OakServerTestSuppo slingJcr(), jackrabbitSling(), tikaSling(), + + mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpcore-osgi").versionAsInProject(), + mavenBundle().groupId("org.apache.httpcomponents").artifactId("httpclient-osgi").versionAsInProject(), + mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-core").version(SlingOptions.versionResolver), mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-commons").version(SlingOptions.versionResolver), mavenBundle().groupId("org.apache.jackrabbit").artifactId("oak-blob").version(SlingOptions.versionResolver),