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

2017-07-03 Thread Apache Jenkins Server
See 




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

2017-07-03 Thread Apache Jenkins Server
See 




Build failed in Jenkins: karaf-master #4414

2017-07-03 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 
org.apache.karaf.services/org.apache.karaf.services.coordinator/4.2.

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

2017-07-03 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-03 Thread Apache Jenkins Server
See 



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

2017-07-03 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 
b/appender/elasticsearch-native-1.x/pom.xml
index 479c46e..f6b784a 10

[karaf-decanter] Git Push Summary

2017-07-03 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-03 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 
b/appender/elasticsearch-native-1.x/pom.xml
index 5906522..479c46e 100644
---

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

2017-07-03 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-03 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
 
 



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

2017-07-03 Thread ggrzybek
Repository: karaf
Updated Branches:
  refs/heads/karaf-4.0.x 2e1dba515 -> 816df200a
  refs/heads/master a07623dce -> e1c98d182


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

Branch: refs/heads/master
Commit: e1c98d182f5c8c4ab9a289bac18517aa19d84a81
Parents: a07623d
Author: Grzegorz Grzybek 
Authored: Tue Jul 4 07:57:20 2017 +0200
Committer: Grzegorz Grzybek 
Committed: Tue Jul 4 07:57:20 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/e1c98d18/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



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

2017-07-03 Thread ggrzybek
[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/816df200
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/816df200
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/816df200

Branch: refs/heads/karaf-4.0.x
Commit: 816df200a7b9700f034e2c59325a5d3d009b0eda
Parents: 2e1dba5
Author: Grzegorz Grzybek 
Authored: Tue Jul 4 07:57:20 2017 +0200
Committer: Grzegorz Grzybek 
Committed: Tue Jul 4 07:57:44 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/816df200/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: Update RELEASE-NOTES in preparation for the release

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


Update RELEASE-NOTES in preparation for the release


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

Branch: refs/heads/master
Commit: abf572e80a101ec3908ddd9a83639aaf50352572
Parents: f236e38
Author: Jean-Baptiste Onofré 
Authored: Tue Jul 4 07:44:09 2017 +0200
Committer: Jean-Baptiste Onofré 
Committed: Tue Jul 4 07:44:09 2017 +0200

--
 README|  1 +
 RELEASE-NOTES | 27 +++
 2 files changed, 28 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/abf572e8/README
--
diff --git a/README b/README
index b2d5c5c..5da2e81 100644
--- a/README
+++ b/README
@@ -79,6 +79,7 @@ Collectors
 * decanter-collector-rest-servlet
 * decanter-collector-socket
 * decanter-collector-system
+* decanter-collector-process
 
 Appenders
 -

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/abf572e8/RELEASE-NOTES
--
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7d1088e..fced126 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -15,6 +15,33 @@
  * limitations under the License.
  */
 
+Apache Karaf Decanter 1.4.0
+===
+
+  Overview
+  
+Apache Karaf Decanter 1.4.0 is a maintenance release, providing new features 
(Karaf scheduler, email alerter improvements, ...) and bug fixes.
+
+Decanter is a completed monitoring and alerting solution for Apache Karaf 
container, and related applications
+running on it.
+
+You can use Decanter in any Karaf version.
+
+For details, see the ChangeLog:
+
+  ChangeLog
+  -
+** Bug
+* [KARAF-4906] - Decanter e-mail alerter can't use javamail authentication
+* [KARAF-5186] - [DECANTER] - Fails work in case the event topic contains 
arbitrary characters like %
+* [KARAF-5212] - Decanter Elasticsearch Appender feature should install 
com.fasterxml.jackson.core bundle
+** Improvement
+* [KARAF-3696] - Decanter: Switch to Karaf provided Scheduler (Cron-based)
+* [KARAF-4850] - Be able to specify several object names for the JMX 
collector
+* [KARAF-4929] - Email alerter should support list of destination (to) 
addresses
+* [KARAF-5060] - Be able to configure the index name in elasticsearch 
appenders
+* [KARAF-5192] - Decanter collector should be able to filter some loggers
+
 Apache Karaf Decanter 1.3.0
 ===
 



Jenkins build is still unstable: karaf-master #4413

2017-07-03 Thread Apache Jenkins Server
See 




Jenkins build is unstable: karaf-4.1.x #79

2017-07-03 Thread Apache Jenkins Server
See 



karaf git commit: [KARAF-5234] Update BUILDING file to reference JAVA 8

2017-07-03 Thread jbonofre
Repository: karaf
Updated Branches:
  refs/heads/karaf-4.1.x ea0e0a528 -> ec5dc8592


[KARAF-5234] Update BUILDING file to reference JAVA 8


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

Branch: refs/heads/karaf-4.1.x
Commit: ec5dc85926c096904221ed7b7af27c6f73ff4652
Parents: ea0e0a5
Author: jpoth 
Authored: Mon Jul 3 12:04:50 2017 +0200
Committer: Jean-Baptiste Onofré 
Committed: Tue Jul 4 06:17:48 2017 +0200

--
 BUILDING | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/ec5dc859/BUILDING
--
diff --git a/BUILDING b/BUILDING
index 1b965e4..0110eab 100644
--- a/BUILDING
+++ b/BUILDING
@@ -21,9 +21,9 @@ Building Apache Karaf
 Initial Setup
 -
 
-1) Install J2SE 7.0 SDK (or later), which can be downloaded from 
+1) Install J2SE 8.0 SDK (or later), which can be downloaded from 
http://www.oracle.com/technetwork/java/javase/downloads/index.html
-   Use version of "JDK 7.0 Update 55" (or later).
+   Use version of "JDK 8.0 Update 131" (or later).
 
 2) Make sure that your JAVA_HOME environment variable is set to the newly 
