diff options
| author | Matthias Villiger | 2020-11-18 08:31:29 +0000 |
|---|---|---|
| committer | Matthias Villiger | 2020-11-19 14:15:33 +0000 |
| commit | 6f9afeaa47d56c4dea5e9f5cb48118fcb126f60f (patch) | |
| tree | 0fdc7f74bd7fbb92995e3a110a3719bcb24687da /org.eclipse.scout.rt | |
| parent | 982cc1daaef4daeb0ca4eb8a2c0c63e56c2e3cbb (diff) | |
| download | org.eclipse.scout.rt-6f9afeaa47d56c4dea5e9f5cb48118fcb126f60f.tar.gz org.eclipse.scout.rt-6f9afeaa47d56c4dea5e9f5cb48118fcb126f60f.tar.xz org.eclipse.scout.rt-6f9afeaa47d56c4dea5e9f5cb48118fcb126f60f.zip | |
Fixes for http client
- Use guava JRE version instead of android
- Exclude listenablefuture which is empty anyway
- Update google and apache httpclient
Diffstat (limited to 'org.eclipse.scout.rt')
| -rw-r--r-- | org.eclipse.scout.rt/pom.xml | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/org.eclipse.scout.rt/pom.xml b/org.eclipse.scout.rt/pom.xml index 2edf932a11..93273269b0 100644 --- a/org.eclipse.scout.rt/pom.xml +++ b/org.eclipse.scout.rt/pom.xml @@ -107,8 +107,8 @@ <batik.version>1.13</batik.version> <activemq.version>5.16.0</activemq.version> <artemis.version>2.15.0</artemis.version> - <com.google.http-client.version>1.36.0</com.google.http-client.version> - <org.apache.httpcomponents.version>4.5.12</org.apache.httpcomponents.version> + <com.google.http-client.version>1.38.0</com.google.http-client.version> + <org.apache.httpcomponents.version>4.5.13</org.apache.httpcomponents.version> <master_coverage_jacoco_destFile>${basedir}/../org.eclipse.scout.rt/target/jacoco-all.exec</master_coverage_jacoco_destFile> <master_test_forkCount>1</master_test_forkCount> @@ -894,6 +894,18 @@ <artifactId>google-http-client</artifactId> <version>${com.google.http-client.version}</version> </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>30.0-jre</version> + <exclusions> + <exclusion> + <!-- is empty anyway --> + <groupId>com.google.guava</groupId> + <artifactId>listenablefuture</artifactId> + </exclusion> + </exclusions> + </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> @@ -986,7 +998,7 @@ <reportSets> <reportSet> <id>dual-report</id> - <reports></reports><!-- Empty tag necessary with maven 3.6.1 because of bug https://issues.apache.org/jira/browse/MNG-6636 --> + <reports/><!-- Empty tag necessary with maven 3.6.1 because of bug https://issues.apache.org/jira/browse/MNG-6636 --> <configuration> <displayFileDetailUrl>https://git.eclipse.org/c/scout/org.eclipse.scout.rt.git/tree/%FILE%</displayFileDetailUrl> <displayFileRevDetailUrl>https://git.eclipse.org/c/scout/org.eclipse.scout.rt.git/tree/%FILE%?id=%REV%</displayFileRevDetailUrl> |