Skip to content
This repository was archived by the owner on May 5, 2021. It is now read-only.

Commit bc84282

Browse files
author
Stefan Kock
committed
SORMAS-Foundation#3584: Updated several dependencies
1. com.google.guava:guava 19.0 -> 30.0-jre | 30.0-android 2. com.googlecode.libphonenumber:libphonenumber 8.12.11 -> 8.12.14 3. com.sun.xml.fastinfoset:FastInfoset 1.2.15 -> 1.2.18 4. com.vaadin:vaadin-* 8.11.1 -> 8.12.1 5. com.vladmihalcea:hibernate-types-52 2.9.13 -> 2.10.0 6. org.hibernate:hibernate-core 5.4.18.Final -> 5.4.25.Final 7. commons-beanutils:commons-beanutils 1.9.2 -> 1.9.4 8. commons-codec:commons-codec 1.9 -> 1.15 9. commons-validator:commons-validator 1.6 -> 1.7 10. io.swagger.core.v3:swagger-jaxrs2 2.1.2 -> 2.1.6 11. joda-time:joda-time 2.9.4 -> 2.10.8 12. junit:junit 4.12 -> 4.13.1 13. org.apache.commons:commons-lang3 3.10 -> 3.11 14. org.apache.geronimo.config:geronimo-config-impl 1.0 -> 1.2.2 15. org.apache.httpcomponents:httpclient 4.5.4 -> 4.5.13 16. org.apache.httpcomponents:httpcore 4.4.1 -> 4.4.14 17. org.bouncycastle:* 1.66 -> 1.67 18. org.freemarker:freemarker 2.3.20 -> 2.3.30 19. org.geotools:gt-shapefile 21.4 -> 21.5 20. org.glassfish.jaxb:jaxb-runtime 2.3.1 -> 2.3.3 21. org.glassfish.jaxb:txw2 2.3.1 -> 2.3.3 22. org.hibernate.validator:hibernate-validator 6.1.5.Final -> 6.1.6.Final 23. org.jvnet.staxex:stax-ex 1.8 -> 1.8.3 24. org.keycloak:* 11.0.0 -> 11.0.3 25. org.mockito:mockito-inline 3.5.13 -> 3.5.15 26. org.postgresql:postgresql 42.2.14 -> 42.2.18 27. p6spy:p6spy 3.9.0 -> 3.9.1
1 parent 8b52d0d commit bc84282

2 files changed

Lines changed: 33 additions & 33 deletions

File tree

