Merge "Fix velocity deprecated configuration keys" into stable-3.9
diff --git a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/PluginVelocityRuntimeProvider.java b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/PluginVelocityRuntimeProvider.java
index e1b4d9b..1d81f62 100644
--- a/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/PluginVelocityRuntimeProvider.java
+++ b/github-plugin/src/main/java/com/googlesource/gerrit/plugins/github/velocity/PluginVelocityRuntimeProvider.java
@@ -29,12 +29,12 @@
@Singleton
public class PluginVelocityRuntimeProvider implements Provider<RuntimeInstance> {
- private static final String VELOCITY_FILE_RESOURCE_LOADER_PATH = "file.resource.loader.path";
- private static final String VELOCITY_FILE_RESOURCE_LOADER_CLASS = "file.resource.loader.class";
- private static final String VELOCITY_CLASS_RESOURCE_LOADER_CLASS = "class.resource.loader.class";
- private static final String VELOCITY_JAR_RESOURCE_LOADER_CLASS = "jar.resource.loader.class";
- private static final String VELOCITY_JAR_RESOURCE_LOADER_PATH = "jar.resource.loader.path";
- private static final String VELOCITY_RESOURCE_LOADER = "resource.loader";
+ private static final String VELOCITY_FILE_RESOURCE_LOADER_PATH = "resource.loader.file.path";
+ private static final String VELOCITY_FILE_RESOURCE_LOADER_CLASS = "resource.loader.jar.path";
+ private static final String VELOCITY_CLASS_RESOURCE_LOADER_CLASS = "resource.loader.class.class";
+ private static final String VELOCITY_JAR_RESOURCE_LOADER_CLASS = "resource.loader.jar.class";
+ private static final String VELOCITY_JAR_RESOURCE_LOADER_PATH = "resource.loader.jar.path";
+ private static final String VELOCITY_RESOURCE_LOADER = "resource.loaders";
private final SitePaths site;
private String pluginName;