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 md...@apache.org on 2014/06/30 13:19:37 UTC
svn commit: r1606688 - in /jackrabbit/oak/trunk: oak-commons/
oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/mk/
oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/mk/
oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/ oak-c...
Author: mduerig
Date: Mon Jun 30 11:19:36 2014
New Revision: 1606688
URL: http://svn.apache.org/r1606688
Log:
OAK-1327: Cleanup NodeStore and MK implementations
Move MicroKernelInputStream to oak-commons to reduce code duplication and dependencies on oak-mk
Added:
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/mk/
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/mk/MicroKernelInputStream.java
- copied, changed from r1606675, jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/MicroKernelInputStream.java
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/mk/
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/mk/MicroKernelInputStreamTest.java
- copied, changed from r1606675, jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/util/MicroKernelInputStreamTest.java
Removed:
jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/MicroKernelInputStream.java
jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/util/MicroKernelInputStreamTest.java
Modified:
jackrabbit/oak/trunk/oak-commons/pom.xml
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelBlob.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKWriteTest.java
jackrabbit/oak/trunk/oak-it/mk/pom.xml
jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/DataStoreIT.java
jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java
jackrabbit/oak/trunk/oak-it/osgi/pom.xml
jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml
jackrabbit/oak/trunk/oak-mk-remote/pom.xml
jackrabbit/oak/trunk/oak-mk-remote/src/main/java/org/apache/jackrabbit/mk/server/MicroKernelServlet.java
jackrabbit/oak/trunk/oak-run/pom.xml
jackrabbit/oak/trunk/oak-solr-core/pom.xml
Modified: jackrabbit/oak/trunk/oak-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/pom.xml?rev=1606688&r1=1606687&r2=1606688&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-commons/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-commons/pom.xml Mon Jun 30 11:19:36 2014
@@ -88,8 +88,13 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-mk-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
- <!-- Test dependencies -->
+ <!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Copied: jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/mk/MicroKernelInputStream.java (from r1606675, jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/MicroKernelInputStream.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/mk/MicroKernelInputStream.java?p2=jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/mk/MicroKernelInputStream.java&p1=jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/MicroKernelInputStream.java&r1=1606675&r2=1606688&rev=1606688&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/main/java/org/apache/jackrabbit/mk/util/MicroKernelInputStream.java (original)
+++ jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/mk/MicroKernelInputStream.java Mon Jun 30 11:19:36 2014
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.mk.util;
-
-import org.apache.jackrabbit.mk.api.MicroKernel;
-import org.apache.jackrabbit.oak.commons.IOUtils;
+package org.apache.jackrabbit.oak.commons.mk;
import java.io.IOException;
import java.io.InputStream;
+import org.apache.jackrabbit.mk.api.MicroKernel;
+import org.apache.jackrabbit.oak.commons.IOUtils;
+
/**
* An input stream to simplify reading a blob from a {@code MicroKernel}.
*/
Copied: jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/mk/MicroKernelInputStreamTest.java (from r1606675, jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/util/MicroKernelInputStreamTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/mk/MicroKernelInputStreamTest.java?p2=jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/mk/MicroKernelInputStreamTest.java&p1=jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/util/MicroKernelInputStreamTest.java&r1=1606675&r2=1606688&rev=1606688&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk/src/test/java/org/apache/jackrabbit/mk/util/MicroKernelInputStreamTest.java (original)
+++ jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/mk/MicroKernelInputStreamTest.java Mon Jun 30 11:19:36 2014
@@ -11,27 +11,34 @@
* KIND, either express or implied. See the License for the specific language
* governing permissions and limitations under the License.
*/
-package org.apache.jackrabbit.mk.util;
+package org.apache.jackrabbit.oak.commons.mk;
-import org.apache.jackrabbit.mk.api.MicroKernel;
-import org.apache.jackrabbit.mk.core.MicroKernelImpl;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Map;
import java.util.Random;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import javax.annotation.Nonnull;
+
+import com.google.common.collect.Maps;
+import com.google.common.io.ByteStreams;
+import org.apache.jackrabbit.mk.api.MicroKernel;
+import org.apache.jackrabbit.mk.api.MicroKernelException;
+import org.apache.jackrabbit.oak.commons.IOUtils;
+import org.junit.Test;
/**
* Tests the {@code MicroKernelInputStream}.
*/
public class MicroKernelInputStreamTest {
- MicroKernel mk = new MicroKernelImpl();
+ MicroKernel mk = new MockMicroKernel();
@Test
public void small() throws IOException {
@@ -145,4 +152,127 @@ public class MicroKernelInputStreamTest
assertByteArrayEquals(expectedData, expectedLen, got);
}
+ //------------------------------------------------------------< MockMicroKernel >---
+
+ private static class MockMicroKernel implements MicroKernel {
+ private final Map<String, byte[]> streams = Maps.newHashMap();
+
+ @Override
+ public String getHeadRevision() throws MicroKernelException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Nonnull
+ @Override
+ public String checkpoint(long lifetime) throws MicroKernelException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getRevisionHistory(long since, int maxEntries, String path) throws MicroKernelException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String waitForCommit(String oldHeadRevisionId, long timeout) throws MicroKernelException, InterruptedException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getJournal(String fromRevisionId, String toRevisionId, String path) throws MicroKernelException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String diff(String fromRevisionId, String toRevisionId, String path, int depth) throws MicroKernelException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean nodeExists(String path, String revisionId) throws MicroKernelException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public long getChildNodeCount(String path, String revisionId) throws MicroKernelException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getNodes(String path, String revisionId, int depth, long offset, int maxChildNodes, String filter) throws MicroKernelException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String commit(String path, String jsonDiff, String revisionId, String message) throws MicroKernelException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String branch(String trunkRevisionId) throws MicroKernelException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String merge(String branchRevisionId, String message) throws MicroKernelException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Nonnull
+ @Override
+ public String rebase(@Nonnull String branchRevisionId, String newBaseRevisionId) throws MicroKernelException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Nonnull
+ @Override
+ public String reset(@Nonnull String branchRevisionId, @Nonnull String ancestorRevisionId) throws MicroKernelException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public long getLength(String blobId) throws MicroKernelException {
+ byte[] data = streams.get(blobId);
+ if (data == null) {
+ throw new MicroKernelException("No such blob:" + blobId);
+ } else {
+ return data.length;
+ }
+ }
+
+ @Override
+ public int read(String blobId, long pos, byte[] buff, int off, int length) throws MicroKernelException {
+ byte[] data = streams.get(blobId);
+ if (data == null) {
+ throw new MicroKernelException("No such blob:" + blobId);
+ } else {
+ try {
+ InputStream stream = new ByteArrayInputStream(data);
+ try {
+ ByteStreams.skipFully(stream, pos);
+ return stream.read(buff, off, length);
+ } finally {
+ stream.close();
+ }
+ } catch (IOException e) {
+ throw new MicroKernelException("Failed to read a blob", e);
+ }
+ }
+ }
+
+ @Override
+ public String write(InputStream in) throws MicroKernelException {
+ try {
+ byte[] data = ByteStreams.toByteArray(in);
+ String id = String.valueOf(Arrays.hashCode(data));
+ streams.put(id, data);
+ return id;
+ } catch (IOException e) {
+ throw new MicroKernelException(e);
+ } finally {
+ IOUtils.closeQuietly(in);
+ }
+ }
+ }
+
}
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelBlob.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelBlob.java?rev=1606688&r1=1606687&r2=1606688&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelBlob.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/kernel/KernelBlob.java Mon Jun 30 11:19:36 2014
@@ -16,11 +16,12 @@
*/
package org.apache.jackrabbit.oak.kernel;
-import java.io.IOException;
import java.io.InputStream;
+
import javax.annotation.Nonnull;
import org.apache.jackrabbit.mk.api.MicroKernel;
+import org.apache.jackrabbit.oak.commons.mk.MicroKernelInputStream;
import org.apache.jackrabbit.oak.plugins.memory.AbstractBlob;
/**
@@ -90,53 +91,4 @@ public class KernelBlob extends Abstract
return super.equals(other);
}
-
- private static class MicroKernelInputStream extends InputStream {
-
- private final MicroKernel mk;
- private final String id;
- private long pos;
- private long length = -1;
- private byte[] oneByteBuff;
-
- public MicroKernelInputStream(MicroKernel mk, String id) {
- this.mk = mk;
- this.id = id;
- }
-
- @Override
- public long skip(long n) {
- if (n < 0) {
- return 0;
- }
- if (length == -1) {
- length = mk.getLength(id);
- }
- n = Math.min(n, length - pos);
- pos += n;
- return n;
- }
-
- @Override
- public int read(byte[] b, int off, int len) {
- int l = mk.read(id, pos, b, off, len);
- if (l < 0) {
- return l;
- }
- pos += l;
- return l;
- }
-
- @Override
- public int read() throws IOException {
- if (oneByteBuff == null) {
- oneByteBuff = new byte[1];
- }
- int len = read(oneByteBuff, 0, 1);
- if (len < 0) {
- return len;
- }
- return oneByteBuff[0] & 0xff;
- }
- }
}
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadTest.java?rev=1606688&r1=1606687&r2=1606688&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKReadTest.java Mon Jun 30 11:19:36 2014
@@ -21,7 +21,7 @@ import java.util.Arrays;
import junit.framework.Assert;
-import org.apache.jackrabbit.mk.util.MicroKernelInputStream;
+import org.apache.jackrabbit.oak.commons.mk.MicroKernelInputStream;
import org.apache.jackrabbit.oak.plugins.document.AbstractMongoConnectionTest;
import org.junit.Test;
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKWriteTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKWriteTest.java?rev=1606688&r1=1606687&r2=1606688&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKWriteTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/blob/DocumentMKWriteTest.java Mon Jun 30 11:19:36 2014
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertTru
import java.io.ByteArrayInputStream;
import java.util.Arrays;
-import org.apache.jackrabbit.mk.util.MicroKernelInputStream;
+import org.apache.jackrabbit.oak.commons.mk.MicroKernelInputStream;
import org.apache.jackrabbit.oak.plugins.document.AbstractMongoConnectionTest;
import org.junit.Test;
Modified: jackrabbit/oak/trunk/oak-it/mk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/pom.xml?rev=1606688&r1=1606687&r2=1606688&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/mk/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/mk/pom.xml Mon Jun 30 11:19:36 2014
@@ -70,11 +70,6 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-mk</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-core</artifactId>
<version>${project.version}</version>
</dependency>
Modified: jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/DataStoreIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/DataStoreIT.java?rev=1606688&r1=1606687&r2=1606688&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/DataStoreIT.java (original)
+++ jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/DataStoreIT.java Mon Jun 30 11:19:36 2014
@@ -22,7 +22,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.Random;
import junit.framework.Assert;
-import org.apache.jackrabbit.mk.util.MicroKernelInputStream;
+import org.apache.jackrabbit.oak.commons.mk.MicroKernelInputStream;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
Modified: jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java?rev=1606688&r1=1606687&r2=1606688&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java (original)
+++ jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java Mon Jun 30 11:19:36 2014
@@ -34,7 +34,7 @@ import java.util.Set;
import org.apache.jackrabbit.mk.api.MicroKernelException;
import org.apache.jackrabbit.mk.test.util.TestInputStream;
-import org.apache.jackrabbit.mk.util.MicroKernelInputStream;
+import org.apache.jackrabbit.oak.commons.mk.MicroKernelInputStream;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.junit.Test;
Modified: jackrabbit/oak/trunk/oak-it/osgi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/osgi/pom.xml?rev=1606688&r1=1606687&r2=1606688&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/osgi/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-it/osgi/pom.xml Mon Jun 30 11:19:36 2014
@@ -83,12 +83,6 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-mk</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-mk-remote</artifactId>
<version>${project.version}</version>
<scope>test</scope>
Modified: jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml?rev=1606688&r1=1606687&r2=1606688&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml (original)
+++ jackrabbit/oak/trunk/oak-it/osgi/test-bundles.xml Mon Jun 30 11:19:36 2014
@@ -36,7 +36,6 @@
<include>org.apache.jackrabbit:jackrabbit-jcr-commons</include>
<include>org.apache.jackrabbit:oak-commons</include>
<include>org.apache.jackrabbit:oak-mk-api</include>
- <include>org.apache.jackrabbit:oak-mk</include>
<include>org.apache.jackrabbit:oak-mk-remote</include>
<include>org.apache.jackrabbit:oak-core</include>
<include>org.apache.jackrabbit:oak-jcr</include>
Modified: jackrabbit/oak/trunk/oak-mk-remote/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk-remote/pom.xml?rev=1606688&r1=1606687&r2=1606688&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk-remote/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-mk-remote/pom.xml Mon Jun 30 11:19:36 2014
@@ -75,10 +75,10 @@
<scope>provided</scope>
</dependency>
- <!-- mk dependency -->
+ <!-- mk-api dependency -->
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-mk</artifactId>
+ <artifactId>oak-mk-api</artifactId>
<version>${project.version}</version>
</dependency>
Modified: jackrabbit/oak/trunk/oak-mk-remote/src/main/java/org/apache/jackrabbit/mk/server/MicroKernelServlet.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-mk-remote/src/main/java/org/apache/jackrabbit/mk/server/MicroKernelServlet.java?rev=1606688&r1=1606687&r2=1606688&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-mk-remote/src/main/java/org/apache/jackrabbit/mk/server/MicroKernelServlet.java (original)
+++ jackrabbit/oak/trunk/oak-mk-remote/src/main/java/org/apache/jackrabbit/mk/server/MicroKernelServlet.java Mon Jun 30 11:19:36 2014
@@ -26,7 +26,7 @@ import java.util.Map;
import org.apache.jackrabbit.mk.api.MicroKernel;
import org.apache.jackrabbit.mk.api.MicroKernelException;
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
-import org.apache.jackrabbit.mk.util.MicroKernelInputStream;
+import org.apache.jackrabbit.oak.commons.mk.MicroKernelInputStream;
import org.apache.jackrabbit.oak.commons.IOUtils;
/**
Modified: jackrabbit/oak/trunk/oak-run/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/pom.xml?rev=1606688&r1=1606687&r2=1606688&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-run/pom.xml Mon Jun 30 11:19:36 2014
@@ -190,6 +190,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-mk</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<version>${h2.version}</version>
@@ -230,6 +235,11 @@
<version>1.8</version>
</dependency>
<dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<version>${jetty.version}</version>
Modified: jackrabbit/oak/trunk/oak-solr-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/pom.xml?rev=1606688&r1=1606687&r2=1606688&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-solr-core/pom.xml Mon Jun 30 11:19:36 2014
@@ -212,12 +212,6 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>oak-mk-api</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
<version>${jackrabbit.version}</version>
</dependency>