Author: reschke
Date: Wed Jul 4 15:05:20 2018
New Revision: 1835061
URL: http://svn.apache.org/viewvc?rev=1835061&view=rev
Log:
OAK-7596: define jackson version globally (ported to 1.8)
Modified:
jackrabbit/oak/branches/1.8/ (props changed)
jackrabbit/oak/branches/1.8/oak-blob-cloud/pom.xml
jackrabbit/oak/branches/1.8/oak-http/pom.xml
jackrabbit/oak/branches/1.8/oak-parent/pom.xml
jackrabbit/oak/branches/1.8/oak-solr-osgi/pom.xml
Propchange: jackrabbit/oak/branches/1.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 4 15:05:20 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827472,1827486,1827977,1828439,1828529,1829527,1829534,1829546,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830171,1830197,1830748,1831157-1831158,1831163,1831374,1831560,1832258,1832376,1832379,1832535,1833308,1834610,1834648-1834649,1834823,1834857-1834858
+/jackrabbit/oak/trunk:1820660-1820661,1820729,1820734,1820859,1820861,1820878,1820888,1820947,1821027,1821130,1821140-1821141,1821178,1821237,1821240,1821249,1821258,1821325,1821358,1821361-1821362,1821370,1821375,1821393,1821477,1821487,1821516,1821617,1821663,1821665,1821668,1821681,1821847,1821975-1821983,1822121,1822201,1822207,1822527,1822723,1822808,1822850,1822934,1823135,1823163,1823169,1823172,1823655,1823669,1824196,1824198,1824253,1824255,1824896,1824962,1825065,1825362,1825381,1825442,1825448,1825466,1825470-1825471,1825475,1825523,1825525,1825561,1825619-1825621,1825651,1825654,1825992,1826079,1826090,1826096,1826237,1826338,1826516,1826532,1826551,1826560,1826638,1826640,1826730,1826932,1826957,1827472,1827486,1827977,1828439,1828529,1829527,1829534,1829546,1829569,1829854,1829864,1829987,1829998,1830019,1830160,1830171,1830197,1830748,1831157-1831158,1831163,1831374,1831560,1832258,1832376,1832379,1832535,1833308,1834610,1834648-1834649,1834681,1834823,1834857-1834858
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.8/oak-blob-cloud/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-blob-cloud/pom.xml?rev=1835061&r1=1835060&r2=1835061&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-blob-cloud/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-blob-cloud/pom.xml Wed Jul 4 15:05:20 2018
@@ -33,7 +33,6 @@
<properties>
<netty.version>4.1.17.Final</netty.version>
<aws.version>1.11.330</aws.version>
- <jackson.version>2.9.5</jackson.version>
</properties>
<build>
@@ -130,7 +129,6 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
- <version>${jackson.version}</version>
</dependency>
<!-- Netty -->
<dependency>
Modified: jackrabbit/oak/branches/1.8/oak-http/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-http/pom.xml?rev=1835061&r1=1835060&r2=1835061&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-http/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-http/pom.xml Wed Jul 4 15:05:20 2018
@@ -73,17 +73,14 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.9.5</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.9.5</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-smile</artifactId>
- <version>2.9.5</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: jackrabbit/oak/branches/1.8/oak-parent/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-parent/pom.xml?rev=1835061&r1=1835060&r2=1835061&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-parent/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-parent/pom.xml Wed Jul 4 15:05:20 2018
@@ -64,6 +64,7 @@
<h2.version>1.4.194</h2.version>
<tika.version>1.18</tika.version>
<derby.version>10.14.2.0</derby.version>
+ <jackson.version>2.9.5</jackson.version>
<java.version>1.8</java.version>
<java.version.signature>java18</java.version.signature>
@@ -622,6 +623,26 @@
<artifactId>metrics-core</artifactId>
<version>3.2.3</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-smile</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: jackrabbit/oak/branches/1.8/oak-solr-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.8/oak-solr-osgi/pom.xml?rev=1835061&r1=1835060&r2=1835061&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.8/oak-solr-osgi/pom.xml (original)
+++ jackrabbit/oak/branches/1.8/oak-solr-osgi/pom.xml Wed Jul 4 15:05:20 2018
@@ -251,13 +251,11 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.9.5</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-smile</artifactId>
- <version>2.9.5</version>
<scope>runtime</scope>
</dependency>
<dependency>
