Author: reschke
Date: Fri Jun 14 13:23:27 2019
New Revision: 1861343
URL: http://svn.apache.org/viewvc?rev=1861343&view=rev
Log:
OAK-8341: Include tomcat-jdbc/juli in oak-run (ported to 1.10)
Modified:
jackrabbit/oak/branches/1.10/ (props changed)
jackrabbit/oak/branches/1.10/oak-parent/pom.xml
jackrabbit/oak/branches/1.10/oak-run/pom.xml
Propchange: jackrabbit/oak/branches/1.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 14 13:23:27 2019
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853083,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1855993,1856049,1856056,1856538,1856545,1857000,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857463,1857480,1857577,1857589,1857592,1857634-1857635,1857638,1857640,1857687,1857936,1858032,1858053,1858123,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1858931,1859231,1859292,1859294,1859533,1859609,1859612,1859619,1859711,1859716,1859776,1859780,1859843,1859854,1859881,1860120,1860131,1860137,1860202
,1860278,1860328,1860330,1860355,1860393,1860442,1860548,1860564-1860565
+/jackrabbit/oak/trunk:1850874,1850882,1851236,1851253,1851451,1851533-1851535,1851619,1852052,1852084,1852120,1852135,1852451,1852492-1852493,1852528,1852582,1852584,1852601,1852920,1853083,1853141,1853229,1853393,1853429,1853433,1853441,1853866,1853868,1853870,1853893,1853969,1853997,1854034,1854044,1854055,1854058,1854113,1854373,1854377,1854380,1854385,1854401,1854403,1854455,1854461-1854462,1854466,1854468,1854515,1854533,1854539,1854701,1854773-1854774,1854827,1854848,1854859,1854930,1854990-1854991,1855032,1855221,1855477-1855478,1855776,1855993,1856049,1856056,1856538,1856545,1857000,1857010,1857104,1857159,1857212,1857221,1857238,1857247,1857253,1857294,1857314,1857463,1857480,1857577,1857589,1857592,1857634-1857635,1857638,1857640,1857687,1857936,1858032,1858053,1858123,1858139,1858385,1858424,1858571,1858578,1858810,1858926,1858931,1859231,1859292,1859294,1859533,1859609,1859612,1859619,1859711,1859716,1859772,1859776,1859780,1859843,1859854,1859881,1860120,1860131,1860137
,1860202,1860278,1860328,1860330,1860355,1860393,1860442,1860548,1860564-1860565
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.10/oak-parent/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-parent/pom.xml?rev=1861343&r1=1861342&r2=1861343&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-parent/pom.xml (original)
+++ jackrabbit/oak/branches/1.10/oak-parent/pom.xml Fri Jun 14 13:23:27 2019
@@ -632,6 +632,11 @@
<version>8.5.41</version>
</dependency>
<dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ <version>8.5.41</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.jaas</artifactId>
<version>1.0.2</version>
Modified: jackrabbit/oak/branches/1.10/oak-run/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.10/oak-run/pom.xml?rev=1861343&r1=1861342&r2=1861343&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.10/oak-run/pom.xml (original)
+++ jackrabbit/oak/branches/1.10/oak-run/pom.xml Fri Jun 14 13:23:27 2019
@@ -367,6 +367,17 @@
<artifactId>joda-time</artifactId>
<version>2.8.1</version>
</dependency>
+
+ <!-- RDB support -->
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jdbc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-juli</artifactId>
+ </dependency>
+
<!-- Nullability annotations -->
<dependency>
<groupId>org.jetbrains</groupId>
