You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2020/01/27 15:02:34 UTC

svn commit: r1873219 - in /jackrabbit/oak/branches/1.6: ./ oak-it-osgi/pom.xml oak-it-osgi/test-bundles.xml

Author: reschke
Date: Mon Jan 27 15:02:34 2020
New Revision: 1873219

URL: http://svn.apache.org/viewvc?rev=1873219&view=rev
Log:
OAK-8813: oak-it-osgi: cover oak-solr-osgi bundle (merged r1870596 into 1.6)

Modified:
    jackrabbit/oak/branches/1.6/   (props changed)
    jackrabbit/oak/branches/1.6/oak-it-osgi/pom.xml
    jackrabbit/oak/branches/1.6/oak-it-osgi/test-bundles.xml

Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
  Merged /jackrabbit/oak/trunk:r1870596

Modified: jackrabbit/oak/branches/1.6/oak-it-osgi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-it-osgi/pom.xml?rev=1873219&r1=1873218&r2=1873219&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-it-osgi/pom.xml (original)
+++ jackrabbit/oak/branches/1.6/oak-it-osgi/pom.xml Mon Jan 27 15:02:34 2020
@@ -99,6 +99,50 @@
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>oak-solr-osgi</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>3.2.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-fileupload</groupId>
+      <artifactId>commons-fileupload</artifactId>
+      <version>1.4</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <version>1.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <scope>test</scope>
+    </dependency>
 
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>

Modified: jackrabbit/oak/branches/1.6/oak-it-osgi/test-bundles.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-it-osgi/test-bundles.xml?rev=1873219&r1=1873218&r2=1873219&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-it-osgi/test-bundles.xml (original)
+++ jackrabbit/oak/branches/1.6/oak-it-osgi/test-bundles.xml Mon Jan 27 15:02:34 2020
@@ -29,9 +29,16 @@
       <scope>test</scope>
       <includes>
         <include>javax.jcr:jcr</include>
+        <include>javax.servlet:javax.servlet-api</include>
         <include>com.google.guava:guava</include>
+        <include>org.slf4j:slf4j-api</include>
+        <include>ch.qos.logback:logback-core</include>
+        <include>ch.qos.logback:logback-classic</include>
         <include>commons-codec:commons-codec</include>
         <include>commons-io:commons-io</include>
+        <include>commons-collections:commons-collections</include>
+        <include>commons-fileupload:commons-fileupload</include>
+        <include>commons-logging:commons-logging</include>
         <include>org.apache.jackrabbit:jackrabbit-api</include>
         <include>org.apache.jackrabbit:jackrabbit-jcr-commons</include>
         <include>org.apache.jackrabbit:jackrabbit-data</include>
@@ -42,6 +49,7 @@
         <include>org.apache.jackrabbit:oak-lucene</include>
         <include>org.apache.tika:tika-core</include>
         <include>org.apache.jackrabbit:oak-blob</include>
+        <include>org.apache.jackrabbit:oak-solr-osgi</include>
       </includes>
     </dependencySet>
   </dependencySets>