karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject karaf git commit: [KARAF-5337] Fix overrides.properties name in the builder using by karaf-maven-plugin
Date Sat, 30 Sep 2017 06:38:42 GMT
Repository: karaf
Updated Branches:
  refs/heads/karaf-4.0.x 774581acd -> b4bcdd7fe


[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/b4bcdd7f
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/b4bcdd7f
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/b4bcdd7f

Branch: refs/heads/karaf-4.0.x
Commit: b4bcdd7fe3e2a858b1d1e73a7a5c59f9db548e1d
Parents: 774581a
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Sat Sep 30 08:37:08 2017 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Sat Sep 30 08:38:31 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/b4bcdd7f/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 5ff6ad9..ff121f4 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
@@ -573,7 +573,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");


Mime
View raw message