installed 
JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or 



[2/2] karaf git commit: [KARAF-5234] This closes #325

2017-07-03 Thread jbonofre
[KARAF-5234] This closes #325


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

Branch: refs/heads/master
Commit: a07623dce5e329ba572d662705b5bb3ed140a4a8
Parents: bfd98f9 f5e6f27
Author: Jean-Baptiste Onofré 
Authored: Tue Jul 4 06:17:25 2017 +0200
Committer: Jean-Baptiste Onofré 
Committed: Tue Jul 4 06:17:25 2017 +0200

--
 BUILDING | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--




[1/2] karaf git commit: [KARAF-5234] Update BUILDING file to reference JAVA 8

2017-07-03 Thread jbonofre
Repository: karaf
Updated Branches:
  refs/heads/master bfd98f95d -> a07623dce


[KARAF-5234] Update BUILDING file to reference JAVA 8


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

Branch: refs/heads/master
Commit: f5e6f278fb4278f863804cddbf95e78648a786b9
Parents: bfd98f9
Author: jpoth 
Authored: Mon Jul 3 12:04:50 2017 +0200
Committer: Jean-Baptiste Onofré 
Committed: Tue Jul 4 06:16:11 2017 +0200

--
 BUILDING | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/f5e6f278/BUILDING
--
diff --git a/BUILDING b/BUILDING
index 1b965e4..0110eab 100644
--- a/BUILDING
+++ b/BUILDING
@@ -21,9 +21,9 @@ Building Apache Karaf
 Initial Setup
 -
 
-1) Install J2SE 7.0 SDK (or later), which can be downloaded from 
+1) Install J2SE 8.0 SDK (or later), which can be downloaded from 
http://www.oracle.com/technetwork/java/javase/downloads/index.html
-   Use version of "JDK 7.0 Update 55" (or later).
+   Use version of "JDK 8.0 Update 131" (or later).
 
 2) Make sure that your JAVA_HOME environment variable is set to the newly 
installed 
JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or 



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

2017-07-03 Thread Apache Jenkins Server
See 




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

2017-07-03 Thread Apache Jenkins Server
See 



Jenkins build is still unstable: karaf-master #4412

2017-07-03 Thread Apache Jenkins Server
See 




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

2017-07-03 Thread Apache Jenkins Server
See 

--
[...truncated 1.30 MB...]
No artifacts from karaf-4.1.x » Apache Karaf :: Diagnostic :: Core #77 to 
compare, so performing full copy of artifacts
[JENKINS] Archiving 
 to 
org.apache.karaf.deployer/org.apache.karaf.deployer.spring/4.1.2-SNAPSHOT/org.apache.karaf.deployer.spring-4.1.2-SNAPSHOT.pom
[JENKINS] Archiving 

 to 
