diff --git a/changes.xml b/changes.xml index 8701e033..c908812c 100644 --- a/changes.xml +++ b/changes.xml @@ -23,10 +23,13 @@ xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 https://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd"> - + Special handling for detecting ".cfg.json" file extensions. + + Remove Guava dependency. + diff --git a/tooling/conga-maven-plugin/src/main/java/io/wcm/devops/conga/tooling/maven/plugin/AbstractCongaMojo.java b/tooling/conga-maven-plugin/src/main/java/io/wcm/devops/conga/tooling/maven/plugin/AbstractCongaMojo.java index 92e66a45..d8662854 100644 --- a/tooling/conga-maven-plugin/src/main/java/io/wcm/devops/conga/tooling/maven/plugin/AbstractCongaMojo.java +++ b/tooling/conga-maven-plugin/src/main/java/io/wcm/devops/conga/tooling/maven/plugin/AbstractCongaMojo.java @@ -30,6 +30,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.SortedSet; @@ -53,8 +54,6 @@ import org.codehaus.plexus.archiver.jar.JarArchiver; import org.codehaus.plexus.archiver.jar.ManifestException; -import com.google.common.collect.ImmutableList; - import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.wcm.devops.conga.generator.export.ModelExport; import io.wcm.devops.conga.resource.Resource; @@ -200,7 +199,7 @@ protected ModelExport getModelExport() { String[] nodeExportPlugins = StringUtils.split(this.modelExportNode, ","); if (nodeExportPlugins != null) { - modelExport.setNode(ImmutableList.copyOf(nodeExportPlugins)); + modelExport.setNode(Arrays.asList(nodeExportPlugins)); } return modelExport; diff --git a/tooling/conga-maven-plugin/src/main/java/io/wcm/devops/conga/tooling/maven/plugin/PackageMojo.java b/tooling/conga-maven-plugin/src/main/java/io/wcm/devops/conga/tooling/maven/plugin/PackageMojo.java index 767ba926..c8b4e26d 100644 --- a/tooling/conga-maven-plugin/src/main/java/io/wcm/devops/conga/tooling/maven/plugin/PackageMojo.java +++ b/tooling/conga-maven-plugin/src/main/java/io/wcm/devops/conga/tooling/maven/plugin/PackageMojo.java @@ -43,8 +43,6 @@ import org.codehaus.plexus.archiver.ArchiverException; import org.codehaus.plexus.archiver.zip.ZipArchiver; -import com.google.common.collect.ImmutableSet; - import io.wcm.devops.conga.generator.util.FileUtil; /** @@ -83,7 +81,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { private void buildGeneratedConfigurationAttachments() throws MojoExecutionException, MojoFailureException { Set selectedEnvironments; if (environments != null && environments.length > 0) { - selectedEnvironments = ImmutableSet.copyOf(environments); + selectedEnvironments = Set.copyOf(Arrays.asList(environments)); } else { selectedEnvironments = null; diff --git a/tooling/conga-maven-plugin/src/main/java/io/wcm/devops/conga/tooling/maven/plugin/ValidateMojo.java b/tooling/conga-maven-plugin/src/main/java/io/wcm/devops/conga/tooling/maven/plugin/ValidateMojo.java index d89262f5..6b99aaa3 100644 --- a/tooling/conga-maven-plugin/src/main/java/io/wcm/devops/conga/tooling/maven/plugin/ValidateMojo.java +++ b/tooling/conga-maven-plugin/src/main/java/io/wcm/devops/conga/tooling/maven/plugin/ValidateMojo.java @@ -49,8 +49,6 @@ import org.sonatype.plexus.build.incremental.BuildContext; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; -import com.google.common.collect.ImmutableList; - import io.wcm.devops.conga.generator.GeneratorException; import io.wcm.devops.conga.generator.GeneratorOptions; import io.wcm.devops.conga.generator.UrlFileManager; @@ -153,7 +151,7 @@ public void execute() throws MojoExecutionException, MojoFailureException { .logger(new MavenSlf4jLogFacade(getLog())); // validate that all templates can be compiled - HandlebarsManager handlebarsManager = new HandlebarsManager(ImmutableList.of(templateDir), pluginContextOptions); + HandlebarsManager handlebarsManager = new HandlebarsManager(List.of(templateDir), pluginContextOptions); validateFiles(templateDir, templateDir, new TemplateValidator(templateDir, handlebarsManager)); // validate that roles reference existing templates