Skip to content

Commit b1b260f

Browse files
Martin VigliaroloMartin Vigliarolo
authored andcommitted
Merge branch 'Issue92752' of https://github.com/genexuslabs/JavaClasses into Issue92752
2 parents f632a54 + cdcff13 commit b1b260f

File tree

2 files changed

+24
-6
lines changed

2 files changed

+24
-6
lines changed

android/pom.xml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,29 @@
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-
</dependency>
2217
<dependency>
2318
<groupId>${project.groupId}</groupId>
2419
<artifactId>gxcommon</artifactId>
2520
<version>${project.version}</version>
21+
<exclusions>
22+
<exclusion> <!-- declare the exclusion here -->
23+
<groupId>org.apache.httpcomponents</groupId>
24+
<artifactId>httpclient</artifactId>
25+
</exclusion>
26+
</exclusions>
2627
</dependency>
27-
<dependency>
28+
<dependency>
29+
<groupId>${project.groupId}</groupId>
30+
<artifactId>gxcryptocommon</artifactId>
31+
<version>${project.version}</version>
32+
<exclusions>
33+
<exclusion> <!-- declare the exclusion here -->
34+
<groupId>org.apache.httpcomponents</groupId>
35+
<artifactId>httpclient</artifactId>
36+
</exclusion>
37+
</exclusions>
38+
</dependency>
39+
<dependency>
2840
<groupId>org.locationtech.spatial4j</groupId>
2941
<artifactId>spatial4j</artifactId>
3042
<version>0.7</version>

androidreports/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@
1818
<groupId>${project.groupId}</groupId>
1919
<artifactId>gxcommon</artifactId>
2020
<version>${project.version}</version>
21+
<exclusions>
22+
<exclusion> <!-- declare the exclusion here -->
23+
<groupId>org.apache.httpcomponents</groupId>
24+
<artifactId>httpclient</artifactId>
25+
</exclusion>
26+
</exclusions>
2127
</dependency>
2228
<dependency>
2329
<groupId>${project.groupId}</groupId>

0 commit comments

Comments
 (0)