fix(deps): update dependency io.pebbletemplates:pebble to v3.2.2

wetransform-os · Oct 31, 2024 · 1531e40 · 1531e40
1 parent 5575021
commit 1531e40
Show file tree

Hide file tree

Showing 42 changed files with 201 additions and 201 deletions.
diff --git a/build.gradle b/build.gradle
@@ -28,7 +28,7 @@ dependencies{
 
   // template engine
   // https://github.com/PebbleTemplates/pebble
-  implementation 'io.pebbletemplates:pebble:3.1.5'
+  implementation 'io.pebbletemplates:pebble:3.2.2'
 
   implementation 'com.vdurmont:semver4j:3.1.0'
 

diff --git a/...main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ComposeFileEscaper.java b/...main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ComposeFileEscaper.java
@@ -19,7 +19,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.mitchellbosecke.pebble.extension.escaper.EscapingStrategy;
+import io.pebbletemplates.pebble.extension.escaper.EscapingStrategy;
 
 /**
  * Escaping for compose files.

diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ContextWrapper.groovy b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ContextWrapper.groovy
@@ -21,8 +21,8 @@ import java.util.Iterator;
 import java.util.Map
 import java.util.stream.Collectors;
 
-import com.mitchellbosecke.pebble.error.AttributeNotFoundException;
-import com.mitchellbosecke.pebble.utils.Pair;
+import io.pebbletemplates.pebble.error.AttributeNotFoundException;
+import io.pebbletemplates.pebble.utils.Pair;
 
 /**
  * Context wrapper for a map that throws an exception if the map key does not exist.

diff --git a/.../groovy/to/wetransform/gradle/swarm/actions/assemble/template/ContextWrapperResolver.java b/.../groovy/to/wetransform/gradle/swarm/actions/assemble/template/ContextWrapperResolver.java
@@ -16,10 +16,10 @@
 
 package to.wetransform.gradle.swarm.actions.assemble.template;
 
-import com.mitchellbosecke.pebble.attributes.AttributeResolver;
-import com.mitchellbosecke.pebble.attributes.ResolvedAttribute;
-import com.mitchellbosecke.pebble.node.ArgumentsNode;
-import com.mitchellbosecke.pebble.template.EvaluationContextImpl;
+import io.pebbletemplates.pebble.attributes.AttributeResolver;
+import io.pebbletemplates.pebble.attributes.ResolvedAttribute;
+import io.pebbletemplates.pebble.node.ArgumentsNode;
+import io.pebbletemplates.pebble.template.EvaluationContextImpl;
 
 /**
  * @author simon

diff --git a/...ain/groovy/to/wetransform/gradle/swarm/actions/assemble/template/DoubleQuotesEscaper.java b/...ain/groovy/to/wetransform/gradle/swarm/actions/assemble/template/DoubleQuotesEscaper.java
@@ -19,7 +19,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.mitchellbosecke.pebble.extension.escaper.EscapingStrategy;
+import io.pebbletemplates.pebble.extension.escaper.EscapingStrategy;
 
 /**
  * Escapes double quotes.
@@ -31,13 +31,13 @@ public class DoubleQuotesEscaper implements EscapingStrategy {
   @Override
   public String escape(String input) {
     String res = input;
-    
+
     res = res.replaceAll(Pattern.quote("\\"), Matcher.quoteReplacement("\\\\\\\\"));
-    
+
     res = res.replaceAll(Pattern.quote("\""), Matcher.quoteReplacement("\\\""));
     res = res.replaceAll(Pattern.quote("$"), Matcher.quoteReplacement("\\$"));
     res = res.replaceAll(Pattern.quote("&"), Matcher.quoteReplacement("\\&"));
-      
+
     return res;
   }
 

diff --git a/...in/groovy/to/wetransform/gradle/swarm/actions/assemble/template/EvaluationContextMap.java b/...in/groovy/to/wetransform/gradle/swarm/actions/assemble/template/EvaluationContextMap.java
@@ -20,7 +20,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import com.mitchellbosecke.pebble.template.EvaluationContext;
+import io.pebbletemplates.pebble.template.EvaluationContext;
 
 /**
  * Map backed by an evaluation context.

diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ExpandFilter.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ExpandFilter.java
@@ -20,10 +20,10 @@
 import java.util.List;
 import java.util.Map;
 
-import com.mitchellbosecke.pebble.error.PebbleException;
-import com.mitchellbosecke.pebble.extension.Filter;
-import com.mitchellbosecke.pebble.template.EvaluationContext;
-import com.mitchellbosecke.pebble.template.PebbleTemplate;
+import io.pebbletemplates.pebble.error.PebbleException;
+import io.pebbletemplates.pebble.extension.Filter;
+import io.pebbletemplates.pebble.template.EvaluationContext;
+import io.pebbletemplates.pebble.template.PebbleTemplate;
 
 import groovy.json.JsonOutput;
 import groovy.json.JsonSlurper;

diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/FailFunction.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/FailFunction.java
@@ -16,10 +16,10 @@
 
 package to.wetransform.gradle.swarm.actions.assemble.template;
 
-import com.mitchellbosecke.pebble.error.PebbleException;
-import com.mitchellbosecke.pebble.extension.Function;
-import com.mitchellbosecke.pebble.template.EvaluationContext;
-import com.mitchellbosecke.pebble.template.PebbleTemplate;
+import io.pebbletemplates.pebble.error.PebbleException;
+import io.pebbletemplates.pebble.extension.Function;
+import io.pebbletemplates.pebble.template.EvaluationContext;
+import io.pebbletemplates.pebble.template.PebbleTemplate;
 
 import java.util.Collections;
 import java.util.List;

diff --git a/...roovy/to/wetransform/gradle/swarm/actions/assemble/template/GeneratePasswordFunction.java b/...roovy/to/wetransform/gradle/swarm/actions/assemble/template/GeneratePasswordFunction.java
@@ -21,9 +21,9 @@
 import java.util.List;
 import java.util.Map;
 
-import com.mitchellbosecke.pebble.extension.Function;
-import com.mitchellbosecke.pebble.template.EvaluationContext;
-import com.mitchellbosecke.pebble.template.PebbleTemplate;
+import io.pebbletemplates.pebble.extension.Function;
+import io.pebbletemplates.pebble.template.EvaluationContext;
+import io.pebbletemplates.pebble.template.PebbleTemplate;
 
 /**
  * Function that generates a random password.

diff --git a/...main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/GroovyScriptFilter.java b/...main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/GroovyScriptFilter.java
@@ -27,11 +27,11 @@
 import org.codehaus.groovy.control.CompilationFailedException;
 import org.codehaus.groovy.control.CompilerConfiguration;
 
-import com.mitchellbosecke.pebble.error.PebbleException;
-import com.mitchellbosecke.pebble.extension.Filter;
-import com.mitchellbosecke.pebble.template.EvaluationContext;
-import com.mitchellbosecke.pebble.template.PebbleTemplate;
-import com.mitchellbosecke.pebble.template.PebbleTemplateImpl;
+import io.pebbletemplates.pebble.error.PebbleException;
+import io.pebbletemplates.pebble.extension.Filter;
+import io.pebbletemplates.pebble.template.EvaluationContext;
+import io.pebbletemplates.pebble.template.PebbleTemplate;
+import io.pebbletemplates.pebble.template.PebbleTemplateImpl;
 
 import groovy.lang.Binding;
 import groovy.lang.GroovyShell;

diff --git a/...in/groovy/to/wetransform/gradle/swarm/actions/assemble/template/GroovyScriptFunction.java b/...in/groovy/to/wetransform/gradle/swarm/actions/assemble/template/GroovyScriptFunction.java
@@ -20,9 +20,9 @@
 import java.util.List;
 import java.util.Map;
 
-import com.mitchellbosecke.pebble.extension.Function;
-import com.mitchellbosecke.pebble.template.EvaluationContext;
-import com.mitchellbosecke.pebble.template.PebbleTemplate;
+import io.pebbletemplates.pebble.extension.Function;
+import io.pebbletemplates.pebble.template.EvaluationContext;
+import io.pebbletemplates.pebble.template.PebbleTemplate;
 
 /**
  * Functions that runs a Groovy script.
@@ -46,7 +46,7 @@ public List<String> getArgumentNames() {
   }
 
   /* (non-Javadoc)
-   * @see com.mitchellbosecke.pebble.extension.Function#execute(java.util.Map, com.mitchellbosecke.pebble.template.PebbleTemplate, com.mitchellbosecke.pebble.template.EvaluationContext, int)
+   * @see io.pebbletemplates.pebble.extension.Function#execute(java.util.Map, io.pebbletemplates.pebble.template.PebbleTemplate, io.pebbletemplates.pebble.template.EvaluationContext, int)
    */
   @Override
   public Object execute(Map<String, Object> args, PebbleTemplate self, EvaluationContext context, int lineNumber) {

diff --git a/...groovy/to/wetransform/gradle/swarm/actions/assemble/template/GroovyScriptMapFilter.groovy b/...groovy/to/wetransform/gradle/swarm/actions/assemble/template/GroovyScriptMapFilter.groovy
@@ -19,10 +19,10 @@ package to.wetransform.gradle.swarm.actions.assemble.template
 import java.util.List
 import java.util.Map
 
-import com.mitchellbosecke.pebble.error.PebbleException
-import com.mitchellbosecke.pebble.extension.Filter
-import com.mitchellbosecke.pebble.template.EvaluationContext
-import com.mitchellbosecke.pebble.template.PebbleTemplate
+import io.pebbletemplates.pebble.error.PebbleException
+import io.pebbletemplates.pebble.extension.Filter
+import io.pebbletemplates.pebble.template.EvaluationContext
+import io.pebbletemplates.pebble.template.PebbleTemplate
 
 import groovy.transform.CompileStatic
 

diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/HclEscaper.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/HclEscaper.java
@@ -19,7 +19,7 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.mitchellbosecke.pebble.extension.escaper.EscapingStrategy;
+import io.pebbletemplates.pebble.extension.escaper.EscapingStrategy;
 
 /**
  * Escaper for HCL (https://github.com/hashicorp/hcl).

diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/IfNullFilter.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/IfNullFilter.java
@@ -18,11 +18,11 @@
 
 import java.util.Map;
 
-import com.mitchellbosecke.pebble.error.AttributeNotFoundException;
-import com.mitchellbosecke.pebble.error.PebbleException;
-import com.mitchellbosecke.pebble.extension.core.DefaultFilter;
-import com.mitchellbosecke.pebble.template.EvaluationContext;
-import com.mitchellbosecke.pebble.template.PebbleTemplate;
+import io.pebbletemplates.pebble.error.AttributeNotFoundException;
+import io.pebbletemplates.pebble.error.PebbleException;
+import io.pebbletemplates.pebble.extension.core.DefaultFilter;
+import io.pebbletemplates.pebble.template.EvaluationContext;
+import io.pebbletemplates.pebble.template.PebbleTemplate;
 
 /**
  * Filter that returns a provided default value if the input is <code>null</code>.

diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/IndentLineFilter.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/IndentLineFilter.java
@@ -21,10 +21,10 @@
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.mitchellbosecke.pebble.error.PebbleException;
-import com.mitchellbosecke.pebble.extension.Filter;
-import com.mitchellbosecke.pebble.template.EvaluationContext;
-import com.mitchellbosecke.pebble.template.PebbleTemplate;
+import io.pebbletemplates.pebble.error.PebbleException;
+import io.pebbletemplates.pebble.extension.Filter;
+import io.pebbletemplates.pebble.template.EvaluationContext;
+import io.pebbletemplates.pebble.template.PebbleTemplate;
 
 /**
  * Filter that indents new lines.

diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/IsListTest.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/IsListTest.java
@@ -19,10 +19,10 @@
 import java.util.List;
 import java.util.Map;
 
-import com.mitchellbosecke.pebble.error.PebbleException;
-import com.mitchellbosecke.pebble.extension.Test;
-import com.mitchellbosecke.pebble.template.EvaluationContext;
-import com.mitchellbosecke.pebble.template.PebbleTemplate;
+import io.pebbletemplates.pebble.error.PebbleException;
+import io.pebbletemplates.pebble.extension.Test;
+import io.pebbletemplates.pebble.template.EvaluationContext;
+import io.pebbletemplates.pebble.template.PebbleTemplate;
 
 /**
  * Simple tests to check if an input is a list.

diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/IsMapTest.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/IsMapTest.java
@@ -19,10 +19,10 @@
 import java.util.List;
 import java.util.Map;
 
-import com.mitchellbosecke.pebble.error.PebbleException;
-import com.mitchellbosecke.pebble.extension.Test;
-import com.mitchellbosecke.pebble.template.EvaluationContext;
-import com.mitchellbosecke.pebble.template.PebbleTemplate;
+import io.pebbletemplates.pebble.error.PebbleException;
+import io.pebbletemplates.pebble.extension.Test;
+import io.pebbletemplates.pebble.template.EvaluationContext;
+import io.pebbletemplates.pebble.template.PebbleTemplate;
 
 /**
  * Simple tests to check if an input is a map or dynamic attribute provider (e.g. a context wrapper).

diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/IsNumberTest.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/IsNumberTest.java
@@ -19,10 +19,10 @@
 import java.util.List;
 import java.util.Map;
 
-import com.mitchellbosecke.pebble.error.PebbleException;
-import com.mitchellbosecke.pebble.extension.Test;
-import com.mitchellbosecke.pebble.template.EvaluationContext;
-import com.mitchellbosecke.pebble.template.PebbleTemplate;
+import io.pebbletemplates.pebble.error.PebbleException;
+import io.pebbletemplates.pebble.extension.Test;
+import io.pebbletemplates.pebble.template.EvaluationContext;
+import io.pebbletemplates.pebble.template.PebbleTemplate;
 
 /**
  * Simple tests to check if an input is a number.

diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/IsStringTest.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/IsStringTest.java
@@ -19,10 +19,10 @@
 import java.util.List;
 import java.util.Map;
 
-import com.mitchellbosecke.pebble.error.PebbleException;
-import com.mitchellbosecke.pebble.extension.Test;
-import com.mitchellbosecke.pebble.template.EvaluationContext;
-import com.mitchellbosecke.pebble.template.PebbleTemplate;
+import io.pebbletemplates.pebble.error.PebbleException;
+import io.pebbletemplates.pebble.extension.Test;
+import io.pebbletemplates.pebble.template.EvaluationContext;
+import io.pebbletemplates.pebble.template.PebbleTemplate;
 
 import groovy.lang.GString;
 

diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/JsonFilter.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/JsonFilter.java
@@ -20,10 +20,10 @@
 import java.util.List;
 import java.util.Map;
 
-import com.mitchellbosecke.pebble.error.PebbleException;
-import com.mitchellbosecke.pebble.extension.Filter;
-import com.mitchellbosecke.pebble.template.EvaluationContext;
-import com.mitchellbosecke.pebble.template.PebbleTemplate;
+import io.pebbletemplates.pebble.error.PebbleException;
+import io.pebbletemplates.pebble.extension.Filter;
+import io.pebbletemplates.pebble.template.EvaluationContext;
+import io.pebbletemplates.pebble.template.PebbleTemplate;
 
 import groovy.json.JsonOutput;
 

diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/MergeFilter.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/MergeFilter.java
@@ -16,12 +16,12 @@
 
 package to.wetransform.gradle.swarm.actions.assemble.template;
 
-import com.mitchellbosecke.pebble.error.PebbleException;
-import com.mitchellbosecke.pebble.extension.Filter;
-import com.mitchellbosecke.pebble.extension.Test;
-import com.mitchellbosecke.pebble.extension.core.EmptyTest;
-import com.mitchellbosecke.pebble.template.EvaluationContext;
-import com.mitchellbosecke.pebble.template.PebbleTemplate;
+import io.pebbletemplates.pebble.error.PebbleException;
+import io.pebbletemplates.pebble.extension.Filter;
+import io.pebbletemplates.pebble.extension.Test;
+import io.pebbletemplates.pebble.extension.core.EmptyTest;
+import io.pebbletemplates.pebble.template.EvaluationContext;
+import io.pebbletemplates.pebble.template.PebbleTemplate;
 import to.wetransform.gradle.swarm.config.ConfigHelper;
 
 import java.util.*;

diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/OrErrorFilter.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/OrErrorFilter.java
@@ -21,13 +21,13 @@
 import java.util.List;
 import java.util.Map;
 
-import com.mitchellbosecke.pebble.error.AttributeNotFoundException;
-import com.mitchellbosecke.pebble.error.PebbleException;
-import com.mitchellbosecke.pebble.extension.Test;
-import com.mitchellbosecke.pebble.extension.core.DefaultFilter;
-import com.mitchellbosecke.pebble.extension.core.EmptyTest;
-import com.mitchellbosecke.pebble.template.EvaluationContext;
-import com.mitchellbosecke.pebble.template.PebbleTemplate;
+import io.pebbletemplates.pebble.error.AttributeNotFoundException;
+import io.pebbletemplates.pebble.error.PebbleException;
+import io.pebbletemplates.pebble.extension.Test;
+import io.pebbletemplates.pebble.extension.core.DefaultFilter;
+import io.pebbletemplates.pebble.extension.core.EmptyTest;
+import io.pebbletemplates.pebble.template.EvaluationContext;
+import io.pebbletemplates.pebble.template.PebbleTemplate;
 
 /**
  * Filter that throws an error with a custom message if a property is not present.

diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ParseYamlFilter.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ParseYamlFilter.java
@@ -23,10 +23,10 @@
 import org.yaml.snakeyaml.Yaml;
 import org.yaml.snakeyaml.constructor.SafeConstructor;
 
-import com.mitchellbosecke.pebble.error.PebbleException;
-import com.mitchellbosecke.pebble.extension.Filter;
-import com.mitchellbosecke.pebble.template.EvaluationContext;
-import com.mitchellbosecke.pebble.template.PebbleTemplate;
+import io.pebbletemplates.pebble.error.PebbleException;
+import io.pebbletemplates.pebble.extension.Filter;
+import io.pebbletemplates.pebble.template.EvaluationContext;
+import io.pebbletemplates.pebble.template.PebbleTemplate;
 
 /**
  * Filter that parses YAML from input an input string to a map/list structure.

diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/PebbleAssembler.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/PebbleAssembler.java
@@ -25,9 +25,9 @@
 import java.util.Map;
 import java.util.function.Supplier;
 
-import com.mitchellbosecke.pebble.PebbleEngine;
-import com.mitchellbosecke.pebble.error.PebbleException;
-import com.mitchellbosecke.pebble.template.PebbleTemplate;
+import io.pebbletemplates.pebble.PebbleEngine;
+import io.pebbletemplates.pebble.error.PebbleException;
+import io.pebbletemplates.pebble.template.PebbleTemplate;
 
 /**
  * Assembles a template using the Pebble template engine.

diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/PredicateFilter.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/PredicateFilter.java
@@ -26,10 +26,10 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import com.mitchellbosecke.pebble.error.PebbleException;
-import com.mitchellbosecke.pebble.extension.Filter;
-import com.mitchellbosecke.pebble.template.EvaluationContext;
-import com.mitchellbosecke.pebble.template.PebbleTemplate;
+import io.pebbletemplates.pebble.error.PebbleException;
+import io.pebbletemplates.pebble.extension.Filter;
+import io.pebbletemplates.pebble.template.EvaluationContext;
+import io.pebbletemplates.pebble.template.PebbleTemplate;
 
 import to.wetransform.gradle.swarm.config.pebble.PebbleCachingEvaluator;
 import to.wetransform.gradle.swarm.config.pebble.RootOrLocalMap;

diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/PrettyJsonFilter.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/PrettyJsonFilter.java
@@ -20,10 +20,10 @@
 import java.util.List;
 import java.util.Map;
 
-import com.mitchellbosecke.pebble.error.PebbleException;
-import com.mitchellbosecke.pebble.extension.Filter;
-import com.mitchellbosecke.pebble.template.EvaluationContext;
-import com.mitchellbosecke.pebble.template.PebbleTemplate;
+import io.pebbletemplates.pebble.error.PebbleException;
+import io.pebbletemplates.pebble.extension.Filter;
+import io.pebbletemplates.pebble.template.EvaluationContext;
+import io.pebbletemplates.pebble.template.PebbleTemplate;
 
 import groovy.json.JsonOutput;