You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2018/06/28 15:25:15 UTC
svn commit: r1834618 - in /jackrabbit/branches/2.8: ./
jackrabbit-webapp/pom.xml
jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/BackwardsCompatibilityIT.java
Author: reschke
Date: Thu Jun 28 15:25:15 2018
New Revision: 1834618
URL: http://svn.apache.org/viewvc?rev=1834618&view=rev
Log:
JCR-3861: JCR-3861: Update Oak dependency in webapp to 1.0.12 (ported to 2.8)
Modified:
jackrabbit/branches/2.8/ (props changed)
jackrabbit/branches/2.8/jackrabbit-webapp/pom.xml
jackrabbit/branches/2.8/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/BackwardsCompatibilityIT.java
Propchange: jackrabbit/branches/2.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 28 15:25:15 2018
@@ -2,4 +2,4 @@
/jackrabbit/branches/2.14:1813154
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1615997,1625561,1627529,1634584,1653275,1667787,1674859,1680757,1709811,1717599,1729382,1730696,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775657,1779166,1779460,1780208,1786325,1787043,1787381,1792100,1792105,1792113,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1810108,1811667,1812994,1814831,1817097-1817098,1817100,1818586,1819269,1820133,1821597,1822947,1822950,1826230,1826647,1826940,1826964,1833374
+/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1615997,1625561,1627529,1634584,1653275,1667787,1667795,1674859,1680757,1709811,1717599,1729382,1730696,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775657,1779166,1779460,1780208,1786325,1787043,1787381,1792100,1792105,1792113,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1810108,1811667,1812994,1814831,1817097-1817098,1817100,1818586,1819269,1820133,1821597,1822947,1822950,1826230,1826647,1826940,1826964,1833374
Modified: jackrabbit/branches/2.8/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-webapp/pom.xml?rev=1834618&r1=1834617&r2=1834618&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/branches/2.8/jackrabbit-webapp/pom.xml Thu Jun 28 15:25:15 2018
@@ -35,7 +35,7 @@
<description>Web application that hosts and serves a Jackrabbit content repository</description>
<properties>
- <oak.version>0.15</oak.version>
+ <oak.version>1.0.12</oak.version>
<tomcat.version>7.0.82</tomcat.version>
</properties>
@@ -98,6 +98,11 @@
<version>${tomcat.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ <version>1.1</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>
Modified: jackrabbit/branches/2.8/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/BackwardsCompatibilityIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/BackwardsCompatibilityIT.java?rev=1834618&r1=1834617&r2=1834618&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/BackwardsCompatibilityIT.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/BackwardsCompatibilityIT.java Thu Jun 28 15:25:15 2018
@@ -47,10 +47,9 @@ import org.apache.derby.jdbc.EmbeddedDri
import org.apache.jackrabbit.core.RepositoryImpl;
import org.apache.jackrabbit.core.SessionImpl;
import org.apache.jackrabbit.core.config.RepositoryConfig;
-import org.apache.jackrabbit.mk.core.MicroKernelImpl;
import org.apache.jackrabbit.oak.Oak;
import org.apache.jackrabbit.oak.jcr.Jcr;
-import org.apache.jackrabbit.oak.kernel.KernelNodeStore;
+import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.upgrade.RepositoryUpgrade;
import org.slf4j.Logger;
@@ -80,7 +79,7 @@ public class BackwardsCompatibilityIT ex
log.info("Testing backwards compatibility with {}", dir);
checkJackrabbitRepository(dir);
- NodeStore store = new KernelNodeStore(new MicroKernelImpl());
+ NodeStore store = new SegmentNodeStore();
RepositoryUpgrade.copy(dir, store);
checkRepositoryContent(
new Jcr(new Oak(store)).createRepository());