eliminate usage of Guava

Author: stefanseifert

conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/handlebars/helper/AbstractCloudManagerConditionalHelper.java

@@ -29,7 +29,6 @@
 import com.github.jknack.handlebars.Context;
 import com.github.jknack.handlebars.Options;
 import com.github.jknack.handlebars.Options.Buffer;
-import com.google.common.collect.ImmutableMap;
 
 import io.wcm.devops.conga.generator.spi.handlebars.HelperPlugin;
 import io.wcm.devops.conga.generator.spi.handlebars.context.HelperContext;
@@ -69,7 +68,7 @@ public final Object apply(Object context, Options options, HelperContext pluginC
       for (CloudManagerConditional item : items) {
 
         // config inside httpd.cloudManagerConditional is considered to be prefixed with "httpd.", so wrap it around here for merging
-        Map<String, Object> httpdWrapper = ImmutableMap.of(HTTPD_KEY, item.getConfig());
+        Map<String, Object> httpdWrapper = Map.of(HTTPD_KEY, item.getConfig());
         Map<String, Object> mergedModel = MapMerger.merge(httpdWrapper, (Map<String, Object>)currentContext.model());
 
         // remove cloudManagerConditional after merging the models

conga-aem-plugin/src/main/java/io/wcm/devops/conga/plugins/aem/postprocessor/ContentPackagePostProcessor.java

@@ -31,8 +31,6 @@
 import org.apache.commons.io.FilenameUtils;
 import org.slf4j.Logger;
 
-import com.google.common.collect.ImmutableList;
-
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.wcm.devops.conga.generator.GeneratorException;
 import io.wcm.devops.conga.generator.plugins.postprocessor.AbstractPostProcessor;
@@ -115,7 +113,7 @@ public List<FileContext> apply(FileContext fileContext, PostProcessorContext con
       modelOptions.put("force", true);
       modelOptions.putAll(fileContext.getModelOptions());
 
-      return ImmutableList.of(new FileContext().file(zipFile).modelOptions(modelOptions));
+      return List.of(new FileContext().file(zipFile).modelOptions(modelOptions));
     }
     catch (IOException ex) {
       throw new GeneratorException("Unable to post-process JSON data file: " + FileUtil.getCanonicalPath(file), ex);

parent/pom.xml

@@ -57,12 +57,12 @@
       <dependency>
         <groupId>io.wcm.devops.conga</groupId>
         <artifactId>io.wcm.devops.conga.generator</artifactId>
-        <version>1.16.5-SNAPSHOT</version>
+        <version>1.17.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <groupId>io.wcm.devops.conga</groupId>
         <artifactId>conga-maven-plugin</artifactId>
-        <version>1.16.5-SNAPSHOT</version>
+        <version>1.17.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>

tooling/conga-aem-maven-plugin/src/it/example/pom.xml

@@ -74,7 +74,7 @@
       <plugin>
         <groupId>io.wcm.devops.conga</groupId>
         <artifactId>conga-maven-plugin</artifactId>
-        <version>1.16.5-SNAPSHOT</version>
+        <version>1.17.0-SNAPSHOT</version>
         <extensions>true</extensions>
         <dependencies>
 

tooling/conga-aem-maven-plugin/src/it/mixed-no-package-type/pom.xml

@@ -67,7 +67,7 @@
       <plugin>
         <groupId>io.wcm.devops.conga</groupId>
         <artifactId>conga-maven-plugin</artifactId>
-        <version>1.16.5-SNAPSHOT</version>
+        <version>1.17.0-SNAPSHOT</version>
         <extensions>true</extensions>
         <dependencies>
 

tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-aem65/parent/pom.xml

@@ -321,7 +321,7 @@
         <plugin>
           <groupId>io.wcm.devops.conga</groupId>
           <artifactId>conga-maven-plugin</artifactId>
-          <version>1.16.4</version>
+          <version>1.17.0-SNAPSHOT</version>
           <dependencies>
             <dependency>
               <groupId>io.wcm.devops.conga.plugins</groupId>

tooling/conga-aem-maven-plugin/src/it/wcmio-archetype-cloud/parent/pom.xml

@@ -268,7 +268,7 @@
         <plugin>
           <groupId>io.wcm.devops.conga</groupId>
           <artifactId>conga-maven-plugin</artifactId>
-          <version>1.16.4</version>
+          <version>1.17.0-SNAPSHOT</version>
           <dependencies>
             <dependency>
               <groupId>io.wcm.devops.conga.plugins</groupId>