From 6c2116f48ba3564453a49b7f0f5004c61106e704 Mon Sep 17 00:00:00 2001
From: Marco Nova <mnova@atex.com>
Date: Tue, 30 Mar 2021 12:17:23 +0200
Subject: [PATCH] gson should be embedded in the bundle.

---
 pom.xml                                                       | 2 +-
 .../java/com/atex/confluence/plugin/nexus/MavenInfoMacro.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 509ce35..6327ffa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
       <version>2.2.2-atlassian-1</version>
-      <scope>provided</scope>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>com.atlassian.confluence.plugin</groupId>
diff --git a/src/main/java/com/atex/confluence/plugin/nexus/MavenInfoMacro.java b/src/main/java/com/atex/confluence/plugin/nexus/MavenInfoMacro.java
index 13097d4..63f2ef0 100644
--- a/src/main/java/com/atex/confluence/plugin/nexus/MavenInfoMacro.java
+++ b/src/main/java/com/atex/confluence/plugin/nexus/MavenInfoMacro.java
@@ -12,6 +12,7 @@
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.maven.model.CiManagement;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.DeploymentRepository;
@@ -36,7 +37,6 @@
 import com.atex.confluence.plugin.nexus.data.MetadataManager;
 import com.atlassian.confluence.renderer.radeox.macros.MacroUtils;
 import com.atlassian.confluence.util.velocity.VelocityUtils;
-import com.atlassian.extras.common.org.springframework.util.StringUtils;
 import com.atlassian.renderer.RenderContext;
 import com.atlassian.renderer.v2.RenderMode;
 import com.atlassian.renderer.v2.SubRenderer;
@@ -258,7 +258,7 @@ private String getConnection(Scm scm) {
         if(scm != null) {
             String connection = scm.getConnection();
             if(connection != null && !connection.trim().isEmpty()) {
-                if(StringUtils.countOccurrencesOf(connection, ":") > 2) {
+                if(StringUtils.countMatches("connection", ":") > 2) {
                     int index = connection.indexOf(":");
                     connection = connection.substring(index + 1);
                     index = connection.indexOf(":");