You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2019/08/15 11:05:51 UTC
[jmeter] branch master updated: Update tika and jackson
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
The following commit(s) were added to refs/heads/master by this push:
new e5a2fe1 Update tika and jackson
e5a2fe1 is described below
commit e5a2fe131fb27302d7537bb623ba38ec87f0d50a
Author: Felix Schumacher <fe...@internetallee.de>
AuthorDate: Thu Aug 15 13:03:30 2019 +0200
Update tika and jackson
As jackson-databind now has a different release version than its sisters, we
have to introduce another property. Hopefully we can get rid of it with the next
update.
Bugzilla Id: 63655
---
checksum.properties | 6 +++---
gradle.properties | 3 ++-
src/bom/build.gradle.kts | 2 +-
xdocs/changes.xml | 4 ++--
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/checksum.properties b/checksum.properties
index 79cd1ae..19b5703 100644
--- a/checksum.properties
+++ b/checksum.properties
@@ -21,7 +21,7 @@ bsf/bsf/2.4.0=CF2FF6EA53CD13EA842CAD398F1BE24539BEC68A5CBBD088492ADAB50BC782CDE6
cglib/cglib-nodep/3.2.9=429F5E63C33F3E65615243AD24C27C86FD1ADE3C5DAA0A64F9FAF8BCE1E59ED9A6D4EDC348281CBB8FD7AE10C01FC2E3716FF74571B14A31A37DDE1DE06E2A3A
com.fasterxml.jackson.core/jackson-annotations/2.9.9=FD7E441FBB6A807B1841497BBF6B4950CA11A48FAD19B83BAD6DA691A9878A8B03F28EEF11DAC7EF160CB9535C999D7BBF49DA155C165C205AEB7DD81C111F28
com.fasterxml.jackson.core/jackson-core/2.9.9=D8BEAC9E71444BC795C9D99308EAD3284A39AA161F825708DA7DBDFCE410D099C0BBC76C31C27ADAD540CF3BCCF6826D539FCB157923EFAE84B10B3778B920A9
-com.fasterxml.jackson.core/jackson-databind/2.9.9=47204158C4ADBBC8D6659055786641EF6EC95EF6648662AD797AFACE0A3E1074C7BD4D2F565BBE5837BFD0BC06AEC2D8888415FF94A94583F5BDA644CA5004A5
+com.fasterxml.jackson.core/jackson-databind/2.9.9.3=B69ACA11BAA7E8E45A4E584ADA480465797F4722C266A1711F224F91F1051683526D59654771D83DE54A9CCE0786C5613A0256645BB73964DF9E47015AD8931B
com.fifesoft/rsyntaxtextarea/3.0.2=A210EC77304E7B0B175532BD7E5C2A46823C0D93B359E174782B548087B48A0386D3CAE566877ACFB6252E6B4F28C25DAA6B8074A55BC54A296FC4AC554B0DC1
com.github.ben-manes.caffeine/caffeine/2.6.2=6521F1BFEFCD6E2991A7D017BBA8D751C5BA4694D335B61B4E732A2B795C748532BE7A5A63107B6BB70F816CEEEA4659B77EBAC68AD02C44CD813C478F759A06
com.github.bulenkov.darcula/darcula/e208efb96f70e4be9dc362fbb46f6e181ef501dd=80F3335D8EA3FB3FF07A12A79C958C4E3F8BB542511C52825A8B3694AC96F027E24396CE9EDCEFA44EE93B5CBED4E4AED4575E6AAED56F363BAE92C52EE85D22
@@ -125,8 +125,8 @@ org.apache.rat/apache-rat-api/0.13=F12B23C33D671563E9314B8790848C71E69D4D4CFFA6B
org.apache.rat/apache-rat-core/0.13=E0788C9F3BBAEC17B5BCF5B029118254BCEA33BB9C2DB70E19B3EC76B116C53723CF2B508C3AB904A1D7302BA82FA64BFB24A027D5513B3AC9A5796CF68A4A11
org.apache.rat/apache-rat-tasks/0.13=229F74F96C74E421A37A00A57F3153FF913B77F34514003695DCA9F5D63D8D5FF429A9E055425CC925FA30328023D52812FC6BD66B5EC736B529784B20D19344
org.apache.rat/apache-rat/0.13=A51B88495D1988D6886CC04D0039FD9F6AEE77D060719239F9C5E9AF2B6D9A639E83C38E8BF4FDC632D1F0FEB87BC43FC0B345C0F2A4B7F692303898AADB2663
-org.apache.tika/tika-core/1.21=9D3131D7E5FBAB717F2590F4FE0DF161189F29490F7D3238512E68924953A136497C37B39A9260B9C6350B335670DB207FA8A45838F99D60C1E906872BDA1EDA
-org.apache.tika/tika-parsers/1.21=2728CA01817F9509912E738E65BD42F4A0296E206BFA3382C0B7EB5935A3D19C93142D4C0B589DE0BD582CF41AB54A3C374D0D7C2A9D555EBE086C7E90278ED9
+org.apache.tika/tika-core/1.22=AA529B09F0F95E755240AA85726135C90EF84F883FD59153D55263EAB7FD9B41E437F421FE70C3231A72EDBB15D71C92DE19399B4E89EF034A925F993ACED70E
+org.apache.tika/tika-parsers/1.22=9C46D891AC5B23F04F2A40643D40F0A98B2FE76864C5DEF170415834379A5DD8D2530C9F9C49C7F24E280AEA867105E334686B45D450B365649166350C662683
org.apache.velocity/velocity/1.7=E521785D947CAE1A02070B26A43D235B6319439A6364C58266D3F9C458F9A099406C10AAB5F51C5DB5BA541E88322CB35203C6758B4B8BB65F9539A345DA9A04
org.apache.xbean/xbean-spring/4.2=F6BC463D2E3A140DABD48AB99B8B99A6607611A6B448D0B08D56A7B496080B4DDAFB97808B9EE25EEAE2BE8994213FA42C74921F4169F5BB288F473E7A92463F
org.apache.xmlgraphics/xmlgraphics-commons/2.3=2914C30F5A58A1EAA19B51399EEFD30F3A4D530D19BE5A74AB0AD5D93142F13C5DDFE9FAA3E95F2632C14E18F39AA1AC3090061D32FB79A1A69AD9126F51AF0
diff --git a/gradle.properties b/gradle.properties
index fae4741..5deb1aa 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -67,6 +67,7 @@ httpcore-nio.version=4.4.11
httpcore.version=4.4.11
httpmime.version=4.5.8
jackson.version=2.9.9
+jackson-databind.version=2.9.9.3
javax.activation.version=1.2.0
jcharts.version=0.7.5
jdom.version=1.1.3
@@ -90,7 +91,7 @@ Saxon-HE.version=9.9.1-1
slf4j.version=1.7.25
spock-core.version=1.2-groovy-2.4
springframework.version=4.3.17.RELEASE
-tika.version=1.21
+tika.version=1.22
xalan.version=2.7.2
xercesImpl.version=2.12.0
xml-apis.version=1.4.01
diff --git a/src/bom/build.gradle.kts b/src/bom/build.gradle.kts
index 0790125..1222682 100644
--- a/src/bom/build.gradle.kts
+++ b/src/bom/build.gradle.kts
@@ -63,7 +63,7 @@ dependencies {
apiv("cglib:cglib-nodep")
apiv("com.fasterxml.jackson.core:jackson-annotations", "jackson")
apiv("com.fasterxml.jackson.core:jackson-core", "jackson")
- apiv("com.fasterxml.jackson.core:jackson-databind", "jackson")
+ apiv("com.fasterxml.jackson.core:jackson-databind", "jackson-databind")
apiv("com.fifesoft:rsyntaxtextarea")
apiv("com.github.ben-manes.caffeine:caffeine")
apiv("com.helger:ph-commons")
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index c7998cc..4c9b35e 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -133,8 +133,8 @@ to view the last release notes of version 5.1.1.
<ch_section>Non-functional changes</ch_section>
<ul>
- <li>Updated to tika-core and tika-parsers 1.21 (from 1.21)</li>
- <li>Updated jackson-annotations, jackson-core and jackson-databind to 2.9.9 (from 2.9.8)</li>
+ <li>Updated to tika-core and tika-parsers 1.22 (from 1.21)</li>
+ <li>Updated jackson-annotations, jackson-core and jackson-databind to 2.9.9/2.9.9.3 (from 2.9.8)</li>
<li><bug>63529</bug>Add more unit tests for org.apache.jorphan.util.JOrphanUtils. Contributed by John Bergqvist(John.Bergqvist at diffblue.com)</li>
<li>Updated to latest checkstyle (version 8.22)</li>
</ul>