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 2019/07/29 08:34:10 UTC
svn commit: r1863920 - in /jackrabbit/trunk: jackrabbit-api/
jackrabbit-core/pom.xml jackrabbit-data/pom.xml
jackrabbit-jcr-commons/pom.xml jackrabbit-jcr-rmi/pom.xml
jackrabbit-jcr2spi/pom.xml jackrabbit-parent/pom.xml
jackrabbit-spi2jcr/pom.xml pom.xml
Author: reschke
Date: Mon Jul 29 08:34:10 2019
New Revision: 1863920
URL: http://svn.apache.org/viewvc?rev=1863920&view=rev
Log:
JCR-4449: remove jackrabbit-api and use oak-jackrabbit-api instead
Removed:
jackrabbit/trunk/jackrabbit-api/
Modified:
jackrabbit/trunk/jackrabbit-core/pom.xml
jackrabbit/trunk/jackrabbit-data/pom.xml
jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml
jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml
jackrabbit/trunk/jackrabbit-jcr2spi/pom.xml
jackrabbit/trunk/jackrabbit-parent/pom.xml
jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml
jackrabbit/trunk/pom.xml
Modified: jackrabbit/trunk/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/pom.xml?rev=1863920&r1=1863919&r2=1863920&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-core/pom.xml Mon Jul 29 08:34:10 2019
@@ -243,8 +243,7 @@ org.apache.jackrabbit.test.api.query.qom
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-api</artifactId>
- <version>${project.version}</version>
+ <artifactId>oak-jackrabbit-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
Modified: jackrabbit/trunk/jackrabbit-data/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-data/pom.xml?rev=1863920&r1=1863919&r2=1863920&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-data/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-data/pom.xml Mon Jul 29 08:34:10 2019
@@ -73,8 +73,7 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-api</artifactId>
- <version>${project.version}</version>
+ <artifactId>oak-jackrabbit-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
Modified: jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml?rev=1863920&r1=1863919&r2=1863920&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr-commons/pom.xml Mon Jul 29 08:34:10 2019
@@ -63,13 +63,12 @@
<!--
optional dependency to jackrabbit api.
this is used for general API utilities that cover not only the
- JCR API but also it's extensions in jackrabbit-api such as e.g.
+ JCR API but also it's extensions in oak-jackrabbit-api such as e.g.
user management or extended access control functionality.
-->
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-api</artifactId>
- <version>${project.version}</version>
+ <artifactId>oak-jackrabbit-api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
Modified: jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml?rev=1863920&r1=1863919&r2=1863920&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr-rmi/pom.xml Mon Jul 29 08:34:10 2019
@@ -536,11 +536,10 @@ org.apache.jackrabbit.test.api.observati
<scope>provided</scope>
</dependency>
- <!-- Jackrabbit API extensions -->
+ <!-- Oak Jackrabbit API extensions -->
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-api</artifactId>
- <version>${project.version}</version>
+ <artifactId>oak-jackrabbit-api</artifactId>
<scope>provided</scope>
</dependency>
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/pom.xml?rev=1863920&r1=1863919&r2=1863920&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/pom.xml Mon Jul 29 08:34:10 2019
@@ -92,8 +92,7 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-api</artifactId>
- <version>${project.version}</version>
+ <artifactId>oak-jackrabbit-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
Modified: jackrabbit/trunk/jackrabbit-parent/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-parent/pom.xml?rev=1863920&r1=1863919&r2=1863920&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-parent/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-parent/pom.xml Mon Jul 29 08:34:10 2019
@@ -46,6 +46,7 @@
<test.opts.memory>-Xmx256m</test.opts.memory>
<test.opts.modules />
<test.opts>${test.opts.modules} ${test.opts.coverage} ${test.opts.memory} -enableassertions</test.opts>
+ <oak.version>1.16.0</oak.version>
<jetty.version>9.2.26.v20180806</jetty.version>
<tika.version>1.21</tika.version>
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
@@ -398,6 +399,11 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-jackrabbit-api</artifactId>
+ <version>${oak.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-benchmark</artifactId>
<version>1.5.0</version>
</dependency>
Modified: jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml?rev=1863920&r1=1863919&r2=1863920&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml (original)
+++ jackrabbit/trunk/jackrabbit-spi2jcr/pom.xml Mon Jul 29 08:34:10 2019
@@ -106,8 +106,7 @@ org.apache.jackrabbit.test.api.query.qom
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
- <artifactId>jackrabbit-api</artifactId>
- <version>${project.version}</version>
+ <artifactId>oak-jackrabbit-api</artifactId>
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
Modified: jackrabbit/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/pom.xml?rev=1863920&r1=1863919&r2=1863920&view=diff
==============================================================================
--- jackrabbit/trunk/pom.xml (original)
+++ jackrabbit/trunk/pom.xml Mon Jul 29 08:34:10 2019
@@ -37,7 +37,6 @@
<modules>
<module>jackrabbit-parent</module>
- <module>jackrabbit-api</module>
<module>jackrabbit-jcr-commons</module>
<module>jackrabbit-jcr-tests</module>
<module>jackrabbit-data</module>