Author: reschke
Date: Wed Sep 21 07:49:13 2016
New Revision: 1761691

URL: http://svn.apache.org/viewvc?rev=1761691&view=rev
Log:
OAK-4583: RDB*Store: update Tomcat JDBC pool dependency (ported to 1.4)

Modified:
    jackrabbit/oak/branches/1.4/   (props changed)
    jackrabbit/oak/branches/1.4/oak-core/pom.xml
    jackrabbit/oak/branches/1.4/oak-it/pom.xml
    jackrabbit/oak/branches/1.4/oak-jcr/pom.xml
    jackrabbit/oak/branches/1.4/oak-parent/pom.xml
    jackrabbit/oak/branches/1.4/oak-remote/pom.xml
    jackrabbit/oak/branches/1.4/oak-run/pom.xml
    jackrabbit/oak/branches/1.4/oak-upgrade/pom.xml

Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 21 07:49:13 2016
@@ -1,3 +1,3 @@
 /jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740360,1740625-1740626,1740774,1740837,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457,1750462,1750465,1750495,1750626,1750809,1750886
 
,1751410,1751445-1751446,1751478,1751755,1751871,1752198,1752202,1752273-1752274,1752438,1752447,1752508,1752616,1752659,1752672,1753262,1753331-1753332,1753355,1753444,1754117,1754239,1755157,1756520,1756580,1757119,1757166,1760340,1760373,1760387,1760661-1760662,1761412,1761444
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740360,1740625-1740626,1740774,1740837,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457,1750462,1750465,1750495,1750626,1750809,1750886
 
,1751410,1751445-1751446,1751478,1751755,1751871,1752198,1752202,1752273-1752274,1752438,1752447,1752508,1752616,1752659,1752672,1753262,1753331-1753332,1753355,1753444,1754117,1754239,1755157,1756520,1756580,1757119,1757166,1760340,1760373,1760387,1760661-1760662,1761412,1761444,1761571
 /jackrabbit/trunk:1345480

Modified: jackrabbit/oak/branches/1.4/oak-core/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/pom.xml?rev=1761691&r1=1761690&r2=1761691&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-core/pom.xml Wed Sep 21 07:49:13 2016
@@ -338,7 +338,6 @@
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-jdbc</artifactId>
-      <version>7.0.69</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: jackrabbit/oak/branches/1.4/oak-it/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-it/pom.xml?rev=1761691&r1=1761690&r2=1761691&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-it/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-it/pom.xml Wed Sep 21 07:49:13 2016
@@ -100,7 +100,6 @@
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-jdbc</artifactId>
-            <version>7.0.64</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: jackrabbit/oak/branches/1.4/oak-jcr/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-jcr/pom.xml?rev=1761691&r1=1761690&r2=1761691&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-jcr/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-jcr/pom.xml Wed Sep 21 07:49:13 2016
@@ -354,7 +354,6 @@
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-jdbc</artifactId>
-      <version>7.0.64</version>
       <scope>test</scope>
     </dependency>
     <dependency>

Modified: jackrabbit/oak/branches/1.4/oak-parent/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-parent/pom.xml?rev=1761691&r1=1761690&r2=1761691&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-parent/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-parent/pom.xml Wed Sep 21 07:49:13 2016
@@ -569,6 +569,11 @@
         <artifactId>commons-math3</artifactId>
         <version>3.2</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.tomcat</groupId>
+        <artifactId>tomcat-jdbc</artifactId>
+        <version>7.0.72</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

Modified: jackrabbit/oak/branches/1.4/oak-remote/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-remote/pom.xml?rev=1761691&r1=1761690&r2=1761691&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-remote/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-remote/pom.xml Wed Sep 21 07:49:13 2016
@@ -188,7 +188,6 @@
         <dependency>
             <groupId>org.apache.tomcat</groupId>
             <artifactId>tomcat-jdbc</artifactId>
-            <version>7.0.64</version>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: jackrabbit/oak/branches/1.4/oak-run/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-run/pom.xml?rev=1761691&r1=1761690&r2=1761691&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-run/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-run/pom.xml Wed Sep 21 07:49:13 2016
@@ -289,7 +289,6 @@
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-jdbc</artifactId>
-      <version>7.0.64</version>
     </dependency>
     <dependency>
       <groupId>com.h2database</groupId>

Modified: jackrabbit/oak/branches/1.4/oak-upgrade/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-upgrade/pom.xml?rev=1761691&r1=1761690&r2=1761691&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-upgrade/pom.xml (original)
+++ jackrabbit/oak/branches/1.4/oak-upgrade/pom.xml Wed Sep 21 07:49:13 2016
@@ -114,7 +114,6 @@
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-jdbc</artifactId>
-      <version>7.0.64</version>
     </dependency>
 
     <!-- Logging -->


Reply via email to