Jenkins build is back to stable : karaf-4.0.x » Apache Karaf :: Integration Tests #439

2017-07-04 Thread Apache Jenkins Server 
See

Jenkins build is back to stable : karaf-4.0.x #439

2017-07-04 Thread Apache Jenkins Server 
See

Jenkins build is still unstable: karaf-master #4421

2017-07-04 Thread Apache Jenkins Server 
See

karaf git commit: Revert "[KARAF-5199] Fix ordering of candidates when comparing 2 bundles"

2017-07-04 Thread jbonofre 
Repository: karaf
Updated Branches:
  refs/heads/master 8d7223be5 -> 4992c1bec


Revert "[KARAF-5199] Fix ordering of candidates when comparing 2 bundles"

This reverts commit 9803938c307b4951105b8ac4def8cc5645f042f4.


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/4992c1be
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/4992c1be
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/4992c1be

Branch: refs/heads/master
Commit: 4992c1bec4326f7db955228f5dfe9ba18ac9d983
Parents: 8d7223b
Author: Jean-Baptiste Onofré 
Authored: Tue Jul 4 17:23:06 2017 +0200
Committer: Jean-Baptiste Onofré 
Committed: Tue Jul 4 21:25:41 2017 +0200

--
 .../internal/region/CandidateComparator.java|  6 ++--
 .../features/internal/region/SubsystemTest.java | 22 -
 .../karaf/features/internal/region/data10/a.mf  |  6 
 .../karaf/features/internal/region/data10/b1.mf |  6 
 .../karaf/features/internal/region/data10/b2.mf |  6 
 .../internal/region/data10/features.xml | 34 
 6 files changed, 2 insertions(+), 78 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/4992c1be/features/core/src/main/java/org/apache/karaf/features/internal/region/CandidateComparator.java
--
diff --git 
a/features/core/src/main/java/org/apache/karaf/features/internal/region/CandidateComparator.java
 
b/features/core/src/main/java/org/apache/karaf/features/internal/region/CandidateComparator.java
index 9980c1b..9fecd4b 100644
--- 
a/features/core/src/main/java/org/apache/karaf/features/internal/region/CandidateComparator.java
+++ 
b/features/core/src/main/java/org/apache/karaf/features/internal/region/CandidateComparator.java
@@ -81,9 +81,7 @@ public class CandidateComparator implements 
Comparator {
 final Resource resource2 = cap2.getResource();
 String n1 = ResolverUtil.getSymbolicName(resource1);
 String n2 = ResolverUtil.getSymbolicName(resource2);
-if (n1 != null && n2 != null) {
-c = n2.compareTo(n1);
-}
+c = n1.compareTo(n2);
 // Resources looks like identical, but it required by different 
features/subsystems/regions
 // so use this difference for deterministic heuristic
 if (c == 0) {
@@ -93,7 +91,7 @@ public class CandidateComparator implements 
Comparator {
 // In case the owners are the same but with different 
version, prefer the latest one
 // TODO: this may not be fully correct, as we'd need to 
separate names/versions
 // TODO: and do a real version comparison
-c = o2.compareTo(o1);
+c = - o1.compareTo(o2);
 }
 }
 }

http://git-wip-us.apache.org/repos/asf/karaf/blob/4992c1be/features/core/src/test/java/org/apache/karaf/features/internal/region/SubsystemTest.java
--
diff --git 
a/features/core/src/test/java/org/apache/karaf/features/internal/region/SubsystemTest.java
 
b/features/core/src/test/java/org/apache/karaf/features/internal/region/SubsystemTest.java
index 378f0ce..f6b6563 100644
--- 
a/features/core/src/test/java/org/apache/karaf/features/internal/region/SubsystemTest.java
+++ 
b/features/core/src/test/java/org/apache/karaf/features/internal/region/SubsystemTest.java
@@ -305,28 +305,6 @@ public class SubsystemTest {
 verify(resolver, expected);
 }
 