org.apache.karaf.deployer/org.apache.karaf.deployer.spring/4.1.2-20170703.171054-75/org.apache.karaf.deployer.spring-4.1.2-20170703.171054-75.jar
No artifacts from karaf-4.1.x » Apache Karaf :: Deployer :: Spring #77 to 
compare, so performing full copy of artifacts
[JENKINS] Archiving 
 to 
org.apache.karaf.deployer/deployer/4.1.2-SNAPSHOT/deployer-4.1.2-SNAPSHOT.pom
No artifacts from karaf-4.1.x » Apache Karaf :: Deployer #77 to compare, so 
performing full copy of artifacts
[JENKINS] Archiving 
 to 
org.apache.karaf.jms/org.apache.karaf.jms.core/4.1.2-SNAPSHOT/org.apache.karaf.jms.core-4.1.2-SNAPSHOT.pom
[JENKINS] Archiving 

 to 
org.apache.karaf.jms/org.apache.karaf.jms.core/4.1.2-20170703.172114-75/org.apache.karaf.jms.core-4.1.2-20170703.172114-75.jar
No artifacts from karaf-4.1.x » Apache Karaf :: JMS :: Core #77 to compare, so 
performing full copy of artifacts
[JENKINS] Archiving 
 to 
org.apache.karaf.bundle/org.apache.karaf.bundle.core/4.1.2-SNAPSHOT/org.apache.karaf.bundle.core-4.1.2-SNAPSHOT.pom
[JENKINS] Archiving 

 to 
org.apache.karaf.bundle/org.apache.karaf.bundle.core/4.1.2-20170703.170931-75/org.apache.karaf.bundle.core-4.1.2-20170703.170931-75.jar
No artifacts from karaf-4.1.x » Apache Karaf :: Bundle :: Core #77 to compare, 
so performing full copy of artifacts
[JENKINS] Archiving 
 to 
org.apache.karaf.shell/org.apache.karaf.shell.ssh/4.1.2-SNAPSHOT/org.apache.karaf.shell.ssh-4.1.2-SNAPSHOT.pom
[JENKINS] Archiving 

 to 
org.apache.karaf.shell/org.apache.karaf.shell.ssh/4.1.2-20170703.171432-75/org.apache.karaf.shell.ssh-4.1.2-20170703.171432-75.jar
No artifacts from karaf-4.1.x » Apache Karaf :: Shell :: SSH #77 to compare, so 
performing full copy of artifacts
[JENKINS] Archiving 
 to 
org.apache.karaf.webconsole/org.apache.karaf.webconsole.instance/4.1.2-SNAPSHOT/org.apache.karaf.webconsole.instance-4.1.2-SNAPSHOT.pom
[JENKINS] Archiving 

 to 
org.apache.karaf.webconsole/org.apache.karaf.webconsole.instance/4.1.2-20170703.171749-75/org.apache.karaf.webconsole.instance-4.1.2-20170703.171749-75.jar
No artifacts from karaf-4.1.x » Apache Karaf :: Web Console :: Instance Plugin 
#77 to compare, so performing full copy of artifacts
[JENKINS] Archiving 
 to 
org.apache.karaf.demos.deployer.bundle/my-bundle/4.1.2-SNAPSHOT/my-bundle-4.1.2-SNAPSHOT.pom
No artifacts from karaf-4.1.x » Apache Karaf :: Demos :: Deployer :: Bundle #77 
to compare, so performing full copy of artifacts
[JENKINS] Archiving 
 to 
org.apache.karaf.deployer/org.apache.karaf.deployer.features/4.1.2-SNAPSHOT/org.apache.karaf.deployer.features-4.1.2-SNAPSHOT.pom
[JENKINS] Archiving 

 to 
org.apache.karaf.deployer/org.apache.karaf.deployer.features/4.1.2-20170703.171255-75/org.apache.karaf.deployer.features-4.1.2-20170703.171255-75.jar
No artifacts from karaf-4.1.x » Apache Karaf :: Deployer :: Features #77 to 
compare, so performing full copy of artifacts
[JENKINS] Archiving 
 to 
org.apache.karaf.jaas/org.apache.karaf.jaas.jasypt/4.1.2-SNAPSHOT/org.apache.karaf.jaas.jasypt-4.1.2-SNAPSHOT.pom
[JENKINS] Archiving 

 to 