‎sormas-app/app/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,13 +93,13 @@ dependencies {
9393
implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1'
9494
implementation("de.symeda.sormas:sormas-api:$sormasVersion") { changing = true }
9595
implementation 'com.github.mpkorstanje:simmetrics-core:4.1.1'
96-
implementation 'com.google.guava:guava:19.0'
96+
implementation 'com.google.guava:guava:30.0-android'
9797
implementation 'com.opencsv:opencsv:5.3'
98-
implementation 'commons-beanutils:commons-beanutils:1.9.2'
99-
implementation 'commons-codec:commons-codec:1.9'
98+
implementation 'commons-beanutils:commons-beanutils:1.9.4'
99+
implementation 'commons-codec:commons-codec:1.15'
100100
implementation 'commons-collections:commons-collections:3.2.2'
101101
implementation 'commons-logging:commons-logging:1.2'
102-
implementation 'joda-time:joda-time:2.9.4'
102+
implementation 'joda-time:joda-time:2.10.8'
103103
implementation 'org.apache.commons:commons-collections4:4.4'
104104
implementation 'org.apache.commons:commons-lang3:3.10'
105105
implementation 'org.apache.commons:commons-text:1.9'
@@ -108,11 +108,11 @@ dependencies {
108108
implementation(name: 'CircleProgress-v1.2.1', ext: 'aar')
109109
implementation 'io.reactivex:rxandroid:1.0.1'
110110
implementation 'io.reactivex:rxjava:1.0.14'
111-
implementation 'com.fasterxml.jackson.core:jackson-core:2.9.8'
112-
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.9.8'
111+
implementation 'com.fasterxml.jackson.core:jackson-core:2.10.2'
112+
implementation 'com.fasterxml.jackson.core:jackson-annotations:2.10.2'
113113
implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
114114
implementation "androidx.paging:paging-runtime:$paging_version"
115-
testImplementation 'junit:junit:4.12'
115+
testImplementation 'junit:junit:4.13.1'
116116
testImplementation 'org.hamcrest:hamcrest-library:1.3'
117117
testImplementation 'org.robolectric:robolectric:4.2.1'
118118
testImplementation 'org.mockito:mockito-core:1.10.19'

‎sormas-base/pom.xml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@
2323
<payara.version>5.2020.2</payara.version>
2424

2525
<!-- *** Other dependency versions *** -->
26-
<glassfish.jaxb.version>2.3.1</glassfish.jaxb.version>
26+
<glassfish.jaxb.version>2.3.3</glassfish.jaxb.version>
2727
<slf4j.version>1.7.30</slf4j.version>
2828
<logback.version>1.1.7</logback.version>
2929
<vaadin.version.warning>TODO: Remove bootstrap.js in widgetset</vaadin.version.warning>
30-
<vaadin.version>8.11.1</vaadin.version>
30+
<vaadin.version>8.12.1</vaadin.version>
3131
<vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>
32-
<swagger.version>2.1.2</swagger.version>
33-
<bouncycastle.version>1.66</bouncycastle.version>
34-
<keycloak.version>11.0.0</keycloak.version>
32+
<swagger.version>2.1.6</swagger.version>
33+
<bouncycastle.version>1.67</bouncycastle.version>
34+
<keycloak.version>11.0.3</keycloak.version>
3535
<xdocreport.version>2.0.2</xdocreport.version>
3636

3737
<!-- Attention: Compile dependencies with versions are maintained redundantly in sormas-app/app/build.gradle -->
@@ -352,7 +352,7 @@
352352
<dependency>
353353
<groupId>com.google.guava</groupId>
354354
<artifactId>guava</artifactId>
355-
<version>19.0</version>
355+
<version>30.0-jre</version>
356356
<scope>provided</scope>
357357
</dependency>
358358

@@ -373,13 +373,13 @@
373373
<dependency>
374374
<groupId>commons-beanutils</groupId>
375375
<artifactId>commons-beanutils</artifactId>
376-
<version>1.9.2</version>
376+
<version>1.9.4</version>
377377
<scope>provided</scope>
378378
</dependency>
379379
<dependency>
380380
<groupId>commons-codec</groupId>
381381
<artifactId>commons-codec</artifactId>
382-
<version>1.9</version>
382+
<version>1.15</version>
383383
<scope>provided</scope>
384384
</dependency>
385385
<dependency>
@@ -398,20 +398,20 @@
398398
<dependency>
399399
<groupId>joda-time</groupId>
400400
<artifactId>joda-time</artifactId>
401-
<version>2.9.4</version>
401+
<version>2.10.8</version>
402402
<scope>provided</scope>
403403
</dependency>
404404

405405
<dependency>
406406
<groupId>org.apache.httpcomponents</groupId>
407407
<artifactId>httpclient</artifactId>
408-
<version>4.5.4</version>
408+
<version>4.5.13</version>
409409
<scope>provided</scope>
410410
</dependency>
411411
<dependency>
412412
<groupId>org.apache.httpcomponents</groupId>
413413
<artifactId>httpcore</artifactId>
414-
<version>4.4.1</version>
414+
<version>4.4.14</version>
415415
<scope>provided</scope>
416416
</dependency>
417417

@@ -424,7 +424,7 @@
424424
<dependency>
425425
<groupId>org.apache.commons</groupId>
426426
<artifactId>commons-lang3</artifactId>
427-
<version>3.10</version>
427+
<version>3.11</version>
428428
<scope>provided</scope>
429429
</dependency>
430430
<dependency>
@@ -450,7 +450,7 @@
450450
<dependency>
451451
<groupId>org.hibernate</groupId>
452452
<artifactId>hibernate-core</artifactId>
453-
<version>5.4.18.Final</version>
453+
<version>5.4.25.Final</version>
454454
<scope>provided</scope>
455455
<exclusions>
456456
<!-- Exclude Payara modules here -->
@@ -487,7 +487,7 @@
487487
<dependency>
488488
<groupId>com.sun.xml.fastinfoset</groupId>
489489
<artifactId>FastInfoset</artifactId>
490-
<version>1.2.15</version>
490+
<version>1.2.18</version>
491491
<scope>provided</scope>
492492
<!-- Dependency of hibernate-core -->
493493
</dependency>
@@ -508,14 +508,14 @@
508508
<dependency>
509509
<groupId>org.jvnet.staxex</groupId>
510510
<artifactId>stax-ex</artifactId>
511-
<version>1.8</version>
511+
<version>1.8.3</version>
512512
<scope>provided</scope>
513513
<!-- Dependency of hibernate-core -->
514514
</dependency>
515515
<dependency>
516516
<groupId>com.vladmihalcea</groupId>
517517
<artifactId>hibernate-types-52</artifactId>
518-
<version>2.9.13</version>
518+
<version>2.10.0</version>
519519
<scope>provided</scope>
520520
<!-- Additional datatypes for hibernate-core -->
521521
<exclusions>
@@ -536,7 +536,7 @@
536536
<dependency>
537537
<groupId>org.postgresql</groupId>
538538
<artifactId>postgresql</artifactId>
539-
<version>42.2.14</version>
539+
<version>42.2.18</version>
540540
<scope>provided</scope>
541541
<exclusions>
542542
<exclusion>
@@ -572,7 +572,7 @@
572572
<dependency>
573573
<groupId>com.googlecode.libphonenumber</groupId>
574574
<artifactId>libphonenumber</artifactId>
575-
<version>8.12.11</version>
575+
<version>8.12.14</version>
576576
</dependency>
577577

578578
<dependency>
@@ -590,7 +590,7 @@
590590
<dependency>
591591
<groupId>commons-validator</groupId>
592592
<artifactId>commons-validator</artifactId>
593-
<version>1.6</version>
593+
<version>1.7</version>
594594
</dependency>
595595

596596
<dependency>
@@ -613,13 +613,13 @@
613613
<dependency>
614614
<groupId>org.freemarker</groupId>
615615
<artifactId>freemarker</artifactId>
616-
<version>2.3.20</version>
616+
<version>2.3.30</version>
617617
</dependency>
618618

619619
<dependency>
620620
<groupId>org.geotools</groupId>
621621
<artifactId>gt-shapefile</artifactId>
622-
<version>21.4</version>
622+
<version>21.5</version>
623623
</dependency>
624624

625625
<dependency>
@@ -727,14 +727,14 @@
727727
<dependency>
728728
<groupId>junit</groupId>
729729
<artifactId>junit</artifactId>
730-
<version>4.12</version>
730+
<version>4.13.1</version>
731731
<scope>test</scope>
732732
</dependency>
733733

734734
<dependency>
735735
<groupId>org.apache.geronimo.config</groupId>
736736
<artifactId>geronimo-config-impl</artifactId>
737-
<version>1.0</version>
737+
<version>1.2.2</version>
738738
<scope>test</scope>
739739
</dependency>
740740

@@ -761,21 +761,21 @@
761761
<dependency>
762762
<groupId>org.hibernate.validator</groupId>
763763
<artifactId>hibernate-validator</artifactId>
764-
<version>6.1.5.Final</version>
764+
<version>6.1.6.Final</version>
765765
<scope>test</scope>
766766
</dependency>
767767

768768
<dependency>
769769
<groupId>org.mockito</groupId>
770770
<artifactId>mockito-inline</artifactId>
771-
<version>3.5.13</version>
771+
<version>3.5.15</version>
772772
<scope>test</scope>
773773
</dependency>
774774

775775
<dependency>
776776
<groupId>p6spy</groupId>
777777
<artifactId>p6spy</artifactId>
778-
<version>3.9.0</version>
778+
<version>3.9.1</version>
779779
<scope>test</scope>
780780
</dependency>
781781

0 commit comments

Comments
 (0)