-@Test
-public void testBundleNoVersion() throws Exception {
-RepositoryImpl repo = new 
RepositoryImpl(getClass().getResource("data10/features.xml").toURI());
-
-Map features = new HashMap<>();
-addToMapSet(features, "root", "f");
-
-Map expected = new HashMap<>();
-addToMapSet(expected, "root", "a/1.0.0");
-addToMapSet(expected, "root", "b_2_0/0.0.0");
-
-SubsystemResolver resolver = new SubsystemResolver(this.resolver, new 
TestDownloadManager(getClass(), "data10"));
-resolver.prepare(Arrays.asList(repo.getFeatures()),
-features,
-Collections.emptyMap());
-resolver.resolve(Collections.emptySet(),
-FeaturesService.DEFAULT_FEATURE_RESOLUTION_RANGE,
-null, null, null);
-
-verify(resolver, expected);
-}
-
 private void verify(SubsystemResolver resolver, Map 
expected) {
 Map mapping = getBundleNamesPerRegions(resolver);
 if (!expected.equals(mapping)) {

Jenkins build became unstable: karaf-4.1.x #83

2017-07-04 Thread Apache Jenkins Server 
See

karaf git commit: Revert "[KARAF-5157] Upgrade to Felix Resolver 1.14.0" as it introduced issue FELIX-5663. This reverts commit a6e81d1d9eb9bc4fc466f9146446f0904a8489b9.

2017-07-04 Thread cschneider 
Repository: karaf
Updated Branches:
  refs/heads/master 2aedd8d9c -> 8d7223be5


Revert "[KARAF-5157] Upgrade to Felix Resolver 1.14.0"
as it introduced issue FELIX-5663.
This reverts commit a6e81d1d9eb9bc4fc466f9146446f0904a8489b9.


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/8d7223be
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/8d7223be
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/8d7223be

Branch: refs/heads/master
Commit: 8d7223be5965ec11d7849d2368c99096493b4d8e
Parents: 2aedd8d
Author: Christian Schneider 
Authored: Tue Jul 4 18:20:04 2017 +0200
Committer: Christian Schneider 
Committed: Tue Jul 4 18:58:25 2017 +0200

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/8d7223be/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 346f328..22b1417 100644
--- a/pom.xml
+++ b/pom.xml
@@ -205,7 +205,7 @@
 1.0.4
 
2.0.6
 1.12.0
-1.14.0
+1.12.0
 
 1.0.0
 1.0.0

Jenkins build is still unstable: karaf-master #4418

2017-07-04 Thread Apache Jenkins Server 
See

svn commit: r1800783 - /karaf/site/production/community.html

2017-07-04 Thread cschneider 
Author: cschneider
Date: Tue Jul  4 13:12:32 2017
New Revision: 1800783

URL: http://svn.apache.org/viewvc?rev=1800783=rev
Log:
[scm-publish] Updating main website contents

Modified:
karaf/site/production/community.html

Modified: karaf/site/production/community.html
URL: 
http://svn.apache.org/viewvc/karaf/site/production/community.html?rev=1800783=1800782=1800783=diff
==
--- karaf/site/production/community.html (original)
+++ karaf/site/production/community.html Tue Jul  4 13:12:32 2017
@@ -98,12 +98,27 @@
 The best way to provide changes is to fork karaf repo on github and 
provide a pull request with your changes. To make it easy to apply your changes 
please use the following conventions:
 
   Every pull request should have a matching jira issue
-  Do the change in a branch that is named like the jira issue id 
e.g KARAF-1234
+  Do the change in a branch that is named like the jira issue id 
e.g KARAF-1234. To create this branch you can use:
+   
+git clone http://github.com/apache/karaf
+git fetch --all
+git checkout -b my-branch origin/master
+   
+ Don't forget to periodically rebase your branch:
+
+git pull --rebase
+git push GitHubUser my-branch --force
+
+  
   Every commit in the branch should start with the jira issue id 
like this "[KARAF-123] More details"
-  You can squash your commits into one and force push your branch 
(not mandatory)
-  Test that your change works by adapting or adding tests
+  You can squash your commits into one and force push your branch 
(not mandatory) using git rebase -i apache/master
+  Test that your change works by adapting or adding tests.
   http://programmer.97things.oreilly.com/wiki/index.php/The_Boy_Scout_Rule;>Follow
 the boy scout rule to "Always leave the campground cleaner than you found 
it."
-  Make sure you do a build before doing a PR
+  Make sure you do a build before doing a PR. The build has to be 
successfull:
+   
+mvn clean verify -Prelease -fae -T 1C
+   
+ 
   If your PR has conflicts with the master then rebase the branch. 
PRs with conflicts are unlikely to be applied
   Do not change too much in a PR. The smaller the PR the easier it 
is to apply and the faster it will be done
   Sometimes PRs get lost. Do not hesitate to ask on the dev list 
if your PR seems to be ignored
@@ -111,22 +126,70 @@
 
 Review pull requests
 
-Anyone can review pull requests. If you want to review a PR then 
comment with R:@yourgithubid. This marks that you will do the review and also 
apply if you are a committer.
-When reviewing check if the changes are done in a clean way and are 
tested with a unit and possibly integration test. Check that the build does not 
report more test failures than before. If you are not a committer then write a 
comment if you recommend a merge or not. Provide good instructions for the 
contributor how to improve his PR if it is not yet ok. Make sure you do a 
review timely. By commenting that you do a review you kind of block others from 
applying the change.
+Anyone can review pull requests but the merge can be done only by a 
committer.
+If you want to review a PR then comment with 
R:@yourgithubid. This marks that you will do the review and also 
apply if you are a committer.
+When reviewing check if the changes are done in a clean way and are 
tested with a unit and possibly integration test. Check that the build does not 
report more test failures than before. If you are not a committer then write a 
comment if you recommend a merge or not. Provide good instructions for the 
contributor how to improve his PR if it is not yet ok. Make sure you do a 
review timely. By commenting that you do a review you kind of block others from 
applying the change.
+NB: Jenkins performs a build for each pull request. You can trigger a 
new build on a pull request using "retest this please" in a PR comment.
 
 Apply pull requests
 
 This can obviously only be done by a committer. Do the following steps:
 
 
-  Add the remote repository. git remote add otheruser git:path to 
repo
-  Fetch the remote repo. git fetch otheruser
-  Check the PR. git checkout branch. Do a build
-  Merge into master. git checkout master. git merge 
otheruser/branch. Do a build. git push
-  Eventually backport to bugfix branches using git cherry-pick
+  
+  As one time config, you can rename your git remote and add 
apache one:
+   
+git remote add apache https://git-wip-us.apache.org/repos/asf/karaf.git
+   
+  We recommand renaming origin as

svn commit: r1800782 - /karaf/site/trunk/src/main/webapp/community.html

2017-07-04 Thread cschneider 
Author: cschneider
Date: Tue Jul  4 13:12:13 2017
New Revision: 1800782

URL: http://svn.apache.org/viewvc?rev=1800782=rev
Log:
Document how to maintain the website

Modified:
karaf/site/trunk/src/main/webapp/community.html

Modified: karaf/site/trunk/src/main/webapp/community.html
URL: 
http://svn.apache.org/viewvc/karaf/site/trunk/src/main/webapp/community.html?rev=1800782=1800781=1800782=diff
==
--- karaf/site/trunk/src/main/webapp/community.html (original)
+++ karaf/site/trunk/src/main/webapp/community.html Tue Jul  4 13:12:13 2017
@@ -186,6 +186,10 @@ git push apache HEAD:master
  You can delete the PR branch: git branch -D 
pr-xxx.
 
 
+Improve the karaf website
+
+The content of the website http://karaf.apache.org is stored in the 
svn repo https://svn.apache.org/repos/asf/karaf/site/trunk;>karaf 
site. See the https://svn.apache.org/repos/asf/karaf/site/trunk/README.md;>README.md
 on top level for how to test and publish the website.
+
 Support
 If you are experiencing problems using Karaf then please report your 
problem to our https://issues.apache.org/jira/browse/KARAF;>issue 
tracker.
 You may also find it useful to discuss your issues with the community 
on the mailing lists or IRC.

svn commit: r1800766 - /karaf/site/production/community.html

2017-07-04 Thread cschneider 
Author: cschneider
Date: Tue Jul  4 12:15:19 2017
New Revision: 1800766

URL: http://svn.apache.org/viewvc?rev=1800766=rev
Log:
[scm-publish] Updating main website contents

Modified:
karaf/site/production/community.html

Modified: karaf/site/production/community.html
URL: 
http://svn.apache.org/viewvc/karaf/site/production/community.html?rev=1800766=1800765=1800766=diff
==
--- karaf/site/production/community.html (original)
+++ karaf/site/production/community.html Tue Jul  4 12:15:19 2017
@@ -98,27 +98,12 @@
 The best way to provide changes is to fork karaf repo on github and 
provide a pull request with your changes. To make it easy to apply your changes 
please use the following conventions:
 
   Every pull request should have a matching jira issue
-  Do the change in a branch that is named like the jira issue id 
e.g KARAF-1234. To create this branch you can use:
-   
-git clone http://github.com/apache/karaf
-git fetch --all
-git checkout -b my-branch origin/master
-   
- Don't forget to periodically rebase your branch:
-
-git pull --rebase
-git push GitHubUser my-branch --force
-
-  
+  Do the change in a branch that is named like the jira issue id 
e.g KARAF-1234
   Every commit in the branch should start with the jira issue id 
like this "[KARAF-123] More details"
-  You can squash your commits into one and force push your branch 
(not mandatory) using git rebase -i apache/master
-  Test that your change works by adapting or adding tests.
+  You can squash your commits into one and force push your branch 
(not mandatory)
+  Test that your change works by adapting or adding tests
   http://programmer.97things.oreilly.com/wiki/index.php/The_Boy_Scout_Rule;>Follow
 the boy scout rule to "Always leave the campground cleaner than you found 
it."
-  Make sure you do a build before doing a PR. The build has to be 
successfull:
-   
-mvn clean verify -Prelease -fae -T 1C
-   
- 
+  Make sure you do a build before doing a PR
   If your PR has conflicts with the master then rebase the branch. 
PRs with conflicts are unlikely to be applied
   Do not change too much in a PR. The smaller the PR the easier it 
is to apply and the faster it will be done
   Sometimes PRs get lost. Do not hesitate to ask on the dev list 
if your PR seems to be ignored
@@ -126,64 +111,20 @@ mvn clean verify -Prelease -fae -T 1C
 
 Review pull requests
 
-Anyone can review pull requests but the merge can be done only by a 
committer.
-If you want to review a PR then comment with 
R:@yourgithubid. This marks that you will do the review and also 
apply if you are a committer.
-When reviewing check if the changes are done in a clean way and are 
tested with a unit and possibly integration test. Check that the build does not 
report more test failures than before. If you are not a committer then write a 
comment if you recommend a merge or not. Provide good instructions for the 
contributor how to improve his PR if it is not yet ok. Make sure you do a 
review timely. By commenting that you do a review you kind of block others from 
applying the change.
-NB: Jenkins performs a build for each pull request. You can trigger a 
new build on a pull request using "retest this please" in a PR comment.
+Anyone can review pull requests. If you want to review a PR then 
comment with R:@yourgithubid. This marks that you will do the review and also 
apply if you are a committer.
+When reviewing check if the changes are done in a clean way and are 
tested with a unit and possibly integration test. Check that the build does not 
report more test failures than before. If you are not a committer then write a 
comment if you recommend a merge or not. Provide good instructions for the 
contributor how to improve his PR if it is not yet ok. Make sure you do a 
review timely. By commenting that you do a review you kind of block others from 
applying the change.
 
 Apply pull requests
 
 This can obviously only be done by a committer. Do the following steps:
 
 
-  
-  As one time config, you can rename your git remote and add 
apache one:
-   
-git remote add apache https://git-wip-us.apache.org/repos/asf/karaf.git
-   
-  We recommand renaming origin as 
github:
-
-git remote rename origin github
-
-For github remote, add an additional fetch reference, 
which will cause every pull request to be made available as a remote branch in 
your workspace.
-
-git config --local --add remote.github.fetch 
'+refs/pull/*/head:refs/remotes/github/pr/*'
-
-You can

svn commit: r1800765 - /karaf/site/production/community.html

2017-07-04 Thread jbonofre 
Author: jbonofre
Date: Tue Jul  4 12:14:31 2017
New Revision: 1800765

URL: http://svn.apache.org/viewvc?rev=1800765=rev
Log:
[scm-publish] Updating main website contents

Modified:
karaf/site/production/community.html

Modified: karaf/site/production/community.html
URL: 
http://svn.apache.org/viewvc/karaf/site/production/community.html?rev=1800765=1800764=1800765=diff
==
--- karaf/site/production/community.html (original)
+++ karaf/site/production/community.html Tue Jul  4 12:14:31 2017
@@ -75,6 +75,7 @@
 https://builds.apache.org/view/H-L/view/Karaf/;>Jenkins
 #apache-karaf on 
Freenode
 
+
 Contribute
 There are many ways you can help make Karaf a better piece of software 
- please dive in and help!
 
@@ -84,9 +85,107 @@
 
 https://github.com/apache/karaf;>Browse the source code. 
Got an itch to scratch, want to tune some operation or add some feature ?
 
-Want to do some hacking on Karaf? Try surfing the our https://issues.apache.org/jira/browse/KARAF;>issue tracker for open 
issues or features that need to be implemented. Take ownership of an issue and 
try fix it.
-
 If you'd rather have a more gentle introduction to working on the 
Karaf project, try looking at the test coverage report and help us get it even 
more green by supplying more test cases to get us closer to 100% coverage.
+
+Report bugs and feature requests
+
+Did you find a bug or want something implemented? Please report an 
issue in our https://issues.apache.org/jira/browse/KARAF;>issue 
tracker. When creating a bug make sure you document the steps to reproduce 
the issue and provide all necessary information like OS, versions your use, 
logs. When creating a feature request document your requirements first. Try to 
not directly describe the solution.
+
+If you want to dive into development yourself then you can also 
browse for open issues or features that need to be implemented. Take ownership 
of an issue and try fix it. Before doing a bigger change describe the 
concept/design of what you plan to do. If unsure if the design is good or will 
be accepted discuss it on the dev list.
+
+Provide changes in a pull request
+
+The best way to provide changes is to fork karaf repo on github and 
provide a pull request with your changes. To make it easy to apply your changes 
please use the following conventions:
+
+  Every pull request should have a matching jira issue
+  Do the change in a branch that is named like the jira issue id 
e.g KARAF-1234. To create this branch you can use:
+   
+git clone http://github.com/apache/karaf
+git fetch --all
+git checkout -b my-branch origin/master
+   
+ Don't forget to periodically rebase your branch:
+
+git pull --rebase
+git push GitHubUser my-branch --force
+
+  
+  Every commit in the branch should start with the jira issue id 
like this "[KARAF-123] More details"
+  You can squash your commits into one and force push your branch 
(not mandatory) using git rebase -i apache/master
+  Test that your change works by adapting or adding tests.
+  http://programmer.97things.oreilly.com/wiki/index.php/The_Boy_Scout_Rule;>Follow
 the boy scout rule to "Always leave the campground cleaner than you found 
it."
+  Make sure you do a build before doing a PR. The build has to be 
successfull:
+   
+mvn clean verify -Prelease -fae -T 1C
+   
+ 
+  If your PR has conflicts with the master then rebase the branch. 
PRs with conflicts are unlikely to be applied
+  Do not change too much in a PR. The smaller the PR the easier it 
is to apply and the faster it will be done
+  Sometimes PRs get lost. Do not hesitate to ask on the dev list 
if your PR seems to be ignored
+
+
+Review pull requests
+
+Anyone can review pull requests but the merge can be done only by a 
committer.
+If you want to review a PR then comment with 
R:@yourgithubid. This marks that you will do the review and also 
apply if you are a committer.
+When reviewing check if the changes are done in a clean way and are 
tested with a unit and possibly integration test. Check that the build does not 
report more test failures than before. If you are not a committer then write a 
comment if you recommend a merge or not. Provide good instructions for the 
contributor how to improve his PR if it is not yet ok. Make sure you do a 
review timely. By commenting that you do a review you kind of block others from 
applying the change.
+NB: Jenkins performs a build for each pull request. You can trigger a 
new build on a pull request

svn commit: r1800764 - /karaf/site/trunk/src/main/webapp/community.html

2017-07-04 Thread jbonofre 
Author: jbonofre
Date: Tue Jul  4 12:13:45 2017
New Revision: 1800764

URL: http://svn.apache.org/viewvc?rev=1800764=rev
Log:
Update contribute guide

Modified:
karaf/site/trunk/src/main/webapp/community.html

Modified: karaf/site/trunk/src/main/webapp/community.html
URL: 
http://svn.apache.org/viewvc/karaf/site/trunk/src/main/webapp/community.html?rev=1800764=1800763=1800764=diff
==
--- karaf/site/trunk/src/main/webapp/community.html (original)
+++ karaf/site/trunk/src/main/webapp/community.html Tue Jul  4 12:13:45 2017
@@ -98,12 +98,27 @@
 The best way to provide changes is to fork karaf repo on github and 
provide a pull request with your changes. To make it easy to apply your changes 
please use the following conventions:
 
   Every pull request should have a matching jira issue
-  Do the change in a branch that is named like the jira issue id 
e.g KARAF-1234
+  Do the change in a branch that is named like the jira issue id 
e.g KARAF-1234. To create this branch you can use:
+   
+git clone http://github.com/apache/karaf
+git fetch --all
+git checkout -b my-branch origin/master
+   
+ Don't forget to periodically rebase your branch:
+
+git pull --rebase
+git push GitHubUser my-branch --force
+
+  
   Every commit in the branch should start with the jira issue id 
like this "[KARAF-123] More details"
-  You can squash your commits into one and force push your branch 
(not mandatory)
-  Test that your change works by adapting or adding tests
+  You can squash your commits into one and force push your branch 
(not mandatory) using git rebase -i apache/master
+  Test that your change works by adapting or adding tests.
   http://programmer.97things.oreilly.com/wiki/index.php/The_Boy_Scout_Rule;>Follow
 the boy scout rule to "Always leave the campground cleaner than you found 
it."
-  Make sure you do a build before doing a PR
+  Make sure you do a build before doing a PR. The build has to be 
successfull:
+   
+mvn clean verify -Prelease -fae -T 1C
+   
+ 
   If your PR has conflicts with the master then rebase the branch. 
PRs with conflicts are unlikely to be applied
   Do not change too much in a PR. The smaller the PR the easier it 
is to apply and the faster it will be done
   Sometimes PRs get lost. Do not hesitate to ask on the dev list 
if your PR seems to be ignored
@@ -111,20 +126,64 @@
 
 Review pull requests
 
-Anyone can review pull requests. If you want to review a PR then 
comment with R:@yourgithubid. This marks that you will do the review and also 
apply if you are a committer.
-When reviewing check if the changes are done in a clean way and are 
tested with a unit and possibly integration test. Check that the build does not 
report more test failures than before. If you are not a committer then write a 
comment if you recommend a merge or not. Provide good instructions for the 
contributor how to improve his PR if it is not yet ok. Make sure you do a 
review timely. By commenting that you do a review you kind of block others from 
applying the change.
+Anyone can review pull requests but the merge can be done only by a 
committer.
+If you want to review a PR then comment with 
R:@yourgithubid. This marks that you will do the review and also 
apply if you are a committer.
+When reviewing check if the changes are done in a clean way and are 
tested with a unit and possibly integration test. Check that the build does not 
report more test failures than before. If you are not a committer then write a 
comment if you recommend a merge or not. Provide good instructions for the 
contributor how to improve his PR if it is not yet ok. Make sure you do a 
review timely. By commenting that you do a review you kind of block others from 
applying the change.
+NB: Jenkins performs a build for each pull request. You can trigger a 
new build on a pull request using "retest this please" in a PR comment.
 
 Apply pull requests
 
 This can obviously only be done by a committer. Do the following steps:
 
 
-  Add the remote repository. git remote add otheruser git:path to 
repo
-  Fetch the remote repo. git fetch otheruser
-  Check the PR. git checkout branch. Do a build
-  Merge into master. git checkout master. git merge 
otheruser/branch. Do a build. git push
-  Eventually backport to bugfix branches using git cherry-pick
+  
+  As one time config, you can rename your git remote and add 
apache one:
+   
+git remote add apache https://git-wip-us.apache.org/repos/asf/karaf.git
+   
+  We

Jenkins build is still unstable: karaf-master #4417

2017-07-04 Thread Apache Jenkins Server 
See

[2/2] karaf git commit: [logging] Adjust (commented out) logging configuration for pax-url-aether to log4j2

2017-07-04 Thread ggrzybek 
[logging] Adjust (commented out) logging configuration for pax-url-aether to 
log4j2

(cherry picked from commit 2aedd8d9cc4a5b2d000c599ea93ade2a722ddab8)


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/a55fa20a
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a55fa20a
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a55fa20a

Branch: refs/heads/karaf-4.1.x
Commit: a55fa20a823068c0812ac631d07d099cef9c642c
Parents: 2384d2a
Author: Grzegorz Grzybek 
Authored: Tue Jul 4 13:55:48 2017 +0200
Committer: Grzegorz Grzybek 
Committed: Tue Jul 4 13:55:59 2017 +0200

--
 .../main/resources/resources/etc/org.ops4j.pax.logging.cfg  | 9 ++---
 itests/src/test/resources/etc/org.ops4j.pax.logging.cfg | 9 ++---
 2 files changed, 12 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/a55fa20a/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
--
diff --git 
a/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
 
b/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
index 6c73d16..0c9d54e 100644
--- 
a/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
+++ 
b/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
@@ -83,6 +83,9 @@ log4j2.appender.osgi.name = PaxOsgi
 log4j2.appender.osgi.filter = *
 
 # help with identification of maven-related problems with pax-url-aether
-#log4j.logger.shaded.org.eclipse.aether = TRACE
-#log4j.logger.shaded.org.apache.http.headers = DEBUG
-#log4j.logger.org.ops4j.pax.url.mvn = TRACE
+#log4j2.logger.aether.name = shaded.org.eclipse.aether
+#log4j2.logger.aether.level = TRACE
+#log4j2.logger.http-headers.name = shaded.org.apache.http.headers
+#log4j2.logger.http-headers.level = DEBUG
+#log4j2.logger.maven.name = org.ops4j.pax.url.mvn
+#log4j2.logger.maven.level = TRACE

http://git-wip-us.apache.org/repos/asf/karaf/blob/a55fa20a/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
--
diff --git a/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg 
b/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
index dcd97d5..e643785 100644
--- a/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
+++ b/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
@@ -61,6 +61,9 @@ log4j2.appender.osgi.name = PaxOsgi
 log4j2.appender.osgi.filter = *
 
 # help with identification of maven-related problems with pax-url-aether
-#log4j.logger.shaded.org.eclipse.aether = TRACE
-#log4j.logger.shaded.org.apache.http.headers = DEBUG
-#log4j.logger.org.ops4j.pax.url.mvn = TRACE
+#log4j2.logger.aether.name = shaded.org.eclipse.aether
+#log4j2.logger.aether.level = TRACE
+#log4j2.logger.http-headers.name = shaded.org.apache.http.headers
+#log4j2.logger.http-headers.level = DEBUG
+#log4j2.logger.maven.name = org.ops4j.pax.url.mvn
+#log4j2.logger.maven.level = TRACE

[1/2] karaf git commit: [logging] Adjust (commented out) logging configuration for pax-url-aether to log4j2

2017-07-04 Thread ggrzybek 
Repository: karaf
Updated Branches:
  refs/heads/karaf-4.1.x 2384d2a1d -> a55fa20a8
  refs/heads/master 9946fb23d -> 2aedd8d9c


[logging] Adjust (commented out) logging configuration for pax-url-aether to 
log4j2


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2aedd8d9
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2aedd8d9
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2aedd8d9

Branch: refs/heads/master
Commit: 2aedd8d9cc4a5b2d000c599ea93ade2a722ddab8
Parents: 9946fb2
Author: Grzegorz Grzybek 
Authored: Tue Jul 4 13:55:48 2017 +0200
Committer: Grzegorz Grzybek 
Committed: Tue Jul 4 13:55:48 2017 +0200

--
 .../main/resources/resources/etc/org.ops4j.pax.logging.cfg  | 9 ++---
 itests/src/test/resources/etc/org.ops4j.pax.logging.cfg | 9 ++---
 2 files changed, 12 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/2aedd8d9/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
--
diff --git 
a/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
 
b/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
index 6c73d16..0c9d54e 100644
--- 
a/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
+++ 
b/assemblies/features/base/src/main/resources/resources/etc/org.ops4j.pax.logging.cfg
@@ -83,6 +83,9 @@ log4j2.appender.osgi.name = PaxOsgi
 log4j2.appender.osgi.filter = *
 
 # help with identification of maven-related problems with pax-url-aether
-#log4j.logger.shaded.org.eclipse.aether = TRACE
-#log4j.logger.shaded.org.apache.http.headers = DEBUG
-#log4j.logger.org.ops4j.pax.url.mvn = TRACE
+#log4j2.logger.aether.name = shaded.org.eclipse.aether
+#log4j2.logger.aether.level = TRACE
+#log4j2.logger.http-headers.name = shaded.org.apache.http.headers
+#log4j2.logger.http-headers.level = DEBUG
+#log4j2.logger.maven.name = org.ops4j.pax.url.mvn
+#log4j2.logger.maven.level = TRACE

http://git-wip-us.apache.org/repos/asf/karaf/blob/2aedd8d9/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
--
diff --git a/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg 
b/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
index dcd97d5..e643785 100644
--- a/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
+++ b/itests/src/test/resources/etc/org.ops4j.pax.logging.cfg
@@ -61,6 +61,9 @@ log4j2.appender.osgi.name = PaxOsgi
 log4j2.appender.osgi.filter = *
 
 # help with identification of maven-related problems with pax-url-aether
-#log4j.logger.shaded.org.eclipse.aether = TRACE
-#log4j.logger.shaded.org.apache.http.headers = DEBUG
-#log4j.logger.org.ops4j.pax.url.mvn = TRACE
+#log4j2.logger.aether.name = shaded.org.eclipse.aether
+#log4j2.logger.aether.level = TRACE
+#log4j2.logger.http-headers.name = shaded.org.apache.http.headers
+#log4j2.logger.http-headers.level = DEBUG
+#log4j2.logger.maven.name = org.ops4j.pax.url.mvn
+#log4j2.logger.maven.level = TRACE

Jenkins build became unstable: karaf-4.0.x #438

2017-07-04 Thread Apache Jenkins Server 
See

Jenkins build became unstable: karaf-4.0.x » Apache Karaf :: Integration Tests #438

2017-07-04 Thread Apache Jenkins Server 
See

Build failed in Jenkins: karaf-4.1.x #81

2017-07-04 Thread Apache Jenkins Server 
See 

Changes:

[gr.grzybek] [KARAF-5116] We may use log4j(2) levels in karaf.log.console 
property

--
[...truncated 1.92 MB...]

 service.bundleid = 0
 service.id = 2
 service.scope = singleton
Provided by : 
 System Bundle (0)
Used by: 
 Apache Aries JMX Core (16)

[org.osgi.service.resolver.Resolver]

 service.bundleid = 0
 service.id = 1
 service.scope = singleton
Provided by : 
 System Bundle (0)

[org.osgi.service.startlevel.StartLevel]

 service.bundleid = 0
 service.id = 3
 service.scope = singleton
Provided by : 
 System Bundle (0)
Used by: 
 Apache Aries JMX Core (16)

[org.osgi.service.url.URLStreamHandlerService]
--
 service.bundleid = 4
 service.id = 17
 service.scope = singleton
 url.handler.protocol = mvn
Provided by : 
 OPS4J Pax Url - aether: (4)
Used by: 
 System Bundle (0)
 Apache Karaf :: Features :: Core (9)

[org.osgi.service.url.URLStreamHandlerService]
--
 service.bundleid = 8
 service.id = 13
 service.scope = singleton
 url.handler.protocol = jardir
Provided by : 
 Apache Felix File Install (8)

[org.osgi.service.url.URLStreamHandlerService]
--
 service.bundleid = 24
 service.id = 53
 service.scope = singleton
 url.handler.protocol = blueprint
Provided by : 
 Apache Karaf :: Deployer :: Blueprint (24)

[org.osgi.service.url.URLStreamHandlerService]
--
 service.bundleid = 25
 service.id = 56
 service.scope = singleton
 url.handler.protocol = feature
Provided by : 
 Apache Karaf :: Deployer :: Features (25)

[org.osgi.service.url.URLStreamHandlerService]
--
 service.bundleid = 71
 service.id = 31
 service.scope = singleton
 url.handler.protocol = [wrap]
Provided by : 
 OPS4J Pax Url - wrap: (71)
Used by: 
 Apache Karaf :: Deployer :: Wrap Non OSGi Jar (27)


Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.179 sec - in 
org.apache.karaf.itests.ServiceTest
Running org.apache.karaf.itests.SystemCommandSecurityTest
[org.ops4j.pax.exam.junit.impl.ProbeRunner] : creating PaxExam runner for class 
org.apache.karaf.itests.SystemCommandSecurityTest
[org.ops4j.pax.exam.junit.impl.ProbeRunner] : running test class 
org.apache.karaf.itests.SystemCommandSecurityTest
[org.ops4j.pax.exam.karaf.container.internal.KarafTestContainer] : Wait for 
test container to finish its initialization [ RelativeTimeout value = 18 ]
[org.ops4j.pax.exam.rbc.client.RemoteBundleContextClient] : Waiting for remote 
bundle context.. on 21000 name: 08c27c3b-a02f-4d1e-bcb6-2c59ee7c4194 timout: [ 
RelativeTimeout value = 18 ]
__ __    
   / //_/ __ _/ __/  
  / ,<  / __ `/ ___/ __ `/ /_
 / /| |/ /_/ / /  / /_/ / __/
/_/ |_|\__,_/_/   \__,_/_/ 

  Apache Karaf (4.1.2-SNAPSHOT)

Hit '' for a list of available commands
and '[cmd] --help' for help on a specific command.
Hit '' or type 'system:shutdown' or 'logout' to shutdown Karaf.

Error in initialization script: 
:
 String index out of range: 0
karaf@root()> jaas:realm-manage --realm=karaf;jaas:user-add 
man8529439288563052_0 man8529439288563052_0;jaas:role-add man8529439288563052_  
  __ __    
   / //_/ __ _/ __/  
  / ,<  / __ `/ ___/ __ `/ /_
 / /| |/ /_/ / /  / /_/ / __/
/_/ |_|\__,_/_/   \__,_/_/ 

  Apache Karaf (4.1.2-SNAPSHOT)

Hit '' for a list of available commands
and '[cmd] --help' for help on a specific command.
Hit 'system:shutdown' to shutdown Karaf.
Hit '' or type 'logout' to disconnect shell from current session.
0
 manager;jaas:role-add man8529439288563052_0 viewer;jaas:user-add 
view8529439288588287_1 view8529439288588287_1;jaas:role-add 
view8529439288588287_1 viewer;jaas:update;jaas:realm-manage 
--realm=karaf;jaas:user-list
logout
karaf@root()> jaas:realm-manage --realm=karaf;jaas:user-add man8529439288563052_
0 man8529439288563052_0;jaas:role-add man8529439288563052_0 manager;jaas:role-ad
d man8529439288563052_0 viewer;jaas:user-add view8529439288588287_1 view85294392
88588287_1;jaas:role-add view8529439288588287_1 viewer;jaas:update;jaas:realm-ma
nage --realm=karaf;jaas:user-list
User Name  │ Group  │ Role
───┼┼──
karaf  │ admingroup │ admin
karaf  │ admingroup │ manager
karaf  │ admingroup │ viewer
karaf  │ admingroup │ systembundles
man8529439288563052_0  │

karaf git commit: Revert "[KARAF-5116] Updating documentation related to karaf.log.console property"

2017-07-04 Thread ggrzybek 
Repository: karaf
Updated Branches:
  refs/heads/karaf-4.0.x 816df200a -> 2a564c9a0


Revert "[KARAF-5116] Updating documentation related to karaf.log.console 
property"

This reverts commit 816df200a7b9700f034e2c59325a5d3d009b0eda.


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2a564c9a
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2a564c9a
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2a564c9a

Branch: refs/heads/karaf-4.0.x
Commit: 2a564c9a062a46460aed030efba8abe61cc28f9d
Parents: 816df20
Author: Grzegorz Grzybek 
Authored: Tue Jul 4 13:14:03 2017 +0200
Committer: Grzegorz Grzybek 
Committed: Tue Jul 4 13:14:03 2017 +0200

--
 manual/src/main/asciidoc/user-guide/log.adoc | 26 ---
 1 file changed, 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/2a564c9a/manual/src/main/asciidoc/user-guide/log.adoc
--
diff --git a/manual/src/main/asciidoc/user-guide/log.adoc 
b/manual/src/main/asciidoc/user-guide/log.adoc
index 664a3f5..1ab1b72 100644
--- a/manual/src/main/asciidoc/user-guide/log.adoc
+++ b/manual/src/main/asciidoc/user-guide/log.adoc
@@ -160,32 +160,6 @@ A default configuration in `etc/log4j2.xml` could be:
 
 
 
- `karaf.log.console` property
-
-Before Karaf starts _proper_ logging facilities (pax-logging), it may 
configure `java.util.logging`. Standard
-Java logging is used initially by `Main` class and 
`org.apache.karaf.main.lock.Lock` implementations.
-In order to configure logging level, please set system property 
`karaf.log.console` to one of standard JUL
-levels:
-
-* `SEVERE` (highest value)
-* `WARNING`
-* `INFO`
-* `CONFIG`
-* `FINE`
-* `FINER`
-* `FINEST`  (lowest value)
-
-For example, setting `karaf.log.console` to `INFO` (or lower) will turn on 
these logs when starting Karaf:
-
-[source,options="nowrap"]
-
-Jul 04, 2017 7:53:18 AM org.apache.karaf.main.Main launch
-INFO: Installing and starting initial bundles
-Jul 04, 2017 7:53:18 AM org.apache.karaf.main.Main launch
-INFO: All initial bundles installed and set to start
-...
-
-
  Commands
 
 Instead of changing the `etc/org.ops4j.pax.logging.cfg` file, Apache Karaf 
provides a set of commands allowing to

[2/2] karaf git commit: [KARAF-5116] We may use log4j(2) levels in karaf.log.console property

2017-07-04 Thread ggrzybek 
[KARAF-5116] We may use log4j(2) levels in karaf.log.console property

(cherry picked from commit 9946fb23d006a47f202ceed868321cc0a67a72b0)


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/2384d2a1
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/2384d2a1
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/2384d2a1

Branch: refs/heads/karaf-4.1.x
Commit: 2384d2a1d216000348bcded27555ef7eec927c52
Parents: d111d7f
Author: Grzegorz Grzybek 
Authored: Tue Jul 4 13:10:15 2017 +0200
Committer: Grzegorz Grzybek 
Committed: Tue Jul 4 13:12:50 2017 +0200

--
 .../karaf/main/util/BootstrapLogManager.java| 29 +++-
 manual/src/main/asciidoc/user-guide/log.adoc| 19 -
 2 files changed, 46 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/2384d2a1/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java
--
diff --git 
a/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java 
b/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java
index 1f57502..7c9f9dd 100644
--- a/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java
+++ b/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java
@@ -105,8 +105,35 @@ public class BootstrapLogManager {
 
 private List getDefaultHandlersInternal() {
 String consoleLevel = System.getProperty("karaf.log.console", "OFF");
+Level level = null;
+try {
+level = Level.parse(consoleLevel);
+} catch (IllegalArgumentException e) {
+// KARAF-5116: let's try *some* of log4j(2) log levels 
(org.apache.karaf.log.core.Level)
+switch (consoleLevel) {
+case "TRACE":
+level = Level.FINEST;
+break;
+case "DEBUG":
+level = Level.FINE;
+break;
+case "WARN":
+level = Level.WARNING;
+break;
+case "ERROR":
+level = Level.SEVERE;
+break;
+case "DEFAULT":
+level = Level.INFO;
+break;
+case "OFF":
+default:
+level = Level.OFF;
+break;
+}
+}
 ConsoleHandler handler = new ConsoleHandler();
-handler.setLevel(Level.parse(consoleLevel));
+handler.setLevel(level);
 return Arrays.asList(handler, getDefaultHandlerInternal());
 }
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/2384d2a1/manual/src/main/asciidoc/user-guide/log.adoc
--
diff --git a/manual/src/main/asciidoc/user-guide/log.adoc 
b/manual/src/main/asciidoc/user-guide/log.adoc
index 664a3f5..9cfe952 100644
--- a/manual/src/main/asciidoc/user-guide/log.adoc
+++ b/manual/src/main/asciidoc/user-guide/log.adoc
@@ -173,7 +173,24 @@ levels:
 * `CONFIG`
 * `FINE`
 * `FINER`
-* `FINEST`  (lowest value)
+* `FINEST` (lowest value)
+
+Additionally, de-facto standard log4j(2) levels can be used:
+
+* `TRACE`
+* `DEBUG`
+* `INFO`
+* `WARN`
+* `ERROR`
+* `OFF`
+* `DEFAULT`
+
+And because `org.ops4j.pax.loggin` PID uses `karaf.log.console` property, it's 
in fact better to use log4j levels instead:
+
+[source,options="nowrap"]
+
+log4j2.rootLogger.appenderRef.Console.filter.threshold.level = 
${karaf.log.console:-OFF}
+
 
 For example, setting `karaf.log.console` to `INFO` (or lower) will turn on 
these logs when starting Karaf:

[1/2] karaf git commit: [KARAF-5116] We may use log4j(2) levels in karaf.log.console property

2017-07-04 Thread ggrzybek 
Repository: karaf
Updated Branches:
  refs/heads/karaf-4.1.x d111d7f22 -> 2384d2a1d
  refs/heads/master 28c0864a9 -> 9946fb23d


[KARAF-5116] We may use log4j(2) levels in karaf.log.console property


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/9946fb23
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/9946fb23
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/9946fb23

Branch: refs/heads/master
Commit: 9946fb23d006a47f202ceed868321cc0a67a72b0
Parents: 28c0864
Author: Grzegorz Grzybek 
Authored: Tue Jul 4 13:10:15 2017 +0200
Committer: Grzegorz Grzybek 
Committed: Tue Jul 4 13:10:15 2017 +0200

--
 .../karaf/main/util/BootstrapLogManager.java| 29 +++-
 manual/src/main/asciidoc/user-guide/log.adoc| 19 -
 2 files changed, 46 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/9946fb23/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java
--
diff --git 
a/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java 
b/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java
index 1f57502..7c9f9dd 100644
--- a/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java
+++ b/main/src/main/java/org/apache/karaf/main/util/BootstrapLogManager.java
@@ -105,8 +105,35 @@ public class BootstrapLogManager {
 
 private List getDefaultHandlersInternal() {
 String consoleLevel = System.getProperty("karaf.log.console", "OFF");
+Level level = null;
+try {
+level = Level.parse(consoleLevel);
+} catch (IllegalArgumentException e) {
+// KARAF-5116: let's try *some* of log4j(2) log levels 
(org.apache.karaf.log.core.Level)
+switch (consoleLevel) {
+case "TRACE":
+level = Level.FINEST;
+break;
+case "DEBUG":
+level = Level.FINE;
+break;
+case "WARN":
+level = Level.WARNING;
+break;
+case "ERROR":
+level = Level.SEVERE;
+break;
+case "DEFAULT":
+level = Level.INFO;
+break;
+case "OFF":
+default:
+level = Level.OFF;
+break;
+}
+}
 ConsoleHandler handler = new ConsoleHandler();
-handler.setLevel(Level.parse(consoleLevel));
+handler.setLevel(level);
 return Arrays.asList(handler, getDefaultHandlerInternal());
 }
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/9946fb23/manual/src/main/asciidoc/user-guide/log.adoc
--
diff --git a/manual/src/main/asciidoc/user-guide/log.adoc 
b/manual/src/main/asciidoc/user-guide/log.adoc
index 664a3f5..9cfe952 100644
--- a/manual/src/main/asciidoc/user-guide/log.adoc
+++ b/manual/src/main/asciidoc/user-guide/log.adoc
@@ -173,7 +173,24 @@ levels:
 * `CONFIG`
 * `FINE`
 * `FINER`
-* `FINEST`  (lowest value)
+* `FINEST` (lowest value)
+
+Additionally, de-facto standard log4j(2) levels can be used:
+
+* `TRACE`
+* `DEBUG`
+* `INFO`
+* `WARN`
+* `ERROR`
+* `OFF`
+* `DEFAULT`
+
+And because `org.ops4j.pax.loggin` PID uses `karaf.log.console` property, it's 
in fact better to use log4j levels instead:
+
+[source,options="nowrap"]
+
+log4j2.rootLogger.appenderRef.Console.filter.threshold.level = 
${karaf.log.console:-OFF}
+
 
 For example, setting `karaf.log.console` to `INFO` (or lower) will turn on 
these logs when starting Karaf:

Jenkins build is still unstable: karaf-master #4416

2017-07-04 Thread Apache Jenkins Server 
See

karaf git commit: Refactoring UrlLoader

2017-07-04 Thread cschneider 
Repository: karaf
Updated Branches:
  refs/heads/master 25771e1ea -> 28c0864a9


Refactoring UrlLoader


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/28c0864a
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/28c0864a
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/28c0864a

Branch: refs/heads/master
Commit: 28c0864a90e5ca4e252270f6444855a72de874a5
Parents: 25771e1
Author: Christian Schneider 
Authored: Tue Jul 4 11:56:55 2017 +0200
Committer: Christian Schneider 
Committed: Tue Jul 4 11:56:55 2017 +0200

--
 .../features/internal/repository/UrlLoader.java | 58 
 1 file changed, 35 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/28c0864a/features/core/src/main/java/org/apache/karaf/features/internal/repository/UrlLoader.java
--
diff --git 
a/features/core/src/main/java/org/apache/karaf/features/internal/repository/UrlLoader.java
 
b/features/core/src/main/java/org/apache/karaf/features/internal/repository/UrlLoader.java
index 433b39b..41652f0 100644
--- 
a/features/core/src/main/java/org/apache/karaf/features/internal/repository/UrlLoader.java
+++ 
b/features/core/src/main/java/org/apache/karaf/features/internal/repository/UrlLoader.java
@@ -78,37 +78,49 @@ public abstract class UrlLoader {
 throw new IOException("Unexpected http response loading " 
+ url + " : " + rc + " " + con.getResponseMessage());
 }
 }
-long lm = connection.getLastModified();
-if (lm > 0 && lm <= lastModified) {
+
+if (didNotChange(connection)) {
 lastChecked = time;
 return false;
 }
-InputStream is = null;
-try {
-is = new BufferedInputStream(connection.getInputStream());
-// Auto-detect gzipped streams
-is.mark(512);
-int b0 = is.read();
-int b1 = is.read();
-is.reset();
-if (b0 == 0x1f && b1 == 0x8b) {
-is = new GZIPInputStream(is);
-}
-boolean r = doRead(is);
-lastModified = lm;
-lastChecked = time;
-return r;
-} finally {
-// cannot be use try-with-resources, as it would not close 
GZIPInpuStream
-if (is != null) {
-is.close();
-}
-}
+boolean wasRead = read(connection);
+lastModified = connection.getLastModified();
+lastChecked = time;
+return wasRead;
 } catch (IOException e) {
 throw new RuntimeException(e);
 }
 }
 
+private boolean didNotChange(URLConnection connection) {
+long lm = connection.getLastModified();
+return lm > 0 && lm <= lastModified;
+}
+
+private boolean read(URLConnection connection) throws IOException {
+InputStream is = null;
+try {
+is = new BufferedInputStream(connection.getInputStream());
+if (isGzipStream(is)) {
+is = new GZIPInputStream(is);
+}
+return doRead(is);
+} finally {
+// cannot be use try-with-resources, as it would not close 
GZIPInpuStream
+if (is != null) {
+is.close();
+}
+}
+}
+
+private boolean isGzipStream(InputStream is) throws IOException {
+is.mark(512);
+int b0 = is.read();
+int b1 = is.read();
+is.reset();
+return (b0 == 0x1f && b1 == 0x8b);
+}
+
 protected abstract boolean doRead(InputStream is) throws IOException;
 
 }

svn commit: r1800739 - /karaf/site/trunk/src/main/webapp/community.html

2017-07-04 Thread cschneider 
Author: cschneider
Date: Tue Jul  4 07:57:30 2017
New Revision: 1800739

URL: http://svn.apache.org/viewvc?rev=1800739=rev
Log:
Documented how to create issues, review and apply PRs

Modified:
karaf/site/trunk/src/main/webapp/community.html

Modified: karaf/site/trunk/src/main/webapp/community.html
URL: 
http://svn.apache.org/viewvc/karaf/site/trunk/src/main/webapp/community.html?rev=1800739=1800738=1800739=diff
==
--- karaf/site/trunk/src/main/webapp/community.html (original)
+++ karaf/site/trunk/src/main/webapp/community.html Tue Jul  4 07:57:30 2017
@@ -75,6 +75,7 @@
 https://builds.apache.org/view/H-L/view/Karaf/;>Jenkins
 #apache-karaf on 
Freenode
 
+
 Contribute
 There are many ways you can help make Karaf a better piece of software 
- please dive in and help!
 
@@ -84,9 +85,48 @@
 
 https://github.com/apache/karaf;>Browse the source code. 
Got an itch to scratch, want to tune some operation or add some feature ?
 
-Want to do some hacking on Karaf? Try surfing the our https://issues.apache.org/jira/browse/KARAF;>issue tracker for open 
issues or features that need to be implemented. Take ownership of an issue and 
try fix it.
-
 If you'd rather have a more gentle introduction to working on the 
Karaf project, try looking at the test coverage report and help us get it even 
more green by supplying more test cases to get us closer to 100% coverage.
+
+Report bugs and feature requests
+
+Did you find a bug or want something implemented? Please report an 
issue in our https://issues.apache.org/jira/browse/KARAF;>issue 
tracker. When creating a bug make sure you document the steps to reproduce 
the issue and provide all necessary information like OS, versions your use, 
logs. When creating a feature request document your requirements first. Try to 
not directly describe the solution.
+
+If you want to dive into development yourself then you can also 
browse for open issues or features that need to be implemented. Take ownership 
of an issue and try fix it. Before doing a bigger change describe the 
concept/design of what you plan to do. If unsure if the design is good or will 
be accepted discuss it on the dev list.
+
+Provide changes in a pull request
+
+The best way to provide changes is to fork karaf repo on github and 
provide a pull request with your changes. To make it easy to apply your changes 
please use the following conventions:
+
+  Every pull request should have a matching jira issue
+  Do the change in a branch that is named like the jira issue id 
e.g KARAF-1234
+  Every commit in the branch should start with the jira issue id 
like this "[KARAF-123] More details"
+  You can squash your commits into one and force push your branch 
(not mandatory)
+  Test that your change works by adapting or adding tests
+  http://programmer.97things.oreilly.com/wiki/index.php/The_Boy_Scout_Rule;>Follow
 the boy scout rule to "Always leave the campground cleaner than you found 
it."
+  Make sure you do a build before doing a PR
+  If your PR has conflicts with the master then rebase the branch. 
PRs with conflicts are unlikely to be applied
+  Do not change too much in a PR. The smaller the PR the easier it 
is to apply and the faster it will be done
+  Sometimes PRs get lost. Do not hesitate to ask on the dev list 
if your PR seems to be ignored
+
+
+Review pull requests
+
+Anyone can review pull requests. If you want to review a PR then 
comment with R:@yourgithubid. This marks that you will do the review and also 
apply if you are a committer.
+When reviewing check if the changes are done in a clean way and are 
tested with a unit and possibly integration test. Check that the build does not 
report more test failures than before. If you are not a committer then write a 
comment if you recommend a merge or not. Provide good instructions for the 
contributor how to improve his PR if it is not yet ok. Make sure you do a 
review timely. By commenting that you do a review you kind of block others from 
applying the change.
+
+Apply pull requests
+
+This can obviously only be done by a committer. Do the following steps:
+
+
+  Add the remote repository. git remote add otheruser git:path to 
repo
+  Fetch the remote repo. git fetch otheruser
+  Check the PR. git checkout branch. Do a build
+  Merge into master. git checkout master. git merge 
otheruser/branch. Do a build. git push
+  Eventually backport to bugfix branches using git cherry-pick
+  Make sure you document the fix in jira by adding the fix 
versions

Jenkins build is unstable: karaf-master #4415

2017-07-04 Thread Apache Jenkins Server 
See

Jenkins build is back to stable : karaf-4.0.x » Apache Karaf :: Integration Tests #437

2017-07-04 Thread Apache Jenkins Server 
See

Jenkins build is back to stable : karaf-4.0.x #437

2017-07-04 Thread Apache Jenkins Server 
See

Build failed in Jenkins: karaf-master #4414

2017-07-04 Thread Apache Jenkins Server 
See 


Changes:

[gr.grzybek] [KARAF-5116] Updating documentation related to karaf.log.console

--
[...truncated 2.32 MB...]
[ERROR] 
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR] 
[ERROR] For more information about the errors and possible solutions, please 
read the following articles:
[ERROR] [Help 1] 
http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException
[ERROR] 
[ERROR] After correcting the problems, you can resume the build with the command
[ERROR]   mvn  -rf :itests
[JENKINS] Archiving 
 to 
