Reactivate Pebble extension

closes: #234
eclipse-ee4j · Apr 30, 2021 · de9d1c0 · de9d1c0
1 parent a47b665
commit de9d1c0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/ext/pebble/pom.xml b/ext/pebble/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.eclipse.krazo.ext</groupId>
         <artifactId>krazo-ext-parent</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>krazo-pebble</artifactId>
     <packaging>jar</packaging>
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>io.pebbletemplates</groupId>
             <artifactId>pebble</artifactId>
-            <version>3.1.4</version>
+            <version>3.1.5</version>
         </dependency>
         <dependency>
             <groupId>junit</groupId>

diff --git a/ext/pebble/src/main/java/org/eclipse/krazo/ext/pebble/PebbleEngineProducer.java b/ext/pebble/src/main/java/org/eclipse/krazo/ext/pebble/PebbleEngineProducer.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2018, 2019 Eclipse Krazo committers and contributors
+ * Copyright (c) 2018-2021 Eclipse Krazo committers and contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 import com.mitchellbosecke.pebble.PebbleEngine;
 import com.mitchellbosecke.pebble.extension.Extension;
 import com.mitchellbosecke.pebble.extension.escaper.EscapingStrategy;
-import com.mitchellbosecke.pebble.loader.ServletLoader;
+import com.mitchellbosecke.pebble.loader.Servlet5Loader;
 import java.lang.reflect.InvocationTargetException;
 import org.eclipse.krazo.engine.ViewEngineConfig;
 
@@ -118,7 +118,7 @@ public PebbleEngine pebbleEngine() {
                 }
             });
 
-        engine.loader(new ServletLoader(servletContext));
+        engine.loader(new Servlet5Loader(servletContext));
 
         return engine.build();
     }

diff --git a/ext/pebble/src/test/java/org/eclipse/krazo/ext/pebble/PebbleEngineProducerTest.java b/ext/pebble/src/test/java/org/eclipse/krazo/ext/pebble/PebbleEngineProducerTest.java
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2014-2015 Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2018, 2019 Eclipse Krazo committers and contributors
+ * Copyright (c) 2018-2021 Eclipse Krazo committers and contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
 import com.mitchellbosecke.pebble.PebbleEngine;
 import com.mitchellbosecke.pebble.extension.escaper.EscapeFilter;
-import com.mitchellbosecke.pebble.loader.ServletLoader;
+import com.mitchellbosecke.pebble.loader.Servlet5Loader;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -48,7 +48,7 @@ public void shouldCreateAnInstanceOfPebbleEngine() {
 
     @Test
     public void shouldUseServletContextLoader() {
-        assertTrue(pebbleEngineProducer.pebbleEngine().getLoader() instanceof ServletLoader);
+        assertTrue(pebbleEngineProducer.pebbleEngine().getLoader() instanceof Servlet5Loader);
     }
 
     @Test

diff --git a/ext/pom.xml b/ext/pom.xml
@@ -47,8 +47,7 @@
         <!-- remove until jakarta is supported by thymeleaf -->
 <!--        <module>thymeleaf</module>-->
         <module>velocity</module>
-        <!-- remove until jakarta servlet is supported by pebble -->
-<!--        <module>pebble</module>-->
+        <module>pebble</module>
     </modules>
 
     <dependencies>