You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2015/10/08 17:35:58 UTC
[1/2] karaf git commit: [KARAF-4055] do not use @ as a delimiter
Repository: karaf
Updated Branches:
refs/heads/master 7ddb3bae7 -> d16532fb6
[KARAF-4055] do not use @ as a delimiter
The current filtering of the feature XML is using ${*} and @ as a
delimiter. If you are using a single @ (e.g. an email address in the
license) in your XML the processing of the XML is done incorrectly.
Signed-off-by: Markus Rathgeb <ma...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/faca848e
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/faca848e
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/faca848e
Branch: refs/heads/master
Commit: faca848e1d265d704c2d549140f5456230b3be86
Parents: fb857f4
Author: Markus Rathgeb <ma...@gmail.com>
Authored: Thu Oct 8 16:47:35 2015 +0200
Committer: Markus Rathgeb <ma...@gmail.com>
Committed: Thu Oct 8 17:17:33 2015 +0200
----------------------------------------------------------------------
.../tooling/features/GenerateDescriptorMojo.java | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/faca848e/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
index 408a336..73bd90d 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/features/GenerateDescriptorMojo.java
@@ -32,6 +32,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
+import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.jar.JarInputStream;
@@ -53,6 +54,7 @@ import org.apache.karaf.tooling.utils.ManifestUtils;
import org.apache.karaf.tooling.utils.MojoSupport;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.logging.Log;
@@ -62,8 +64,10 @@ import org.apache.maven.plugins.annotations.LifecyclePhase;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.apache.maven.project.MavenProject;
import org.apache.maven.shared.filtering.MavenFileFilter;
import org.apache.maven.shared.filtering.MavenFilteringException;
+import org.apache.maven.shared.filtering.MavenResourcesExecution;
import org.apache.maven.shared.filtering.MavenResourcesFiltering;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.util.ReaderFactory;
@@ -652,8 +656,18 @@ public class GenerateDescriptorMojo extends MojoSupport {
+ ", i.e. build is platform dependent!");
}
targetFile.getParentFile().mkdirs();
+
+ final MavenResourcesExecution mre = new MavenResourcesExecution();
+ mre.setMavenProject(project);
+ mre.setMavenSession(mavenSession);
+ mre.setFilters(null);
+ mre.setEscapedBackslashesInFilePath(true);
+ final LinkedHashSet<String> delimiters = new LinkedHashSet<>();
+ delimiters.add("${*}");
+ mre.setDelimiters(delimiters);
+
@SuppressWarnings("rawtypes")
- List filters = mavenFileFilter.getDefaultFilterWrappers(project, null, true, mavenSession, null);
+ List filters = mavenFileFilter.getDefaultFilterWrappers(mre);
mavenFileFilter.copyFile(sourceFile, targetFile, true, filters, encoding, true);
} catch (MavenFilteringException e) {
throw new MojoExecutionException(e.getMessage(), e);
[2/2] karaf git commit: Merge branch 'kbp-feature-at' of
https://github.com/maggu2810/karaf
Posted by jb...@apache.org.
Merge branch 'kbp-feature-at' of https://github.com/maggu2810/karaf
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d16532fb
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d16532fb
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d16532fb
Branch: refs/heads/master
Commit: d16532fb62d7e5caf521f4201638f3e4be55d58a
Parents: 7ddb3ba faca848
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Thu Oct 8 17:22:04 2015 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Thu Oct 8 17:22:04 2015 +0200
----------------------------------------------------------------------
.../tooling/features/GenerateDescriptorMojo.java | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
----------------------------------------------------------------------