org.apache.karaf.archetypes/karaf-blueprint-archetype/4.2.0-SNAPSHOT/karaf-blueprint-archetype-4.2.0-SNAPSHOT.pom
[JENKINS] Archiving 

 to 
org.apache.karaf.archetypes/karaf-blueprint-archetype/4.2.0-20170704.063215-132/karaf-blueprint-archetype-4.2.0-20170704.063215-132.jar
[JENKINS] Archiving 
 to 
org.apache.karaf.webconsole/org.apache.karaf.webconsole.gogo/4.2.0-SNAPSHOT/org.apache.karaf.webconsole.gogo-4.2.0-SNAPSHOT.pom
[JENKINS] Archiving 

 to 
org.apache.karaf.webconsole/org.apache.karaf.webconsole.gogo/4.2.0-20170704.060945-135/org.apache.karaf.webconsole.gogo-4.2.0-20170704.060945-135.jar
[JENKINS] Archiving 
 to 
org.apache.karaf.management/management/4.2.0-SNAPSHOT/management-4.2.0-SNAPSHOT.pom
[JENKINS] Archiving 
 to 
org.apache.karaf.jpa/hibernate/4.2.0-SNAPSHOT/hibernate-4.2.0-SNAPSHOT.pom
[JENKINS] Archiving 

 to 
