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 2017/09/30 06:37:40 UTC
karaf git commit: [KARAF-5337] Fix overrides.properties name in the
builder using by karaf-maven-plugin
Repository: karaf
Updated Branches:
refs/heads/master f00f9ca12 -> dafbc3659
[KARAF-5337] Fix overrides.properties name in the builder using by karaf-maven-plugin
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/dafbc365
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/dafbc365
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/dafbc365
Branch: refs/heads/master
Commit: dafbc3659627bc48c5716fddfce14d3dc39bbd84
Parents: f00f9ca
Author: Jean-Baptiste Onofré <jb...@apache.org>
Authored: Sat Sep 30 08:37:08 2017 +0200
Committer: Jean-Baptiste Onofré <jb...@apache.org>
Committed: Sat Sep 30 08:37:08 2017 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/karaf/profile/assembly/Builder.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/dafbc365/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
index e2657ef..c6389ad 100644
--- a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
+++ b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
@@ -629,7 +629,7 @@ public class Builder {
// Handle overrides
//
if (!overallEffective.getOverrides().isEmpty()) {
- Path overrides = etcDirectory.resolve("override.properties");
+ Path overrides = etcDirectory.resolve("overrides.properties");
List<String> lines = new ArrayList<>();
lines.add("#");
lines.add("# Generated by the karaf assembly builder");