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/05/16 11:52:08 UTC
svn commit: r1831704 - in /jackrabbit/branches/2.16: ./
jackrabbit-jcr-server/pom.xml
Author: reschke
Date: Wed May 16 11:52:08 2018
New Revision: 1831704
URL: http://svn.apache.org/viewvc?rev=1831704&view=rev
Log:
JCR-4262: jcr-server: align org.apache.felix.scr.annotations with oak (ported to 2.16)
Modified:
jackrabbit/branches/2.16/ (props changed)
jackrabbit/branches/2.16/jackrabbit-jcr-server/pom.xml
Propchange: jackrabbit/branches/2.16/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 16 11:52:08 2018
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1816227,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817341,1817373,1817377,1818586,1819269,1819271,1819839,1819849,1820119,1820133,1820294,1820573,1820675,1821247,1821475,1821597,1821705,1821880,1822643,1822863,1822947,1822950,1824756,1824876,1826154,1826178,1826230,1826647,1826940,1826964
+/jackrabbit/trunk:1816227,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817341,1817373,1817377,1818586,1819269,1819271,1819839,1819849,1820119,1820133,1820294,1820573,1820675,1821247,1821475,1821597,1821705,1821880,1822643,1822863,1822947,1822950,1824756,1824763,1824876,1826154,1826178,1826230,1826647,1826940,1826964
Modified: jackrabbit/branches/2.16/jackrabbit-jcr-server/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-jcr-server/pom.xml?rev=1831704&r1=1831703&r2=1831704&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-jcr-server/pom.xml (original)
+++ jackrabbit/branches/2.16/jackrabbit-jcr-server/pom.xml Wed May 16 11:52:08 2018
@@ -220,7 +220,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.9.2</version>
+ <version>1.9.6</version>
<scope>provided</scope>
</dependency>
<dependency>