org.apache.karaf.jpa/hibernate/4.2.0-20170704.061326-135/hibernate-4.2.0-20170704.061326-135.jar
[JENKINS] Archiving 
 to 
org.apache.karaf/archetypes/4.2.0-SNAPSHOT/archetypes-4.2.0-SNAPSHOT.pom
[JENKINS] Archiving 
 to 
org.apache.karaf.demos.profiles/profiles/4.2.0-SNAPSHOT/profiles-4.2.0-SNAPSHOT.pom
[JENKINS] Archiving 
 to 
org.apache.karaf.maven/maven-parent/4.2.0-SNAPSHOT/maven-parent-4.2.0-SNAPSHOT.pom
[JENKINS] Archiving 
 to 
org.apache.karaf.assemblies.features/features/4.2.0-SNAPSHOT/features-4.2.0-SNAPSHOT.pom
[JENKINS] Archiving 
 to 
org.apache.karaf.features/org.apache.karaf.features.core/4.2.0-SNAPSHOT/org.apache.karaf.features.core-4.2.0-SNAPSHOT.pom
[JENKINS] Archiving 

 to 
org.apache.karaf.features/org.apache.karaf.features.core/4.2.0-20170704.060101-140/org.apache.karaf.features.core-4.2.0-20170704.060101-140.jar
[JENKINS] Archiving 
 
