From 52c40ec36f52de6e49908ece611c6d5b89ea7416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=82=85=E4=B8=9C=E6=B5=B7?= <296322762@qq.com>
Date: Mon, 15 Jul 2024 11:52:58 +0800
Subject: [PATCH] Resolving gson dependency conflicts
---
dependency-reduced-pom.xml | 405 +++++++++++++++++++++++++++++++++++++
pom.xml | 29 +--
2 files changed, 420 insertions(+), 14 deletions(-)
create mode 100644 dependency-reduced-pom.xml
diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
new file mode 100644
index 00000000..c1bceda9
--- /dev/null
+++ b/dependency-reduced-pom.xml
@@ -0,0 +1,405 @@
+
+
+ 4.0.0
+ com.easemob.im
+ im-sdk-core
+ im-sdk-core
+ 1.0.13-SNAPSHOT
+ OpenAPI Java
+ https://github.com/openapitools/openapi-generator
+
+
+ fudonghai
+ fudonghai@easemob.com
+ https://github.com/fudonghai
+
+
+
+
+ The Apache Software License, Version 2.0
+ http://www.apache.org/licenses/LICENSE-2.0.txt
+
+
+
+ scm:git:git@github.com:easemob/easemob-im-server-sdk.git
+ scm:git:git@github.com:easemob/easemob-im-server-sdk.git
+ https://github.com/easemob/easemob-im-server-sdk/tree/master_java_2.0
+
+
+
+
+ META-INF
+ ${project.basedir}
+
+ LICENSE
+
+
+
+ ${project.basedir}/src/main/resources
+
+
+
+
+ maven-shade-plugin
+ 3.2.4
+
+
+ package
+
+ shade
+
+
+
+
+ com.google.code.gson
+ io.gsonfire
+ com.squareup.okhttp3
+ com.squareup.okio
+ org.jetbrains.kotlin
+ org.apache.commons
+ com.google.guava
+
+
+
+
+ com.google.gson
+ shaded.com.google.gson
+
+
+ io.gsonfire
+ shaded.io.gsonfire
+
+
+ okhttp3
+ shaded.okhttp3
+
+
+ okio
+ shaded.okio
+
+
+ kotlin
+ shaded.kotlin
+
+
+ org
+ shaded.org
+
+
+
+
+
+
+
+ maven-compiler-plugin
+ 3.8.1
+
+
+ -Xlint:all
+ -Xlint:-options
+ -Xlint:-processing
+ -Xlint:-serial
+
+ true
+ ${java.version}
+ ${java.version}
+
+
+
+ maven-jar-plugin
+ 3.2.0
+
+
+
+ true
+ true
+
+
+
+
+
+ maven-deploy-plugin
+ 2.8.2
+
+
+ maven-enforcer-plugin
+ 3.0.0-M3
+
+
+ enforce-no-snapshots
+
+ enforce
+
+
+
+
+ true
+ No Snapshots in releases allowed!
+
+
+
+
+
+
+
+ maven-surefire-plugin
+ 2.22.2
+
+ random
+ **/*Test.java
+
+
+
+ maven-source-plugin
+ 3.2.1
+
+
+ attach-sources
+
+ jar
+
+
+
+
+
+ maven-javadoc-plugin
+ 3.2.0
+
+
+ attach-javadocs
+
+ jar
+
+
+
+
+ UTF-8
+ UTF-8
+ UTF-8
+
+
+
+ maven-gpg-plugin
+ 1.6
+
+
+ sign-artifacts
+ verify
+
+ sign
+
+
+
+
+ true
+
+ --pinentry-mode
+ loopback
+
+
+
+
+ org.sonatype.plugins
+ nexus-staging-maven-plugin
+ 1.6.7
+ true
+
+ ossrh-releases
+ https://oss.sonatype.org/
+ true
+
+
+
+ maven-release-plugin
+ 2.5.3
+
+
+ maven-site-plugin
+ 3.7.1
+
+
+ maven-project-info-reports-plugin
+ 3.0.0
+
+
+ org.jacoco
+ jacoco-maven-plugin
+ 0.8.6
+
+
+
+ prepare-agent
+
+
+
+ report
+ test
+
+ report
+
+
+
+
+
+
+
+
+ ci
+
+
+
+ maven-gpg-plugin
+ 1.6
+
+
+ sign-artifacts
+ none
+
+
+
+
+
+
+
+
+
+ com.google.code.findbugs
+ jsr305
+ 3.0.2
+ compile
+
+
+ jakarta.annotation
+ jakarta.annotation-api
+ 1.3.5
+ provided
+
+
+ org.openapitools
+ jackson-databind-nullable
+ 0.2.6
+ compile
+
+
+ javax.ws.rs
+ jsr311-api
+ 1.1.1
+ compile
+
+
+ javax.ws.rs
+ javax.ws.rs-api
+ 2.1.1
+ compile
+
+
+ org.junit.jupiter
+ junit-jupiter-engine
+ 5.10.0
+ test
+
+
+ junit-platform-engine
+ org.junit.platform
+
+
+ junit-jupiter-api
+ org.junit.jupiter
+
+
+ apiguardian-api
+ org.apiguardian
+
+
+
+
+ org.junit.platform
+ junit-platform-runner
+ 1.10.0
+ test
+
+
+ junit
+ junit
+
+
+ junit-platform-launcher
+ org.junit.platform
+
+
+ junit-platform-suite-api
+ org.junit.platform
+
+
+ junit-platform-suite-commons
+ org.junit.platform
+
+
+ apiguardian-api
+ org.apiguardian
+
+
+
+
+
+
+
+ com.squareup.okhttp3
+ okhttp-bom
+ ${okhttp-version}
+ pom
+ import
+
+
+ com.squareup.okhttp3
+ logging-interceptor
+ ${okhttp-version}
+
+
+ com.google.code.gson
+ gson
+ ${gson-version}
+
+
+ org.apache.commons
+ commons-lang3
+ ${commons-lang3-version}
+
+
+ com.google.guava
+ guava
+ ${google-guava-version}
+
+
+
+
+
+ ossrh-releases
+ Nexus Release Repository
+ https://oss.sonatype.org/service/local/staging/deploy/maven2/
+
+
+ ossrh-snapshots
+ Nexus Snapshot Repository
+ https://oss.sonatype.org/content/repositories/snapshots/
+
+
+
+ 0.2.6
+ 1.8
+ 30.0-jre
+ 5.10.0
+ 2.1.1
+ ${java.version}
+ 2.10.1
+ 1.1.1
+ 3.5
+ 2.27.2
+ UTF-8
+ 1.3.5
+ 1.10.0
+ 4.11.0
+ 1.9.0
+ ${java.version}
+
+
diff --git a/pom.xml b/pom.xml
index 557adf14..b2788185 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,10 +47,10 @@
org.apache.maven.plugins
maven-shade-plugin
- 3.3.0
+ 3.2.4
-
+ package
shade
@@ -58,6 +58,7 @@
com.google.code.gson
+ io.gsonfire
com.squareup.okhttp3
com.squareup.okio
org.jetbrains.kotlin
@@ -67,28 +68,28 @@
- com.google.code.gson
- shaded.com.google.code.gson
+ com.google.gson
+ shaded.com.google.gson
- com.squareup.okhttp3
- shaded.com.squareup.okhttp3
+ io.gsonfire
+ shaded.io.gsonfire
- com.squareup.okio
- shaded.com.squareup.okio
+ okhttp3
+ shaded.okhttp3
- org.jetbrains.kotlin
- shaded.org.jetbrains.kotlin
+ okio
+ shaded.okio
- org.apache.commons
- shaded.org.apache.commons
+ kotlin
+ shaded.kotlin
- com.google.guava
- shaded.com.google.guava
+ org
+ shaded.org