You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/05/11 19:58:57 UTC
svn commit: r1678780 - in /sling/trunk/bundles/jcr/jackrabbit-server: pom.xml
src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/jmx/StatisticsMBeanImpl.java
Author: cziegeler
Date: Mon May 11 17:58:57 2015
New Revision: 1678780
URL: http://svn.apache.org/r1678780
Log:
SLING-4709 : Update to jackrabbit 2.10.0
Modified:
sling/trunk/bundles/jcr/jackrabbit-server/pom.xml
sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/jmx/StatisticsMBeanImpl.java
Modified: sling/trunk/bundles/jcr/jackrabbit-server/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/pom.xml?rev=1678780&r1=1678779&r2=1678780&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-server/pom.xml (original)
+++ sling/trunk/bundles/jcr/jackrabbit-server/pom.xml Mon May 11 17:58:57 2015
@@ -43,7 +43,7 @@
</scm>
<properties>
- <org.apache.jackrabbit.version>2.6.5</org.apache.jackrabbit.version>
+ <org.apache.jackrabbit.version>2.10.0</org.apache.jackrabbit.version>
<org.apache.lucene.version>3.6.2</org.apache.lucene.version>
</properties>
@@ -91,6 +91,7 @@
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
+ <skip>true</skip>
<instructions>
<Bundle-Category>
sling,jcr,jackrabbit
@@ -174,7 +175,7 @@
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-api</artifactId>
- <version>2.6.5</version>
+ <version>${org.apache.jackrabbit.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -183,6 +184,12 @@
<version>${org.apache.jackrabbit.version}</version>
<scope>compile</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-data</artifactId>
+ <version>${org.apache.jackrabbit.version}</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId>
Modified: sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/jmx/StatisticsMBeanImpl.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/jmx/StatisticsMBeanImpl.java?rev=1678780&r1=1678779&r2=1678780&view=diff
==============================================================================
--- sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/jmx/StatisticsMBeanImpl.java (original)
+++ sling/trunk/bundles/jcr/jackrabbit-server/src/main/java/org/apache/sling/jcr/jackrabbit/server/impl/jmx/StatisticsMBeanImpl.java Mon May 11 17:58:57 2015
@@ -39,7 +39,7 @@ import org.apache.jackrabbit.api.stats.R
import org.apache.jackrabbit.api.stats.TimeSeries;
import org.apache.jackrabbit.core.RepositoryContext;
import org.apache.jackrabbit.core.RepositoryImpl;
-import org.apache.jackrabbit.core.stats.RepositoryStatisticsImpl;
+import org.apache.jackrabbit.stats.RepositoryStatisticsImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;