to 
org.apache.karaf.demos.profiles/dynamic/4.2.0-SNAPSHOT/dynamic-4.2.0-SNAPSHOT.pom
[JENKINS] Archiving 

 to 
org.apache.karaf.demos.profiles/dynamic/4.2.0-20170704.062730-134/dynamic-4.2.0-20170704.062730-134.tar.gz
[JENKINS] Archiving 

 to 
org.apache.karaf.demos.profiles/dynamic/4.2.0-20170704.062730-134/dynamic-4.2.0-20170704.062730-134.zip
Compressed 133.55 MB of artifacts by 43.9% relative to #4413
[JENKINS] Archiving 
 to 
org.apache.karaf.demos/dump/4.2.0-SNAPSHOT/dump-4.2.0-SNAPSHOT.pom
[JENKINS] Archiving 

 to 
org.apache.karaf.demos/dump/4.2.0-20170704.062628-135/dump-4.2.0-20170704.062628-135.jar
[JENKINS] Archiving 
 to 
org.apache.karaf.services/org.apache.karaf.services.coordinator/4.2.0-SNAPSHOT/org.apache.karaf.services.coordinator-4.2.0-SNAPSHOT.pom
[JENKINS] Archiving 

 to

karaf git commit: Fixed authentication when userInfo provided with resource URL