org.apache.karaf.jaas/org.apache.karaf.jaas.jasypt/4.1.2-20170703

Jenkins build is still unstable: karaf-master #4411

2017-07-03 Thread Apache Jenkins Server
See 




[8/8] karaf git commit: Merge remote-tracking branch 'kemitix/update-poms-and-remove-dependencyhelper30'

2017-07-03 Thread cschneider
Merge remote-tracking branch 'kemitix/update-poms-and-remove-dependencyhelper30'


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

Branch: refs/heads/master
Commit: bfd98f95d35b4650dc652ede518e1da9bdc4c7d1
Parents: 09accaf c29b9ca
Author: Christian Schneider 
Authored: Mon Jul 3 17:56:33 2017 +0200
Committer: Christian Schneider 
Committed: Mon Jul 3 17:56:33 2017 +0200

--
 pom.xml |   7 +
 tooling/karaf-maven-plugin/pom.xml  |  62 ++-
 .../karaf/tooling/utils/Dependency30Helper.java | 406 ---
 .../karaf/tooling/utils/Dependency31Helper.java |   3 -
 .../tooling/utils/DependencyHelperFactory.java  |  48 +--
 .../karaf/tooling/features/MavenUtilTest.java   |  36 --
 tooling/karaf-services-maven-plugin/pom.xml |   2 +-
 tooling/pom.xml |   4 +
 8 files changed, 91 insertions(+), 477 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/bfd98f95/pom.xml
--
diff --cc pom.xml
index 3d6b825,a4313e8..346f328
--- a/pom.xml
+++ b/pom.xml
@@@ -251,11 -249,12 +251,13 @@@
  5.3.4.Final
  1.16
  3.9.0.GA
 -3.3.0
 +3.3.1
  3.2.3
  1.2.17
 -2.0.9
 -2.0.9
 +3.0.3
 +2.10
++3.0.3
+ 
3.3
  1.0.0
  1.0.0
  6.0.0
@@@ -1065,50 -1064,10 +1067,55 @@@
  
  
  org.apache.maven
 +maven-compat
 +${maven.version}
 +
 +
 +org.apache.maven
+ maven-project
+ ${maven-project.version}
+ 
+ 
++org.apache.maven
 +maven-core
 +${maven.version}
 +
 +
 +org.apache.maven
 +maven-artifact
 +${maven.version}
 +
 +
 +org.apache.maven
 +maven-settings
 +${maven.version}
 +
 +
 +org.apache.maven
 +maven-settings-builder
 +${maven.version}
 +
 +
 +org.apache.maven.shared
 +maven-dependency-tree
 +2.2
 +
 +
 +org.apache.maven.wagon
 +wagon-provider-api
 +${maven.wagon.version}
 +
 +
 +org.apache.maven.wagon
 +wagon-http
 +${maven.wagon.version}
 +
 +
 +org.apache.maven.wagon
 +wagon-http-lightweight
 +${maven.wagon.version}
 +
 +
  xerces
  xercesImpl
  ${xerces.version}

http://git-wip-us.apache.org/repos/asf/karaf/blob/bfd98f95/tooling/karaf-maven-plugin/pom.xml
--

http://git-wip-us.apache.org/repos/asf/karaf/blob/bfd98f95/tooling/karaf-services-maven-plugin/pom.xml
--



[4/8] karaf git commit: tooling.karaf-maven-plugin: pom.xml: jacoco coverage reporting

2017-07-03 Thread cschneider
tooling.karaf-maven-plugin: pom.xml: jacoco coverage reporting


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

Branch: refs/heads/master
Commit: 30425a7a5977b4e4e2798f51e410143bbbf19560
Parents: 6946364
Author: Paul Campbell 
Authored: Tue Apr 11 18:50:07 2017 +0100
Committer: Paul Campbell 
Committed: Tue Jun 6 13:51:49 2017 +0100

--
 tooling/karaf-maven-plugin/pom.xml | 57 +
 1 file changed, 57 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/30425a7a/tooling/karaf-maven-plugin/pom.xml
--
diff --git a/tooling/karaf-maven-plugin/pom.xml 
b/tooling/karaf-maven-plugin/pom.xml
index d88899b..2626f64 100644
--- a/tooling/karaf-maven-plugin/pom.xml
+++ b/tooling/karaf-maven-plugin/pom.xml
@@ -35,6 +35,9 @@
 
 
${basedir}/../../etc/appended-resources
 
