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 2020/08/20 14:17:25 UTC
svn commit: r1881019 - in /jackrabbit/branches/2.16/jackrabbit-standalone:
./ pom.xml
Author: reschke
Date: Thu Aug 20 14:17:24 2020
New Revision: 1881019
URL: http://svn.apache.org/viewvc?rev=1881019&view=rev
Log:
JCR-4626: CI build fail because org.glassfish:javax.el:jar:3.0.1-b06-SNAPSHOT can't be retrieved (merged r1881011 into 2.16)
Modified:
jackrabbit/branches/2.16/jackrabbit-standalone/ (props changed)
jackrabbit/branches/2.16/jackrabbit-standalone/pom.xml
Propchange: jackrabbit/branches/2.16/jackrabbit-standalone/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Aug 20 14:17:24 2020
@@ -0,0 +1,4 @@
+/jackrabbit/branches/JCR-2272/jackrabbit-standalone:1173165-1176545
+/jackrabbit/sandbox/JCR-2415-lucene-3.0/jackrabbit-standalone:1060860-1064038
+/jackrabbit/trunk/jackrabbit-standalone:1816227,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817341,1817373,1817377,1818586,1819269,1819271,1819839,1819849,1820119,1820133,1820294,1820573,1820675,1820753,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,1839931,1839937,1839945,1839964,1839966,1840007,1840027,1841459,1841858,1841865,1841916-1841917,1841924,1843392,1843995,1844000,1844014,1844030,1844036,1844067,1844252,1846665,1846896,1847167,1850224,1851360,1851369,1851372,1851380,1851384,1851904,1851946,1851953,1851961,18524
17,1853927,1854018,1856855,1856969,1857631,1857721,1859534,1859563,1859633,1860118,1860123,1860645,1861773,1861777-1861778,1861781,1861786,1862283,1862783,1862805,1863196,1863222,1863384,1865525,1865748,1866234,1866448,1866728,1867128,1867130,1867133,1867170,1867632,1869737,1869788,1869790-1869791,1869793,1870437,1870439-1870440,1870442,1870448,1870830,1870946,1870948,1871059,1873846,1874367,1875995,1876931,1878185,1879260,1879635,1880146,1880149
+/jackrabbit/trunk/jackrabbit-standalone-components:1881011
Modified: jackrabbit/branches/2.16/jackrabbit-standalone/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.16/jackrabbit-standalone/pom.xml?rev=1881019&r1=1881018&r2=1881019&view=diff
==============================================================================
--- jackrabbit/branches/2.16/jackrabbit-standalone/pom.xml (original)
+++ jackrabbit/branches/2.16/jackrabbit-standalone/pom.xml Thu Aug 20 14:17:24 2020
@@ -113,6 +113,19 @@
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-jsp</artifactId>
+ <exclusions>
+ <exclusion>
+ <!-- https://issues.apache.org/jira/browse/JCR-4626 -->
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.el</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <!-- https://issues.apache.org/jira/browse/JCR-4626 -->
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.el</artifactId>
+ <version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>