2017-07-04 Thread cschneider 
Repository: karaf
Updated Branches:
  refs/heads/master e1c98d182 -> 25771e1ea


Fixed authentication when userInfo provided with resource URL

Signed-off-by: David Leangen 


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/25771e1e
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/25771e1e
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/25771e1e

Branch: refs/heads/master
Commit: 25771e1ead28b81af7199c986594ed1fe1e4ded9
Parents: e1c98d1
Author: David Leangen 
Authored: Tue Jul 4 15:38:25 2017 +0900
Committer: David Leangen 
Committed: Tue Jul 4 15:38:25 2017 +0900

--
 .../karaf/features/internal/repository/UrlLoader.java   | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/25771e1e/features/core/src/main/java/org/apache/karaf/features/internal/repository/UrlLoader.java
--
diff --git 
a/features/core/src/main/java/org/apache/karaf/features/internal/repository/UrlLoader.java
 
b/features/core/src/main/java/org/apache/karaf/features/internal/repository/UrlLoader.java
index 48552fb..433b39b 100644
--- 
a/features/core/src/main/java/org/apache/karaf/features/internal/repository/UrlLoader.java
+++ 
b/features/core/src/main/java/org/apache/karaf/features/internal/repository/UrlLoader.java
@@ -20,7 +20,9 @@ import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.HttpURLConnection;
+import java.net.URL;
 import java.net.URLConnection;
