Skip to content

Commit 9b4dc07

Browse files
fpanizzaanaiberta
authored andcommitted
exclude apache HttpComponents from Android proyects.
(cherry picked from commit cdcff13)
1 parent b7c73b2 commit 9b4dc07

File tree

2 files changed

+12
-19
lines changed

2 files changed

+12
-19
lines changed

android/pom.xml

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,15 @@
1414
<name>GeneXus Standard Classes for Android</name>
1515

1616
<dependencies>
17-
<dependency>
18-
<groupId>${project.groupId}</groupId>
19-
<artifactId>gxcryptocommon</artifactId>
20-
<version>${project.version}</version>
21-
<exclusions>
22-
<exclusion> <!-- exclude common io from android -->
23-
<groupId>commons-io</groupId>
24-
<artifactId>commons-io</artifactId>
25-
</exclusion>
26-
<exclusion> <!-- exclude bouncycastle from android -->
27-
<groupId>org.bouncycastle</groupId>
28-
<artifactId>bcprov-jdk18on</artifactId>
29-
</exclusion>
30-
</exclusions>
31-
</dependency>
3217
<dependency>
3318
<groupId>${project.groupId}</groupId>
3419
<artifactId>gxcommon</artifactId>
3520
<version>${project.version}</version>
3621
<exclusions>
22+
<exclusion> <!-- declare the exclusion here -->
23+
<groupId>org.apache.httpcomponents</groupId>
24+
<artifactId>httpclient</artifactId>
25+
</exclusion>
3726
<exclusion> <!-- exclude common io from android -->
3827
<groupId>commons-io</groupId>
3928
<artifactId>commons-io</artifactId>
@@ -44,15 +33,15 @@
4433
</exclusion>
4534
</exclusions>
4635
</dependency>
47-
<dependency>
36+
<dependency>
4837
<groupId>org.locationtech.spatial4j</groupId>
4938
<artifactId>spatial4j</artifactId>
5039
<version>0.7</version>
5140
</dependency>
5241
<dependency>
5342
<groupId>com.google.code.gson</groupId>
5443
<artifactId>gson</artifactId>
55-
<version>2.8.9</version>
44+
<version>2.8.2</version>
5645
</dependency>
5746
<dependency>
5847
<groupId>org.apache.commons</groupId>
@@ -64,14 +53,14 @@
6453
<dependency>
6554
<groupId>commons-io</groupId>
6655
<artifactId>commons-io</artifactId>
67-
<version>2.7</version>
56+
<version>2.2</version>
6857
</dependency>
6958
<!-- add explicit bouncycastle in Android, version used in Android Flexible client -->
7059
<!-- keep in sync version here and in Android Flexible client -->
7160
<dependency>
7261
<groupId>org.bouncycastle</groupId>
7362
<artifactId>bcprov-jdk15on</artifactId>
74-
<version>1.67</version>
63+
<version>1.65</version>
7564
</dependency>
7665

7766
</dependencies>

androidreports/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
<artifactId>gxcommon</artifactId>
2020
<version>${project.version}</version>
2121
<exclusions>
22+
<exclusion> <!-- declare the exclusion here -->
23+
<groupId>org.apache.httpcomponents</groupId>
24+
<artifactId>httpclient</artifactId>
25+
</exclusion>
2226
<exclusion> <!-- exclude common io from android -->
2327
<groupId>commons-io</groupId>
2428
<artifactId>commons-io</artifactId>

0 commit comments

Comments
 (0)