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/10/05 12:53:05 UTC

svn commit: r1842906 - in /jackrabbit/branches/2.16: ./ jackrabbit-jcr-server/pom.xml jackrabbit-jcr-server/src/main/resources/OSGI-INF/l10n/ jackrabbit-jcr-server/src/main/resources/OSGI-INF/metatype/

Author: reschke
Date: Fri Oct  5 12:53:04 2018
New Revision: 1842906

URL: http://svn.apache.org/viewvc?rev=1842906&view=rev
Log:
JCR-4360: update maven-scr-plugin to 1.26.0 (ported to 2.16)

Added:
    jackrabbit/branches/2.16/jackrabbit-jcr-server/src/main/resources/OSGI-INF/l10n/
      - copied from r1839924, jackrabbit/trunk/jackrabbit-jcr-server/src/main/resources/OSGI-INF/l10n/
Removed:
    jackrabbit/branches/2.16/jackrabbit-jcr-server/src/main/resources/OSGI-INF/metatype/
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 Fri Oct  5 12:53:04 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,1824763-1824764,1824771,1824876,1826154,1826178,1826230,1826647,1826940,1826964,1828213,1830107,1830201,1830540,1830753,1830814,1830878,1830951,1831182,1831854,1831860,1832058,1832090,1832177,1833374,1833835,1833891,1834008,1834308,1834315,1834401,1834418,1834424,1834673,1834922,1835445,1835448,1835459,1836341,1836349,1836620,1836722,1836729,1836731,1836733,1836773,1836776,1836778,1836794,1836800,1839647,1839910
+/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-1824764,1824771,1824876,1826154,1826178,1826230,1826647,1826940,1826964,1828213,1830107,1830201,1830540,1830753,1830814,1830878,1830951,1831182,1831854,1831860,1832058,1832090,1832177,1833374,1833835,1833891,1834008,1834308,1834315,1834401,1834418,1834424,1834673,1834922,1835445,1835448,1835459,1836341,1836349,1836620,1836722,1836729,1836731,1836733,1836773,1836776,1836778,1836794,1836800,1839647,1839910,1839924

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=1842906&r1=1842905&r2=1842906&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-jcr-server/pom.xml (original)
+++ jackrabbit/branches/2.16/jackrabbit-jcr-server/pom.xml Fri Oct  5 12:53:04 2018
@@ -55,7 +55,7 @@
       <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-scr-plugin</artifactId>
-        <version>1.24.0</version>
+        <version>1.26.0</version>
         <executions>
             <execution>
               <id>generate-scr-scrdescriptor</id>