+0.00
+
0.00
+
1
 
 
 
@@ -306,6 +309,56 @@
 ${compiler.fork}
 
 
+
+org.jacoco
+jacoco-maven-plugin
+0.7.9
+
+
+
+prepare-agent
+
+
+
+report
+prepare-package
+
+report
+
+
+
+default-check
+
+check
+
+
+
+
+
+
+CLASS
+
+
+
+LINE
+COVEREDRATIO
+
${jacoco-class-line-covered-ratio}
+
+
+INSTRUCTION
+COVEREDRATIO
+
${jacoco-class-instruction-covered-ratio}
+
+
+CLASS
+MISSEDCOUNT
+
${jacoco-class-missed-count-maximum}
+
+
+
+
+
+
 
 
 
@@ -316,6 +369,10 @@
 
 maven-plugin-plugin
 
+
+org.jacoco
+jacoco-maven-plugin
+
 
 
 



[2/8] karaf git commit: tooling: Upgrade maven to 3.5.0

2017-07-03 Thread cschneider
tooling: Upgrade maven to 3.5.0


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

Branch: refs/heads/master
Commit: 5c5c9ba7f3c85f6c32896de5b398c1aefe120dd4
Parents: 0033b11
Author: Paul Campbell 
Authored: Wed Apr 12 13:59:37 2017 +0100
Committer: Paul Campbell 
Committed: Tue Jun 6 13:51:49 2017 +0100

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


http://git-wip-us.apache.org/repos/asf/karaf/blob/5c5c9ba7/tooling/pom.xml
--
diff --git a/tooling/pom.xml b/tooling/pom.xml
index 34ff585..41dbb70 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -34,7 +34,7 @@
 Apache Karaf :: Tooling
 
 
-3.0.3
+3.5.0
 
 
 



[5/8] karaf git commit: tooling.karaf-maven-plugin: Dependency30Helper removed

2017-07-03 Thread cschneider
tooling.karaf-maven-plugin: Dependency30Helper removed

Updated MavenUtilTest


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

Branch: refs/heads/master
Commit: d114b1d28597dd4b0e767b6435f7016948e63a09
Parents: 1f38978
Author: Paul Campbell 
Authored: Wed Apr 12 19:36:54 2017 +0100
Committer: Paul Campbell 
Committed: Tue Jun 6 14:29:09 2017 +0100

--
 .../karaf/tooling/utils/Dependency30Helper.java | 406 ---
 .../karaf/tooling/utils/Dependency31Helper.java |   3 -
 .../karaf/tooling/features/MavenUtilTest.java   |  36 --
 3 files changed, 445 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/d114b1d2/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency30Helper.java
