From c5ae0c28cfc9383d8bde178b04a81dd30dea46af Mon Sep 17 00:00:00 2001 From: Ameya Joshi Date: Thu, 28 Jan 2021 10:37:46 +0530 Subject: [PATCH 1/5] Added shaded plugin and shaded org and com packages --- pom.xml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/pom.xml b/pom.xml index 0df4dbe..e9d06de 100644 --- a/pom.xml +++ b/pom.xml @@ -284,6 +284,34 @@ + + org.apache.maven.plugins + maven-shade-plugin + 3.2.4 + + + package + + shade + + + + + org + org.shaded.browserstack + + + com + com.shaded.browserstack + + + + true + shadedPlugin + + + + org.apache.maven.plugins maven-release-plugin From 516dbea0ad8d61ded99d633371006d4663199ea2 Mon Sep 17 00:00:00 2001 From: Ameya Joshi Date: Fri, 29 Jan 2021 10:10:46 +0530 Subject: [PATCH 2/5] Shading other remaining dependencies --- pom.xml | 46 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index e9d06de..5435947 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ browserstack-integration - 1.2.1-SNAPSHOT + 1.2.1-debug hpi BrowserStack @@ -34,7 +34,7 @@ scm:git:ssh://github.com/jenkinsci/browserstack-integration-plugin.git scm:git:ssh://git@github.com/jenkinsci/browserstack-integration-plugin.git https://github.com/jenkinsci/browserstack-integration-plugin - HEAD + browserstack-integration-1.2.1-debug true From c04785c184dc6d4ee9e521ec4a9e7660a2985701 Mon Sep 17 00:00:00 2001 From: Ameya Joshi Date: Fri, 29 Jan 2021 10:12:56 +0530 Subject: [PATCH 3/5] [maven-release-plugin] rollback the release of browserstack-integration-1.2.1-debug --- pom.xml | 46 +++------------------------------------------- 1 file changed, 3 insertions(+), 43 deletions(-) diff --git a/pom.xml b/pom.xml index 5435947..e9d06de 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ browserstack-integration - 1.2.1-debug + 1.2.1-SNAPSHOT hpi BrowserStack @@ -34,7 +34,7 @@ scm:git:ssh://github.com/jenkinsci/browserstack-integration-plugin.git scm:git:ssh://git@github.com/jenkinsci/browserstack-integration-plugin.git https://github.com/jenkinsci/browserstack-integration-plugin - browserstack-integration-1.2.1-debug + HEAD true From 5449382151070014dc0d7e54d4a2c32deb22683b Mon Sep 17 00:00:00 2001 From: Ameya Joshi Date: Fri, 29 Jan 2021 10:14:34 +0530 Subject: [PATCH 4/5] Updated pom for correct versions --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e9d06de..adff1cd 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ browserstack-integration - 1.2.1-SNAPSHOT + 1.2.1-debug-3 hpi BrowserStack From 140fb14076829cda4e1f90964eca5a88871f3353 Mon Sep 17 00:00:00 2001 From: Ameya Joshi Date: Fri, 29 Jan 2021 10:33:48 +0530 Subject: [PATCH 5/5] Readded shade relocations removed by release:rollback --- pom.xml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/pom.xml b/pom.xml index adff1cd..3380a3c 100644 --- a/pom.xml +++ b/pom.xml @@ -303,7 +303,47 @@ com com.shaded.browserstack + + + io + io.shaded.browserstack + + + hudson + hudson.shaded.browserstack + + + javassist + javassist.shaded.browserstack + + + javax + javax.shaded.browserstack + + + jenkins + jenkins.shaded.browserstack + + lib + lib.shaded.browserstack + + + ognl + ognl.shaded.browserstack + + + okhttp3 + okhttp3.shaded.browserstack + + + okio + okio.shaded.browserstack + + + ru + ru.shaded.browserstack + true