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 13:29:05 UTC
svn commit: r1881017 - in /jackrabbit/branches/2.18/jackrabbit-standalone:
./ pom.xml
Author: reschke
Date: Thu Aug 20 13:29:05 2020
New Revision: 1881017
URL: http://svn.apache.org/viewvc?rev=1881017&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.18)
Modified:
jackrabbit/branches/2.18/jackrabbit-standalone/ (props changed)
jackrabbit/branches/2.18/jackrabbit-standalone/pom.xml
Propchange: jackrabbit/branches/2.18/jackrabbit-standalone/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Aug 20 13:29:05 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:1850224,1851360,1851369,1851372,1851380,1851384,1851904,1851946,1851953,1851961,1852417,1853927,1854018,1856855,1856969,1857631,1857721,1858564,1858566,1859534,1859563,1859633,1860118,1860123,1860645,1861773,1861777-1861778,1861781,1861786,1862283,1862783,1862805,1863196,1863222,1863384,1865525,1865748,1865991,1866234,1866280,1866448,1866728,1867128,1867130,1867133,1867170,1867632,1869737,1869788,1869790-1869791,1869793,1869804,1870437,1870439-1870440,1870442,1870448,1870503,1870756,1870830,1870946,1870948,1871059,1872768,1872992,1873846,1873852,1874367,1875939,1875949,1875952,1875991,1875995-1875996,1876287,1876810,1876930-1876932,1877197,1877352,1877354-1877355,1877364-1877365,1877371,1877379,1877390-1877391,1878185,1879150,1879260,1879635,1880146,1880149
+/jackrabbit/trunk/jackrabbit-standalone-components:1881011
Modified: jackrabbit/branches/2.18/jackrabbit-standalone/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.18/jackrabbit-standalone/pom.xml?rev=1881017&r1=1881016&r2=1881017&view=diff
==============================================================================
--- jackrabbit/branches/2.18/jackrabbit-standalone/pom.xml (original)
+++ jackrabbit/branches/2.18/jackrabbit-standalone/pom.xml Thu Aug 20 13:29:05 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>