--
diff --git 
a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency30Helper.java
 
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency30Helper.java
deleted file mode 100644
index 29e1464..000
--- 
a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/Dependency30Helper.java
+++ /dev/null
@@ -1,406 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.karaf.tooling.utils;
-
-import static java.lang.String.format;
-import static org.apache.commons.lang.reflect.MethodUtils.invokeMethod;
-import static 
org.apache.karaf.deployer.kar.KarArtifactInstaller.FEATURE_CLASSIFIER;
-
-import java.io.File;
-import java.lang.reflect.InvocationTargetException;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.maven.RepositoryUtils;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.project.ProjectBuildingRequest;
-import org.sonatype.aether.RepositorySystem;
-import org.sonatype.aether.RepositorySystemSession;
-import org.sonatype.aether.artifact.Artifact;
-import org.sonatype.aether.collection.CollectRequest;
-import org.sonatype.aether.collection.CollectResult;
-import org.sonatype.aether.collection.DependencyCollectionContext;
-import org.sonatype.aether.collection.DependencyCollectionException;
-import org.sonatype.aether.collection.DependencyGraphTransformer;
-import org.sonatype.aether.collection.DependencySelector;
-import org.sonatype.aether.graph.Dependency;
-import org.sonatype.aether.graph.DependencyNode;
-import org.sonatype.aether.repository.RemoteRepository;
-import org.sonatype.aether.resolution.ArtifactRequest;
-import org.sonatype.aether.resolution.ArtifactResolutionException;
-import org.sonatype.aether.resolution.ArtifactResult;
-import org.sonatype.aether.util.DefaultRepositorySystemSession;
-import org.sonatype.aether.util.artifact.DefaultArtifact;
-import org.sonatype.aether.util.graph.selector.AndDependencySelector;
-import org.sonatype.aether.util.graph.selector.ExclusionDependencySelector;
-import org.sonatype.aether.util.graph.selector.OptionalDependencySelector;
-import 
org.sonatype.aether.util.graph.transformer.ChainedDependencyGraphTransformer;
-import org.sonatype.aether.util.graph.transformer.ConflictMarker;
-import org.sonatype.aether.util.graph.transformer.JavaDependencyContextRefiner;
-import org.sonatype.aether.util.graph.transformer.JavaEffectiveScopeCalculator;
-
-/**
- * This is a dependency helper compliant with Maven 3.0 (using Aether Sonatype 
lib)
- */
-public class Dependency30Helper implements DependencyHelper {
-
-/**
- * The entry point to Aether, i.e. the component doing all the work.
- */
-private final RepositorySystem repositorySystem;
-
-/**
- * The current repository/network configuration of Maven.
- */
-private 

[7/8] karaf git commit: Merge remote-tracking branch 'apache/master' into update-poms-and-remove-dependencyhelper30

2017-07-03 Thread cschneider
Merge remote-tracking branch 'apache/master' into 
update-poms-and-remove-dependencyhelper30

* apache/master:
  [versions] Update to pax-web 6.0.5
  Add NamedThreadFactory in util package. Used in FeaturesService for now


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

Branch: refs/heads/master
Commit: c29b9ca3f681d0219bf4bef19e01b4e96ca0537d
Parents: cdc0da8 f9473d1
Author: Paul Campbell 
Authored: Wed Jun 7 10:23:12 2017 +0100
Committer: Paul Campbell 
Committed: Wed Jun 7 10:23:12 2017 +0100

--
 .../internal/service/FeaturesServiceImpl.java   |  3 +-
 pom.xml |  2 +-
 .../java/org/apache/karaf/util/ThreadUtils.java | 58 
 3 files changed, 61 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/c29b9ca3/pom.xml
--



[3/8] karaf git commit: pom.xml: Specify maven versions in properties

2017-07-03 Thread cschneider
pom.xml: Specify maven versions in properties

maven-project is pinned at 2.0.9, separate from maven.version as the
tooling module updates to maven 3.x which does not have a
maven-project.

Even though maven-project doesn't appear to be used and should
probably be removed, not pinning the version in dependencyManagement
will cause mvn to fail with an unresolved artifact.


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

Branch: refs/heads/master
Commit: 0033b11a1610a8c55356ff56f80c239515089023
Parents: 30425a7
Author: Paul Campbell 
Authored: Tue Apr 11 22:33:26 2017 +0100
Committer: Paul Campbell 
Committed: Tue Jun 6 13:51:49 2017 +0100

--
 pom.xml |  4 +++-
 tooling/karaf-maven-plugin/pom.xml  | 10 +-
 tooling/karaf-services-maven-plugin/pom.xml |  4 ++--
 tooling/pom.xml |  4 
 4 files changed, 14 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/0033b11a/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 1068ef4..6ba5d70 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,6 +253,8 @@
 3.2.3
 1.2.17
 2.0.9
+2.0.9
+
3.3
 1.0.0
 1.0.0
 6.0.0
@@ -1063,7 +1065,7 @@
 
 org.apache.maven
 maven-project
-${maven.version}
+${maven-project.version}
 
 
 xerces

http://git-wip-us.apache.org/repos/asf/karaf/blob/0033b11a/tooling/karaf-maven-plugin/pom.xml
--
diff --git a/tooling/karaf-maven-plugin/pom.xml 
b/tooling/karaf-maven-plugin/pom.xml
index 2626f64..31190f5 100644
--- a/tooling/karaf-maven-plugin/pom.xml
+++ b/tooling/karaf-maven-plugin/pom.xml
@@ -45,7 +45,7 @@
 
 org.apache.maven
 maven-plugin-api
-3.0.3
+${maven.version}
 
 
 org.sonatype.aether
@@ -70,22 +70,22 @@
 
 org.apache.maven
 maven-artifact
-3.0.3
+${maven.version}
 
 
 org.apache.maven
 maven-core
-3.0.3
+${maven.version}
 
 
 org.apache.maven
 maven-compat
-3.0.3
+${maven.version}
 
 
 org.apache.maven.plugin-tools
 maven-plugin-annotations
-3.3
+${maven-plugin-annotations.version}
 
 
 org.apache.maven.wagon

http://git-wip-us.apache.org/repos/asf/karaf/blob/0033b11a/tooling/karaf-services-maven-plugin/pom.xml
--
diff --git a/tooling/karaf-services-maven-plugin/pom.xml 
b/tooling/karaf-services-maven-plugin/pom.xml
index 728999f..ce01aa3 100644
--- a/tooling/karaf-services-maven-plugin/pom.xml
+++ b/tooling/karaf-services-maven-plugin/pom.xml
@@ -41,12 +41,12 @@
 
 org.apache.maven
 maven-plugin-api
-3.0.3
+${maven.version}
 
 
 org.apache.maven.plugin-tools
 maven-plugin-annotations
-3.3
+${maven-plugin-annotations.version}
 
 
 org.sonatype.aether

http://git-wip-us.apache.org/repos/asf/karaf/blob/0033b11a/tooling/pom.xml
--
diff --git a/tooling/pom.xml b/tooling/pom.xml
index a2a20d5..34ff585 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -33,6 +33,10 @@
 pom
 Apache Karaf :: Tooling
 
+
+3.0.3
+
+
 
 utils
 karaf-services-maven-plugin



[6/8] karaf git commit: tooling.karaf-maven-plugin: Upgrade plexus-utils to 3.0.24

2017-07-03 Thread cschneider
tooling.karaf-maven-plugin: Upgrade plexus-utils to 3.0.24


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

Branch: refs/heads/master
Commit: cdc0da87a3d514253ad70d5d8c18e0384646c4ae
Parents: d114b1d
Author: Paul Campbell 
Authored: Wed Apr 12 20:05:55 2017 +0100
Committer: Paul Campbell 
Committed: Tue Jun 6 14:29:13 2017 +0100

--
 tooling/karaf-maven-plugin/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/cdc0da87/tooling/karaf-maven-plugin/pom.xml
--
diff --git a/tooling/karaf-maven-plugin/pom.xml 
b/tooling/karaf-maven-plugin/pom.xml
index 31190f5..880ccd4 100644
--- a/tooling/karaf-maven-plugin/pom.xml
+++ b/tooling/karaf-maven-plugin/pom.xml
@@ -38,6 +38,7 @@
 0.00
 
0.00
 
1
+3.0.24
 
 
 
@@ -113,7 +114,7 @@
 
 org.codehaus.plexus
 plexus-utils
-3.0
+${plexus-utils.version}
 
 
 org.apache.felix



[1/8] karaf git commit: tooling.karaf-maven-plugin: DependencyHelperFactory: only support Maven 3.1+

2017-07-03 Thread cschneider
Repository: karaf
Updated Branches:
  refs/heads/master 09accafa8 -> bfd98f95d


tooling.karaf-maven-plugin: DependencyHelperFactory: only support Maven 3.1+


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

Branch: refs/heads/master
Commit: 1f38978d18848d0eecf1406740090056ef0406dd
Parents: 5c5c9ba
Author: Paul Campbell 
Authored: Wed Apr 12 19:32:34 2017 +0100
Committer: Paul Campbell 
Committed: Tue Jun 6 13:51:49 2017 +0100

--
 .../tooling/utils/DependencyHelperFactory.java  | 48 
 1 file changed, 19 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/1f38978d/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/DependencyHelperFactory.java
--
diff --git 
a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/DependencyHelperFactory.java
 
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/DependencyHelperFactory.java
index e60edf9..d091c96 100644
--- 
a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/DependencyHelperFactory.java
+++ 
b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/utils/DependencyHelperFactory.java
@@ -24,53 +24,43 @@ import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
 import org.codehaus.plexus.PlexusContainer;
 import 
org.codehaus.plexus.component.repository.exception.ComponentLookupException;
-import org.sonatype.aether.repository.RemoteRepository;
+import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.RepositorySystemSession;
+import org.eclipse.aether.repository.RemoteRepository;
 
 import java.util.List;
 
 /**
- * Service-locator based factory for available Aether system (Sonatype for 
Maven 3.0.x or Eclipse for Maven 3.1.x)
+ * Service-locator based factory for available Aether system.
+ *
+ * Supports the Eclipse implementation for Maven 3.1.x+
  */
 public class DependencyHelperFactory {
 
 /**
- * Create a new {@link DependencyHelper} based on what has been found 
in {@link org.codehaus.plexus.PlexusContainer}
- *
- * {@code karaf-maven-plugin} depends on {@code maven-core:3.0}, so for 
Maven 3.0.x, it may use this API directly.
- * When using Maven 3.1.x/3.2.x, it should use reflection to invoke 
org.apache.maven.RepositoryUtils.toArtifact(Artifact)
- * as this method directly references specific Aether implementation.
- *
- * When {@code karaf-maven-plugin} switches to {@code 
maven-core:3.1.0+}, reflection should be use for Sonatype variant of Aether.
+ * Create a new {@link DependencyHelper} based on what has been found 
in {@link
+ * org.codehaus.plexus.PlexusContainer}
  *
- * @param container The Maven Plexus container to use.
+ * @param containerThe Maven Plexus container to use.
  * @param mavenProject The Maven project to use.
  * @param mavenSession The Maven session.
- * @param log The log to use for the messages.
+ * @param log  The log to use for the messages.
+ *
  * @return The {@link DependencyHelper} depending of the Maven version 
used.
+ *
  * @throws MojoExecutionException If the plugin execution fails.
  */
-public static DependencyHelper createDependencyHelper(PlexusContainer 
container, MavenProject mavenProject, MavenSession mavenSession, Log log) 
throws MojoExecutionException {
+public static DependencyHelper createDependencyHelper(
+PlexusContainer container, MavenProject mavenProject, MavenSession 
mavenSession, Log log
+ ) throws 
MojoExecutionException {
 try {
-if 
(container.hasComponent("org.sonatype.aether.RepositorySystem")) {
-org.sonatype.aether.RepositorySystem system = 
container.lookup(org.sonatype.aether.RepositorySystem.class);
-org.sonatype.aether.RepositorySystemSession session = 
mavenSession.getRepositorySession();
-List repositories = 
mavenProject.getRemoteProjectRepositories();
-return new Dependency30Helper(repositories, session, system);
-} else if 
(container.hasComponent("org.eclipse.aether.RepositorySystem")) {
-org.eclipse.aether.RepositorySystem system = 
container.lookup(org.eclipse.aether.RepositorySystem.class);
-Object session;
-try {
-session = 
MavenSession.class.getMethod("getRepositorySession").invoke(mavenSession);
-} catch (Exception e) {

Jenkins build is still unstable: karaf-master #4410

2017-07-03 Thread Apache Jenkins Server
See 




karaf git commit: Typo: buffer -> session, cursor -> commandLine

2017-07-03 Thread cschneider
Repository: karaf
Updated Branches:
  refs/heads/master ba8a4abbe -> 09accafa8


Typo: buffer -> session, cursor -> commandLine


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

Branch: refs/heads/master
Commit: 09accafa859972664752e20e058209d06d5783b9
Parents: ba8a4ab
Author: Carlo Dapor 
Authored: Sat Jul 1 21:59:17 2017 +0200
Committer: Carlo Dapor 
Committed: Sat Jul 1 21:59:17 2017 +0200

--
 manual/src/main/asciidoc/developer-guide/extending.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/09accafa/manual/src/main/asciidoc/developer-guide/extending.adoc
--
diff --git a/manual/src/main/asciidoc/developer-guide/extending.adoc 
b/manual/src/main/asciidoc/developer-guide/extending.adoc
index 0581362..15ff59b 100644
--- a/manual/src/main/asciidoc/developer-guide/extending.adoc
+++ b/manual/src/main/asciidoc/developer-guide/extending.adoc
@@ -284,7 +284,7 @@ public class SimpleNameCompleter implements Completer {
 delegate.getStrings().add("Mike");
 delegate.getStrings().add("Eric");
 delegate.getStrings().add("Jenny");
-return delegate.complete(buffer, cursor, candidates);
+return delegate.complete(session, commandLine, candidates);
 }
 
 }