| commit | 952f7c9e103770d7238467de7c6b0870491a1a2f | [log] [tgz] |
|---|---|---|
| author | Richard S. Hall <rickhall@apache.org> | Mon May 21 13:37:43 2007 +0000 |
| committer | Richard S. Hall <rickhall@apache.org> | Mon May 21 13:37:43 2007 +0000 |
| tree | 5767864c108a6383b6de016cd4dfb1fa1543e5f8 | |
| parent | 376e83e2143f56fbf59e331d75e53d395bbe5bab [diff] |
Applied patch (FELIX-261) to fix resource clashes between BND and Maven. git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@540140 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java index 12eccf3..6211b88 100644 --- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java +++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
@@ -154,7 +154,7 @@ if (mavenResourcePaths.length() > 0) { final String includeResource = (String)properties.get(Analyzer.INCLUDE_RESOURCE); if (includeResource != null) { - properties.put(Analyzer.INCLUDE_RESOURCE, includeResource + ',' + mavenResourcePaths); + getLog().warn(Analyzer.INCLUDE_RESOURCE + ": overriding " + mavenResourcePaths + " with " + includeResource ); } else { properties.put(Analyzer.INCLUDE_RESOURCE, mavenResourcePaths); }
diff --git a/framework/src/main/resources/org/apache/felix/framework/Felix.properties b/framework/src/main/resources/org/apache/felix/framework/Felix.properties index 7700fed..768c415 100644 --- a/framework/src/main/resources/org/apache/felix/framework/Felix.properties +++ b/framework/src/main/resources/org/apache/felix/framework/Felix.properties
@@ -1 +1 @@ -felix.version=0.9.0-incubator-SNAPSHOT +felix.version=${pom.version}