Skip to content

Commit 621f311

Browse files
sjahreissjahreis
committed
Cleanup dependencies on gson
1 parent bf582b7 commit 621f311

File tree

8 files changed

+23
-29
lines changed

8 files changed

+23
-29
lines changed

‎kotlin-http-client/kotlin-http-client-atlas/pom.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,19 @@
1616
<groupId>com.linked-planet.client</groupId>
1717
<artifactId>kotlin-http-client-api</artifactId>
1818
<version>${project.version}</version>
19+
<exclusions>
20+
<!-- Use the atlassian version, see next dependency -->
21+
<exclusion>
22+
<groupId>com.google.code.gson</groupId>
23+
<artifactId>gson</artifactId>
24+
</exclusion>
25+
</exclusions>
26+
</dependency>
27+
28+
<dependency>
29+
<groupId>com.google.code.gson</groupId>
30+
<artifactId>gson</artifactId>
31+
<version>2.2.2-atlassian-1</version>
1932
</dependency>
2033

2134
<!-- External -->

‎kotlin-jira-client/kotlin-jira-client-api/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<dependency>
1717
<groupId>com.google.code.gson</groupId>
1818
<artifactId>gson</artifactId>
19+
<version>2.9.0</version>
1920
</dependency>
2021
</dependencies>
2122
</project>

‎kotlin-jira-client/kotlin-jira-client-http/pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,6 @@
2424
<version>${project.version}</version>
2525
</dependency>
2626

27-
<!-- TODO: remove -->
28-
<dependency>
29-
<groupId>com.google.code.gson</groupId>
30-
<artifactId>gson</artifactId>
31-
</dependency>
3227
<dependency>
3328
<groupId>org.jetbrains.kotlinx</groupId>
3429
<artifactId>kotlinx-coroutines-core</artifactId>

‎kotlin-jira-client/kotlin-jira-client-sdk/pom.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,19 @@
1717
<groupId>com.linked-planet.client</groupId>
1818
<artifactId>kotlin-jira-client-api</artifactId>
1919
<version>${project.version}</version>
20+
<exclusions>
21+
<!-- Use atlassian version, see next dependency -->
22+
<exclusion>
23+
<groupId>com.google.code.gson</groupId>
24+
<artifactId>gson</artifactId>
25+
</exclusion>
26+
</exclusions>
2027
</dependency>
2128

2229
<dependency>
2330
<groupId>com.google.code.gson</groupId>
2431
<artifactId>gson</artifactId>
32+
<version>2.2.2-atlassian-1</version>
2533
<scope>provided</scope>
2634
</dependency>
2735

‎kotlin-jira-client/kotlin-jira-client-test-base/pom.xml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@
3333
<groupId>org.jetbrains.kotlinx</groupId>
3434
<artifactId>kotlinx-coroutines-core</artifactId>
3535
</dependency>
36-
<dependency>
37-
<groupId>com.google.code.gson</groupId>
38-
<artifactId>gson</artifactId>
39-
</dependency>
4036
<dependency>
4137
<groupId>junit</groupId>
4238
<artifactId>junit</artifactId>

‎kotlin-jira-client/kotlin-jira-client-test-ktor/pom.xml‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,6 @@
2323
<groupId>com.linked-planet.client</groupId>
2424
<artifactId>kotlin-jira-client-http</artifactId>
2525
<version>${project.version}</version>
26-
<exclusions>
27-
<exclusion>
28-
<groupId>com.google.code.gson</groupId>
29-
<artifactId>gson</artifactId>
30-
</exclusion>
31-
</exclusions>
32-
</dependency>
33-
34-
<!-- Important: Override bundled atlassian gson (above) and use an official version (below) -->
35-
<dependency>
36-
<groupId>com.google.code.gson</groupId>
37-
<artifactId>gson</artifactId>
38-
<version>2.8.5</version>
3926
</dependency>
4027

4128
<dependency>

‎kotlin-jira-client/kotlin-jira-client-test-sdk/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
<dependency>
9898
<groupId>com.google.code.gson</groupId>
9999
<artifactId>gson</artifactId>
100+
<version>2.2.2-atlassian-1</version>
100101
</dependency>
101102

102103
<dependency>

‎kotlin-jira-client/pom.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,6 @@
4848
<version>${insight.version}</version>
4949
</dependency>
5050

51-
<!-- TODO: use official version as default -->
52-
<dependency>
53-
<groupId>com.google.code.gson</groupId>
54-
<artifactId>gson</artifactId>
55-
<version>2.2.2-atlassian-1</version>
56-
</dependency>
57-
5851
<!-- Kotlin -->
5952
<dependency>
6053
<groupId>org.jetbrains.kotlinx</groupId>

0 commit comments

Comments
 (0)