+import java.nio.charset.StandardCharsets;
 import java.util.zip.GZIPInputStream;
 
 import static java.net.HttpURLConnection.HTTP_NOT_MODIFIED;
@@ -55,13 +57,18 @@ public abstract class UrlLoader {
 }
 }
 try {
-URLConnection connection = new java.net.URL(url).openConnection();
+URL u = new java.net.URL(url);
+URLConnection connection = u.openConnection();
 if (connection instanceof HttpURLConnection) {
 HttpURLConnection con = (HttpURLConnection) connection;
 if (lastModified > 0) {
 con.setIfModifiedSince(lastModified);
 }
 con.setRequestProperty(HEADER_ACCEPT_ENCODING, GZIP);
+if (u.getUserInfo() != null)  {
+String encoded = 
java.util.Base64.getEncoder().encodeToString((u.getUserInfo()).getBytes(StandardCharsets.UTF_8));
+connection.setRequestProperty("Authorization", "Basic " + 
encoded);
+}
 int rc = con.getResponseCode();
 if (rc == HTTP_NOT_MODIFIED) {
 lastChecked = time;

Jenkins build is back to stable : karaf-4.1.x #80

2017-07-04 Thread Apache Jenkins Server 
See

karaf-decanter git commit: [maven-release-plugin] prepare for next development iteration

2017-07-04 Thread jbonofre 
Repository: karaf-decanter
Updated Branches:
  refs/heads/master a47d10dad -> 1501fb6de


[maven-release-plugin] prepare for next development iteration


Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/1501fb6d
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/1501fb6d
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/1501fb6d

Branch: refs/heads/master
Commit: 1501fb6de244250ae49293f5d4207903826d4b50
Parents: a47d10d
Author: Jean-Baptiste Onofré 
Authored: Tue Jul 4 08:07:32 2017 +0200
Committer: Jean-Baptiste Onofré 
Committed: Tue Jul 4 08:07:32 2017 +0200

--
 api/pom.xml   | 2 +-
 appender/camel/pom.xml| 2 +-
 appender/cassandra/pom.xml| 2 +-
 appender/elasticsearch-native-1.x/pom.xml | 2 +-
 appender/elasticsearch-native-2.x/pom.xml | 2 +-
 appender/elasticsearch-rest/pom.xml   | 2 +-
 appender/jdbc/pom.xml | 2 +-
 appender/jms/pom.xml  | 2 +-
 appender/kafka/pom.xml| 2 +-
 appender/log/pom.xml  | 2 +-
 appender/mongodb/pom.xml  | 2 +-
 appender/mqtt/pom.xml | 2 +-
 appender/pom.xml  | 2 +-
 appender/redis/pom.xml| 2 +-
 appender/rest/pom.xml | 2 +-
 appender/socket/pom.xml   | 2 +-
 assembly/pom.xml  | 2 +-
 collector/camel-tracer/pom.xml| 2 +-
 collector/eventadmin/pom.xml  | 2 +-
 collector/file/pom.xml| 2 +-
 collector/jms/pom.xml | 2 +-
 collector/jmx/pom.xml | 2 +-
 collector/kafka/pom.xml   | 2 +-
 collector/log/pom.xml | 2 +-
 collector/log4j-socket/pom.xml| 2 +-
 collector/mqtt/pom.xml| 2 +-
 collector/pom.xml | 2 +-
 collector/process/pom.xml | 2 +-
 collector/rest-servlet/pom.xml| 2 +-
 collector/rest/pom.xml| 2 +-
 collector/socket/pom.xml  | 2 +-
 collector/system/pom.xml  | 2 +-
 elasticsearch-1.x/pom.xml | 2 +-
 elasticsearch-2.x/pom.xml | 2 +-
 elasticsearch-head-1.x/pom.xml| 2 +-
 elasticsearch-head-2.x/pom.xml| 2 +-
 kibana-3.x/pom.xml| 2 +-
 kibana-4.x/pom.xml| 2 +-
 marshaller/json/pom.xml   | 2 +-
 marshaller/pom.xml| 2 +-
 pom.xml   | 4 ++--
 sla/camel/pom.xml | 2 +-
 sla/checker/pom.xml   | 2 +-
 sla/email/pom.xml | 2 +-
 sla/log/pom.xml   | 2 +-
 sla/pom.xml   | 2 +-
 spring-boot-starter-decanter/pom.xml  | 2 +-
 tools-jar-wraper/pom.xml  | 2 +-
 48 files changed, 49 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/1501fb6d/api/pom.xml
--
diff --git a/api/pom.xml b/api/pom.xml
index 1014078..35132c6 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.karaf
 decanter
-1.4.0
+1.5.0-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/1501fb6d/appender/camel/pom.xml
--
diff --git a/appender/camel/pom.xml b/appender/camel/pom.xml
index 19ebe6f..b9da866 100644
--- a/appender/camel/pom.xml
+++ b/appender/camel/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.karaf.decanter
 appender
-1.4.0
+1.5.0-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/1501fb6d/appender/cassandra/pom.xml
--
diff --git a/appender/cassandra/pom.xml b/appender/cassandra/pom.xml
index 7c6a036..b2ce4eb 100644
--- a/appender/cassandra/pom.xml
+++ b/appender/cassandra/pom.xml
@@ -23,7 +23,7 @@

org.apache.karaf.decanter
appender
-   1.4.0
+   1.5.0-SNAPSHOT
../pom.xml

org.apache.karaf.decanter.appender

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/1501fb6d/appender/elasticsearch-native-1.x/pom.xml
--
diff --git a/appender/elasticsearch-native-1.x/pom.xml

[karaf-decanter] Git Push Summary

2017-07-04 Thread jbonofre 
Repository: karaf-decanter
Updated Tags:  refs/tags/decanter-1.4.0 [created] 6efce03c0

karaf-decanter git commit: [maven-release-plugin] prepare release decanter-1.4.0

2017-07-04 Thread jbonofre 
Repository: karaf-decanter
Updated Branches:
  refs/heads/master b53c3d625 -> a47d10dad


[maven-release-plugin] prepare release decanter-1.4.0


Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/a47d10da
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/a47d10da
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/a47d10da

Branch: refs/heads/master
Commit: a47d10dadcab14331ae475dc5f79a876e435f97e
Parents: b53c3d6
Author: Jean-Baptiste Onofré 
Authored: Tue Jul 4 08:07:13 2017 +0200
Committer: Jean-Baptiste Onofré 
Committed: Tue Jul 4 08:07:13 2017 +0200

--
 api/pom.xml   | 2 +-
 appender/camel/pom.xml| 2 +-
 appender/cassandra/pom.xml| 2 +-
 appender/elasticsearch-native-1.x/pom.xml | 2 +-
 appender/elasticsearch-native-2.x/pom.xml | 2 +-
 appender/elasticsearch-rest/pom.xml   | 2 +-
 appender/jdbc/pom.xml | 2 +-
 appender/jms/pom.xml  | 2 +-
 appender/kafka/pom.xml| 2 +-
 appender/log/pom.xml  | 2 +-
 appender/mongodb/pom.xml  | 2 +-
 appender/mqtt/pom.xml | 2 +-
 appender/pom.xml  | 2 +-
 appender/redis/pom.xml| 2 +-
 appender/rest/pom.xml | 2 +-
 appender/socket/pom.xml   | 2 +-
 assembly/pom.xml  | 2 +-
 collector/camel-tracer/pom.xml| 2 +-
 collector/eventadmin/pom.xml  | 2 +-
 collector/file/pom.xml| 2 +-
 collector/jms/pom.xml | 2 +-
 collector/jmx/pom.xml | 2 +-
 collector/kafka/pom.xml   | 2 +-
 collector/log/pom.xml | 2 +-
 collector/log4j-socket/pom.xml| 2 +-
 collector/mqtt/pom.xml| 2 +-
 collector/pom.xml | 2 +-
 collector/process/pom.xml | 2 +-
 collector/rest-servlet/pom.xml| 2 +-
 collector/rest/pom.xml| 2 +-
 collector/socket/pom.xml  | 2 +-
 collector/system/pom.xml  | 2 +-
 elasticsearch-1.x/pom.xml | 2 +-
 elasticsearch-2.x/pom.xml | 2 +-
 elasticsearch-head-1.x/pom.xml| 2 +-
 elasticsearch-head-2.x/pom.xml| 2 +-
 kibana-3.x/pom.xml| 2 +-
 kibana-4.x/pom.xml| 2 +-
 marshaller/json/pom.xml   | 2 +-
 marshaller/pom.xml| 2 +-
 pom.xml   | 4 ++--
 sla/camel/pom.xml | 2 +-
 sla/checker/pom.xml   | 2 +-
 sla/email/pom.xml | 2 +-
 sla/log/pom.xml   | 2 +-
 sla/pom.xml   | 2 +-
 spring-boot-starter-decanter/pom.xml  | 2 +-
 tools-jar-wraper/pom.xml  | 2 +-
 48 files changed, 49 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a47d10da/api/pom.xml
--
diff --git a/api/pom.xml b/api/pom.xml
index 6251c6b..1014078 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.karaf
 decanter
-1.3.1-SNAPSHOT
+1.4.0
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a47d10da/appender/camel/pom.xml
--
diff --git a/appender/camel/pom.xml b/appender/camel/pom.xml
index 70bf1b0..19ebe6f 100644
--- a/appender/camel/pom.xml
+++ b/appender/camel/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.karaf.decanter
 appender
-1.3.1-SNAPSHOT
+1.4.0
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a47d10da/appender/cassandra/pom.xml
--
diff --git a/appender/cassandra/pom.xml b/appender/cassandra/pom.xml
index 3fedb6f..7c6a036 100644
--- a/appender/cassandra/pom.xml
+++ b/appender/cassandra/pom.xml
@@ -23,7 +23,7 @@

org.apache.karaf.decanter
appender
-   1.3.1-SNAPSHOT
+   1.4.0
../pom.xml

org.apache.karaf.decanter.appender

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/a47d10da/appender/elasticsearch-native-1.x/pom.xml
--
diff --git a/appender/elasticsearch-native-1.x/pom.xml

karaf git commit: [KARAF-5116] Updating documentation related to karaf.log.console property

2017-07-04 Thread ggrzybek 
Repository: karaf
Updated Branches:
  refs/heads/karaf-4.1.x ec5dc8592 -> d111d7f22


[KARAF-5116] Updating documentation related to karaf.log.console property


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d111d7f2
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d111d7f2
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d111d7f2

Branch: refs/heads/karaf-4.1.x
Commit: d111d7f22b7221228beec612a443c670e113e1fa
Parents: ec5dc85
Author: Grzegorz Grzybek 
Authored: Tue Jul 4 07:57:20 2017 +0200
Committer: Grzegorz Grzybek 
Committed: Tue Jul 4 07:59:56 2017 +0200

--
 manual/src/main/asciidoc/user-guide/log.adoc | 26 +++
 1 file changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/d111d7f2/manual/src/main/asciidoc/user-guide/log.adoc
--
diff --git a/manual/src/main/asciidoc/user-guide/log.adoc 
b/manual/src/main/asciidoc/user-guide/log.adoc
index 1ab1b72..664a3f5 100644
--- a/manual/src/main/asciidoc/user-guide/log.adoc
+++ b/manual/src/main/asciidoc/user-guide/log.adoc
@@ -160,6 +160,32 @@ A default configuration in `etc/log4j2.xml` could be:
 
 
 
+ `karaf.log.console` property
+
+Before Karaf starts _proper_ logging facilities (pax-logging), it may 
configure `java.util.logging`. Standard
+Java logging is used initially by `Main` class and 
`org.apache.karaf.main.lock.Lock` implementations.
+In order to configure logging level, please set system property 
`karaf.log.console` to one of standard JUL
+levels:
+
+* `SEVERE` (highest value)
+* `WARNING`
+* `INFO`
+* `CONFIG`
+* `FINE`
+* `FINER`
+* `FINEST`  (lowest value)
+
+For example, setting `karaf.log.console` to `INFO` (or lower) will turn on 
these logs when starting Karaf:
+
+[source,options="nowrap"]
+
+Jul 04, 2017 7:53:18 AM org.apache.karaf.main.Main launch
+INFO: Installing and starting initial bundles
+Jul 04, 2017 7:53:18 AM org.apache.karaf.main.Main launch
+INFO: All initial bundles installed and set to start
+...
+
+
  Commands
 
 Instead of changing the `etc/org.ops4j.pax.logging.cfg` file, Apache Karaf 
provides a set of commands allowing to

karaf-decanter git commit: Fix manual parent pom version

2017-07-04 Thread jbonofre 
Repository: karaf-decanter
Updated Branches:
  refs/heads/master abf572e80 -> b53c3d625


Fix manual parent pom version


Project: http://git-wip-us.apache.org/repos/asf/karaf-decanter/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-decanter/commit/b53c3d62
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/b53c3d62
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/b53c3d62

Branch: refs/heads/master
Commit: b53c3d62558ccca9c1e7fa0a8b35ec359d4afa42
Parents: abf572e
Author: Jean-Baptiste Onofré 
Authored: Tue Jul 4 08:00:02 2017 +0200
Committer: Jean-Baptiste Onofré 
Committed: Tue Jul 4 08:00:02 2017 +0200

--
 manual/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/b53c3d62/manual/pom.xml
--
diff --git a/manual/pom.xml b/manual/pom.xml
index 555646f..268870b 100644
--- a/manual/pom.xml
+++ b/manual/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.karaf
 decanter
-1.2.1-SNAPSHOT
+1.3.1-SNAPSHOT
 ../pom.xml