Skip to content

fix: use instance Velocity engine for appended resources #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
efegokdemir wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: use instance Velocity engine for appended resources #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ...ain/java/org/apache/maven/plugin/resources/remote/AbstractProcessRemoteResourcesMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@
import org.apache.maven.shared.filtering.MavenFileFilterRequest;
import org.apache.maven.shared.filtering.MavenFilteringException;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException;
Expand Down Expand Up @@ -980,8 +979,7 @@ protected void processResourceBundles(ClassLoader classLoader, VelocityContext c
try (CachingOutputStream os = new CachingOutputStream(outputFile);
Reader reader = getReader(bundle.getSourceEncoding(), appendedVmResourceFile);
Writer writer = getWriter(bundle.getSourceEncoding(), os)) {
Velocity.init();
Velocity.evaluate(context, writer, "remote-resources", reader);
velocity.evaluate(context, writer, "remote-resources", reader);
}
}
}
Expand Down
27 changes: 27 additions & 0 deletions src/test/java/org/apache/maven/plugin/resources/remote/RemoteResourcesMojoTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,33 @@ public void testFilteredBundles() throws Exception {
assertTrue(data.contains("projectsSortedByOrganization: {"));
}

public void testFilteredAppendedResource() throws Exception {
final MavenProjectResourcesStub project = createTestProject("default-appended-filtered-resource");
final ProcessRemoteResourcesMojo mojo =
lookupProcessMojoWithSettings(project, new String[] {"test:test:1.1"});

setupDefaultProject(project);

String path = pathOf(new DefaultArtifact(
"test", "test", VersionRange.createFromVersion("1.1"), null, "jar", "", new DefaultArtifactHandler()));
File file = new File(path);
file.getParentFile().mkdirs();
buildResourceBundle("default-appended-filtered-resource-create", null, new String[] {"FILTER.txt.vm"}, file);

File appendedResourcesDirectory = new File(project.getBasedir(), "src/main/appended-resources");
appendedResourcesDirectory.mkdirs();
FileUtils.fileWrite(
new File(appendedResourcesDirectory, "FILTER.txt.vm").getAbsolutePath(),
"appended: $project.name");
setVariableValueToObject(mojo, "appendedResourcesDirectory", appendedResourcesDirectory);

mojo.execute();

file = (File) getVariableValueFromObject(mojo, "outputDirectory");
String data = FileUtils.fileRead(new File(file, "FILTER.txt"));
assertTrue(data.contains("appended: Test Project default-appended-filtered-resource"));
}

public void testFilteredBundlesWithProjectProperties() throws Exception {
final MavenProjectResourcesStub project = createTestProject("default-filterbundles-two");
final ProcessRemoteResourcesMojo mojo =
Expand Down