[brooklyn-server] branch master updated: remove internal gson class; use guava's version instead

[he...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

heneveld pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git


The following commit(s) were added to refs/heads/master by this push:
     new 1c68dc3  remove internal gson class; use guava's version instead
1c68dc3 is described below

commit 1c68dc3036581ed7317a763542f11565358916e7
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Wed Nov 17 10:58:41 2021 +0000

    remove internal gson class; use guava's version instead
    
    this isn't resolvable in osgi now
---
 .../org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java b/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
index 28c12d6..7e0d1c2 100644
--- a/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
+++ b/software/base/src/main/java/org/apache/brooklyn/entity/java/JavaSoftwareProcessSshDriver.java
@@ -46,7 +46,7 @@ import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.google.gson.internal.Primitives;
+import com.google.common.primitives.Primitives;
 
 import org.apache.brooklyn.location.ssh.SshMachineLocation;
 import org.apache.brooklyn.util.collections.MutableMap;