From af5cd40ab2bcc73c0822c13b4882b5325ee84369 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 31 Oct 2024 07:28:14 +0000 Subject: [PATCH] fix(deps): update dependency io.pebbletemplates:pebble to v3.2.2 --- build.gradle | 2 +- .../assemble/template/ComposeFileEscaper.java | 2 +- .../assemble/template/ContextWrapper.groovy | 4 +- .../template/ContextWrapperResolver.java | 8 +-- .../template/DoubleQuotesEscaper.java | 8 +-- .../template/EvaluationContextMap.java | 2 +- .../assemble/template/ExpandFilter.java | 8 +-- .../assemble/template/FailFunction.java | 8 +-- .../template/GeneratePasswordFunction.java | 6 +-- .../assemble/template/GroovyScriptFilter.java | 10 ++-- .../template/GroovyScriptFunction.java | 8 +-- .../template/GroovyScriptMapFilter.groovy | 8 +-- .../actions/assemble/template/HclEscaper.java | 2 +- .../assemble/template/IfNullFilter.java | 10 ++-- .../assemble/template/IndentLineFilter.java | 8 +-- .../actions/assemble/template/IsListTest.java | 8 +-- .../actions/assemble/template/IsMapTest.java | 8 +-- .../assemble/template/IsNumberTest.java | 8 +-- .../assemble/template/IsStringTest.java | 8 +-- .../actions/assemble/template/JsonFilter.java | 8 +-- .../assemble/template/MergeFilter.java | 12 ++--- .../assemble/template/OrErrorFilter.java | 14 ++--- .../assemble/template/ParseYamlFilter.java | 8 +-- .../assemble/template/PebbleAssembler.java | 6 +-- .../assemble/template/PredicateFilter.java | 8 +-- .../assemble/template/PrettyJsonFilter.java | 8 +-- .../template/ReadFileBase64Function.java | 10 ++-- .../assemble/template/ReadFileFunction.java | 10 ++-- .../template/ReadTemplateFunction.java | 12 ++--- .../template/SwarmComposerExtension.java | 10 ++-- .../assemble/template/ToBooleanFunction.java | 8 +-- .../assemble/template/ToDoubleFunction.java | 6 +-- .../assemble/template/ToIntFunction.java | 6 +-- .../template/VersionIsAtLeastFunction.java | 8 +-- .../actions/assemble/template/YamlFilter.java | 8 +-- .../pebble/AbstractPebbleEvaluator.groovy | 16 +++--- .../pebble/DependencyCollectorVisitor.java | 54 +++++++++---------- .../config/pebble/DynamicCheckVisitor.java | 40 +++++++------- .../pebble/PebbleCachingEvaluator.groovy | 16 +++--- .../template/PebbleAssemblerTest.groovy | 4 +- .../config/pebble/ConfigEvaluatorTest.groovy | 2 +- .../pebble/PebbleCachingEvaluatorTest.groovy | 2 +- 42 files changed, 201 insertions(+), 201 deletions(-) diff --git a/build.gradle b/build.gradle index 9edf0e7..46f2aa4 100644 --- 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/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ComposeFileEscaper.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ComposeFileEscaper.java index ee5520f..d3e598a 100644 --- a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ComposeFileEscaper.java +++ b/src/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 index da41968..926b75e 100644 --- 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/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ContextWrapperResolver.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ContextWrapperResolver.java index 2b3707b..def9640 100644 --- a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ContextWrapperResolver.java +++ b/src/main/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/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/DoubleQuotesEscaper.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/DoubleQuotesEscaper.java index a78b801..b6e1e92 100644 --- a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/DoubleQuotesEscaper.java +++ b/src/main/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/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/EvaluationContextMap.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/EvaluationContextMap.java index 8e02da2..4806235 100644 --- a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/EvaluationContextMap.java +++ b/src/main/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 index 95c2538..eb1a47d 100644 --- 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 index 9ebd364..8f1af4a 100644 --- 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/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/GeneratePasswordFunction.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/GeneratePasswordFunction.java index 804fb86..dcc1a2f 100644 --- a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/GeneratePasswordFunction.java +++ b/src/main/groovy/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/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/GroovyScriptFilter.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/GroovyScriptFilter.java index cb84819..e8de9f6 100644 --- a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/GroovyScriptFilter.java +++ b/src/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/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/GroovyScriptFunction.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/GroovyScriptFunction.java index 785b9a0..c99bf76 100644 --- a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/GroovyScriptFunction.java +++ b/src/main/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 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 args, PebbleTemplate self, EvaluationContext context, int lineNumber) { diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/GroovyScriptMapFilter.groovy b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/GroovyScriptMapFilter.groovy index de56d0e..e78cfbb 100644 --- a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/GroovyScriptMapFilter.groovy +++ b/src/main/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 index 327a8ec..4650463 100644 --- 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 index 03f825b..5d009f8 100644 --- 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 null. 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 index 433982d..01011d1 100644 --- 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 index 7e1cc90..33fa844 100644 --- 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 index 1cd8410..17a86a1 100644 --- 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 index 5450e1b..7937ed4 100644 --- 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 index e16fe41..0ce8f84 100644 --- 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 index e7667c2..f0f2a0a 100644 --- 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 index 926fcfc..fabfd59 100644 --- 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 index 45cb2b4..1b5d234 100644 --- 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 index 9c881f9..e395e20 100644 --- 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 index e5b2289..baf8bbe 100644 --- 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 index 8e90156..859f47a 100644 --- 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 index 34415fc..f2d8dce 100644 --- 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; diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ReadFileBase64Function.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ReadFileBase64Function.java index 8b23a82..33497e9 100644 --- a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ReadFileBase64Function.java +++ b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ReadFileBase64Function.java @@ -26,10 +26,10 @@ 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 com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.Function; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; /** * Functions that reads a file and encodes as a base64 string. @@ -53,7 +53,7 @@ public List 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 String execute(Map args, PebbleTemplate self, EvaluationContext context, int lineNumber) { diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ReadFileFunction.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ReadFileFunction.java index 70157ff..5d5b992 100644 --- a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ReadFileFunction.java +++ b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ReadFileFunction.java @@ -27,10 +27,10 @@ import java.util.Map; import java.util.stream.Collectors; -import com.mitchellbosecke.pebble.extension.Function; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.PebbleTemplate; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.Function; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; /** * Functions that reads a file as String. @@ -54,7 +54,7 @@ public List 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 String execute(Map args, PebbleTemplate self, EvaluationContext context, int lineNumber) { diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ReadTemplateFunction.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ReadTemplateFunction.java index 8f4638b..908d77c 100644 --- a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ReadTemplateFunction.java +++ b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ReadTemplateFunction.java @@ -30,11 +30,11 @@ import java.util.Map.Entry; import java.util.stream.Collectors; -import com.mitchellbosecke.pebble.extension.Function; -import com.mitchellbosecke.pebble.template.EvaluationContext; -import com.mitchellbosecke.pebble.template.EvaluationContextImpl; -import com.mitchellbosecke.pebble.template.PebbleTemplate; -import com.mitchellbosecke.pebble.template.PebbleTemplateImpl; +import io.pebbletemplates.pebble.extension.Function; +import io.pebbletemplates.pebble.template.EvaluationContext; +import io.pebbletemplates.pebble.template.EvaluationContextImpl; +import io.pebbletemplates.pebble.template.PebbleTemplate; +import io.pebbletemplates.pebble.template.PebbleTemplateImpl; /** * Functions that processes a template like an include and returns it as string. @@ -68,7 +68,7 @@ public List 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 String execute(Map args, PebbleTemplate self, EvaluationContext context, int lineNumber) { diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/SwarmComposerExtension.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/SwarmComposerExtension.java index 8fc7ed4..950fa2a 100644 --- a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/SwarmComposerExtension.java +++ b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/SwarmComposerExtension.java @@ -23,11 +23,11 @@ import java.util.List; import java.util.Map; -import com.mitchellbosecke.pebble.attributes.AttributeResolver; -import com.mitchellbosecke.pebble.extension.AbstractExtension; -import com.mitchellbosecke.pebble.extension.Filter; -import com.mitchellbosecke.pebble.extension.Function; -import com.mitchellbosecke.pebble.extension.Test; +import io.pebbletemplates.pebble.attributes.AttributeResolver; +import io.pebbletemplates.pebble.extension.AbstractExtension; +import io.pebbletemplates.pebble.extension.Filter; +import io.pebbletemplates.pebble.extension.Function; +import io.pebbletemplates.pebble.extension.Test; import to.wetransform.gradle.swarm.actions.assemble.template.PredicateFilter.PredicateFilterType; import to.wetransform.gradle.swarm.config.pebble.PebbleCachingEvaluator; diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ToBooleanFunction.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ToBooleanFunction.java index 18894c0..9361c2d 100644 --- a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ToBooleanFunction.java +++ b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ToBooleanFunction.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; /** * Simple function that tries to convert a value to a boolean. @@ -37,7 +37,7 @@ public List 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 Boolean execute(Map args, PebbleTemplate self, EvaluationContext context, int lineNumber) { diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ToDoubleFunction.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ToDoubleFunction.java index ef8938f..c468437 100644 --- a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ToDoubleFunction.java +++ b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ToDoubleFunction.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; /** * Simple function that tries to convert a value to a double. diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ToIntFunction.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ToIntFunction.java index 6e7fb0a..59fbfb1 100644 --- a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ToIntFunction.java +++ b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/ToIntFunction.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; /** * Simple function that tries to convert a value to an integer. diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/VersionIsAtLeastFunction.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/VersionIsAtLeastFunction.java index e10e32d..c93baa3 100644 --- a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/VersionIsAtLeastFunction.java +++ b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/VersionIsAtLeastFunction.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; import com.vdurmont.semver4j.Semver; import com.vdurmont.semver4j.Semver.SemverType; @@ -46,7 +46,7 @@ public Object execute(Map args) { } /* (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 Boolean execute(Map args, PebbleTemplate self, EvaluationContext context, int lineNumber) { diff --git a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/YamlFilter.java b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/YamlFilter.java index 8682416..d4692aa 100644 --- a/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/YamlFilter.java +++ b/src/main/groovy/to/wetransform/gradle/swarm/actions/assemble/template/YamlFilter.java @@ -24,10 +24,10 @@ import org.yaml.snakeyaml.DumperOptions; import org.yaml.snakeyaml.Yaml; -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 produces YAML from input. diff --git a/src/main/groovy/to/wetransform/gradle/swarm/config/pebble/AbstractPebbleEvaluator.groovy b/src/main/groovy/to/wetransform/gradle/swarm/config/pebble/AbstractPebbleEvaluator.groovy index 5722357..df41609 100644 --- a/src/main/groovy/to/wetransform/gradle/swarm/config/pebble/AbstractPebbleEvaluator.groovy +++ b/src/main/groovy/to/wetransform/gradle/swarm/config/pebble/AbstractPebbleEvaluator.groovy @@ -26,14 +26,14 @@ import java.util.Map import org.slf4j.Logger import org.slf4j.LoggerFactory; -import com.mitchellbosecke.pebble.PebbleEngine -import com.mitchellbosecke.pebble.lexer.LexerImpl; -import com.mitchellbosecke.pebble.lexer.TokenStream; -import com.mitchellbosecke.pebble.loader.StringLoader -import com.mitchellbosecke.pebble.node.RootNode; -import com.mitchellbosecke.pebble.parser.Parser; -import com.mitchellbosecke.pebble.parser.ParserImpl -import com.mitchellbosecke.pebble.template.PebbleTemplate +import io.pebbletemplates.pebble.PebbleEngine +import io.pebbletemplates.pebble.lexer.LexerImpl; +import io.pebbletemplates.pebble.lexer.TokenStream; +import io.pebbletemplates.pebble.loader.StringLoader +import io.pebbletemplates.pebble.node.RootNode; +import io.pebbletemplates.pebble.parser.Parser; +import io.pebbletemplates.pebble.parser.ParserImpl +import io.pebbletemplates.pebble.template.PebbleTemplate import to.wetransform.gradle.swarm.actions.assemble.template.ContextWrapper; import to.wetransform.gradle.swarm.actions.assemble.template.SwarmComposerExtension diff --git a/src/main/groovy/to/wetransform/gradle/swarm/config/pebble/DependencyCollectorVisitor.java b/src/main/groovy/to/wetransform/gradle/swarm/config/pebble/DependencyCollectorVisitor.java index ab14d8e..3822cb5 100644 --- a/src/main/groovy/to/wetransform/gradle/swarm/config/pebble/DependencyCollectorVisitor.java +++ b/src/main/groovy/to/wetransform/gradle/swarm/config/pebble/DependencyCollectorVisitor.java @@ -22,33 +22,33 @@ import java.util.List; import java.util.Set; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.node.ArgumentsNode; -import com.mitchellbosecke.pebble.node.AutoEscapeNode; -import com.mitchellbosecke.pebble.node.BlockNode; -import com.mitchellbosecke.pebble.node.BodyNode; -import com.mitchellbosecke.pebble.node.ExtendsNode; -import com.mitchellbosecke.pebble.node.FlushNode; -import com.mitchellbosecke.pebble.node.ForNode; -import com.mitchellbosecke.pebble.node.IfNode; -import com.mitchellbosecke.pebble.node.ImportNode; -import com.mitchellbosecke.pebble.node.IncludeNode; -import com.mitchellbosecke.pebble.node.MacroNode; -import com.mitchellbosecke.pebble.node.NamedArgumentNode; -import com.mitchellbosecke.pebble.node.Node; -import com.mitchellbosecke.pebble.node.ParallelNode; -import com.mitchellbosecke.pebble.node.PositionalArgumentNode; -import com.mitchellbosecke.pebble.node.PrintNode; -import com.mitchellbosecke.pebble.node.RootNode; -import com.mitchellbosecke.pebble.node.SetNode; -import com.mitchellbosecke.pebble.node.TextNode; -import com.mitchellbosecke.pebble.node.expression.BinaryExpression; -import com.mitchellbosecke.pebble.node.expression.ContextVariableExpression; -import com.mitchellbosecke.pebble.node.expression.Expression; -import com.mitchellbosecke.pebble.node.expression.FunctionOrMacroInvocationExpression; -import com.mitchellbosecke.pebble.node.expression.GetAttributeExpression; -import com.mitchellbosecke.pebble.node.expression.LiteralStringExpression; -import com.mitchellbosecke.pebble.node.expression.UnaryExpression; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.node.ArgumentsNode; +import io.pebbletemplates.pebble.node.AutoEscapeNode; +import io.pebbletemplates.pebble.node.BlockNode; +import io.pebbletemplates.pebble.node.BodyNode; +import io.pebbletemplates.pebble.node.ExtendsNode; +import io.pebbletemplates.pebble.node.FlushNode; +import io.pebbletemplates.pebble.node.ForNode; +import io.pebbletemplates.pebble.node.IfNode; +import io.pebbletemplates.pebble.node.ImportNode; +import io.pebbletemplates.pebble.node.IncludeNode; +import io.pebbletemplates.pebble.node.MacroNode; +import io.pebbletemplates.pebble.node.NamedArgumentNode; +import io.pebbletemplates.pebble.node.Node; +import io.pebbletemplates.pebble.node.ParallelNode; +import io.pebbletemplates.pebble.node.PositionalArgumentNode; +import io.pebbletemplates.pebble.node.PrintNode; +import io.pebbletemplates.pebble.node.RootNode; +import io.pebbletemplates.pebble.node.SetNode; +import io.pebbletemplates.pebble.node.TextNode; +import io.pebbletemplates.pebble.node.expression.BinaryExpression; +import io.pebbletemplates.pebble.node.expression.ContextVariableExpression; +import io.pebbletemplates.pebble.node.expression.Expression; +import io.pebbletemplates.pebble.node.expression.FunctionOrMacroInvocationExpression; +import io.pebbletemplates.pebble.node.expression.GetAttributeExpression; +import io.pebbletemplates.pebble.node.expression.LiteralStringExpression; +import io.pebbletemplates.pebble.node.expression.UnaryExpression; /** * Visitor that checks if there is any dynamic content in the visited nodes. diff --git a/src/main/groovy/to/wetransform/gradle/swarm/config/pebble/DynamicCheckVisitor.java b/src/main/groovy/to/wetransform/gradle/swarm/config/pebble/DynamicCheckVisitor.java index 2207ab3..03d9484 100644 --- a/src/main/groovy/to/wetransform/gradle/swarm/config/pebble/DynamicCheckVisitor.java +++ b/src/main/groovy/to/wetransform/gradle/swarm/config/pebble/DynamicCheckVisitor.java @@ -16,26 +16,26 @@ package to.wetransform.gradle.swarm.config.pebble; -import com.mitchellbosecke.pebble.extension.NodeVisitor; -import com.mitchellbosecke.pebble.node.ArgumentsNode; -import com.mitchellbosecke.pebble.node.AutoEscapeNode; -import com.mitchellbosecke.pebble.node.BlockNode; -import com.mitchellbosecke.pebble.node.BodyNode; -import com.mitchellbosecke.pebble.node.ExtendsNode; -import com.mitchellbosecke.pebble.node.FlushNode; -import com.mitchellbosecke.pebble.node.ForNode; -import com.mitchellbosecke.pebble.node.IfNode; -import com.mitchellbosecke.pebble.node.ImportNode; -import com.mitchellbosecke.pebble.node.IncludeNode; -import com.mitchellbosecke.pebble.node.MacroNode; -import com.mitchellbosecke.pebble.node.NamedArgumentNode; -import com.mitchellbosecke.pebble.node.Node; -import com.mitchellbosecke.pebble.node.ParallelNode; -import com.mitchellbosecke.pebble.node.PositionalArgumentNode; -import com.mitchellbosecke.pebble.node.PrintNode; -import com.mitchellbosecke.pebble.node.RootNode; -import com.mitchellbosecke.pebble.node.SetNode; -import com.mitchellbosecke.pebble.node.TextNode; +import io.pebbletemplates.pebble.extension.NodeVisitor; +import io.pebbletemplates.pebble.node.ArgumentsNode; +import io.pebbletemplates.pebble.node.AutoEscapeNode; +import io.pebbletemplates.pebble.node.BlockNode; +import io.pebbletemplates.pebble.node.BodyNode; +import io.pebbletemplates.pebble.node.ExtendsNode; +import io.pebbletemplates.pebble.node.FlushNode; +import io.pebbletemplates.pebble.node.ForNode; +import io.pebbletemplates.pebble.node.IfNode; +import io.pebbletemplates.pebble.node.ImportNode; +import io.pebbletemplates.pebble.node.IncludeNode; +import io.pebbletemplates.pebble.node.MacroNode; +import io.pebbletemplates.pebble.node.NamedArgumentNode; +import io.pebbletemplates.pebble.node.Node; +import io.pebbletemplates.pebble.node.ParallelNode; +import io.pebbletemplates.pebble.node.PositionalArgumentNode; +import io.pebbletemplates.pebble.node.PrintNode; +import io.pebbletemplates.pebble.node.RootNode; +import io.pebbletemplates.pebble.node.SetNode; +import io.pebbletemplates.pebble.node.TextNode; /** * Visitor that checks if there is any dynamic content in the visited nodes. diff --git a/src/main/groovy/to/wetransform/gradle/swarm/config/pebble/PebbleCachingEvaluator.groovy b/src/main/groovy/to/wetransform/gradle/swarm/config/pebble/PebbleCachingEvaluator.groovy index cf3ecab..c63ee1b 100644 --- a/src/main/groovy/to/wetransform/gradle/swarm/config/pebble/PebbleCachingEvaluator.groovy +++ b/src/main/groovy/to/wetransform/gradle/swarm/config/pebble/PebbleCachingEvaluator.groovy @@ -33,14 +33,14 @@ import java.util.stream.Collectors import org.slf4j.Logger import org.slf4j.LoggerFactory; -import com.mitchellbosecke.pebble.PebbleEngine -import com.mitchellbosecke.pebble.lexer.LexerImpl; -import com.mitchellbosecke.pebble.lexer.TokenStream; -import com.mitchellbosecke.pebble.loader.StringLoader -import com.mitchellbosecke.pebble.node.RootNode; -import com.mitchellbosecke.pebble.parser.Parser; -import com.mitchellbosecke.pebble.parser.ParserImpl -import com.mitchellbosecke.pebble.template.PebbleTemplate +import io.pebbletemplates.pebble.PebbleEngine +import io.pebbletemplates.pebble.lexer.LexerImpl; +import io.pebbletemplates.pebble.lexer.TokenStream; +import io.pebbletemplates.pebble.loader.StringLoader +import io.pebbletemplates.pebble.node.RootNode; +import io.pebbletemplates.pebble.parser.Parser; +import io.pebbletemplates.pebble.parser.ParserImpl +import io.pebbletemplates.pebble.template.PebbleTemplate import groovy.transform.CompileStatic import groovy.transform.TypeCheckingMode diff --git a/src/test/groovy/to/wetransform/gradle/swarm/actions/assemble/template/PebbleAssemblerTest.groovy b/src/test/groovy/to/wetransform/gradle/swarm/actions/assemble/template/PebbleAssemblerTest.groovy index b4acc7f..db3ac36 100644 --- a/src/test/groovy/to/wetransform/gradle/swarm/actions/assemble/template/PebbleAssemblerTest.groovy +++ b/src/test/groovy/to/wetransform/gradle/swarm/actions/assemble/template/PebbleAssemblerTest.groovy @@ -18,8 +18,8 @@ package to.wetransform.gradle.swarm.actions.assemble.template import org.junit.Test -import com.mitchellbosecke.pebble.error.AttributeNotFoundException -import com.mitchellbosecke.pebble.error.PebbleException +import io.pebbletemplates.pebble.error.AttributeNotFoundException +import io.pebbletemplates.pebble.error.PebbleException import to.wetransform.gradle.swarm.config.ConfigEvaluator import to.wetransform.gradle.swarm.config.pebble.PebbleCachingEvaluator diff --git a/src/test/groovy/to/wetransform/gradle/swarm/config/pebble/ConfigEvaluatorTest.groovy b/src/test/groovy/to/wetransform/gradle/swarm/config/pebble/ConfigEvaluatorTest.groovy index 00856ed..7fc1cdd 100644 --- a/src/test/groovy/to/wetransform/gradle/swarm/config/pebble/ConfigEvaluatorTest.groovy +++ b/src/test/groovy/to/wetransform/gradle/swarm/config/pebble/ConfigEvaluatorTest.groovy @@ -22,7 +22,7 @@ import org.junit.BeforeClass import org.junit.Ignore; import org.junit.Test -import com.mitchellbosecke.pebble.error.AttributeNotFoundException +import io.pebbletemplates.pebble.error.AttributeNotFoundException import to.wetransform.gradle.swarm.config.ConfigEvaluator; diff --git a/src/test/groovy/to/wetransform/gradle/swarm/config/pebble/PebbleCachingEvaluatorTest.groovy b/src/test/groovy/to/wetransform/gradle/swarm/config/pebble/PebbleCachingEvaluatorTest.groovy index fa16c87..c299078 100644 --- a/src/test/groovy/to/wetransform/gradle/swarm/config/pebble/PebbleCachingEvaluatorTest.groovy +++ b/src/test/groovy/to/wetransform/gradle/swarm/config/pebble/PebbleCachingEvaluatorTest.groovy @@ -16,7 +16,7 @@ package to.wetransform.gradle.swarm.config.pebble -import com.mitchellbosecke.pebble.error.PebbleException +import io.pebbletemplates.pebble.error.PebbleException import org.junit.Ignore import org.junit.Test