date:20160801

karaf-decanter git commit: [KARAF-4298] Add MongoDB appender

2016-08-01 Thread jbonofre

Repository: karaf-decanter
Updated Branches:
  refs/heads/master 2b731405a -> 332ea7729


[KARAF-4298] Add MongoDB appender


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

Branch: refs/heads/master
Commit: 332ea77292c565f12cbaa87aedec9cdd9d6ead14
Parents: 2b73140
Author: Jean-Baptiste OnofrÃ© 
Authored: Mon Aug 1 11:21:51 2016 +0200
Committer: Jean-Baptiste OnofrÃ© 
Committed: Mon Aug 1 11:21:51 2016 +0200

--
 appender/mongodb/LICENSE| 475 +++
 appender/mongodb/NOTICE |  36 ++
 appender/mongodb/pom.xml|  95 
 ...g.apache.karaf.decanter.appender.mongodb.cfg |  12 +
 .../appender/mongodb/MongoDbAppender.java   |  89 
 appender/pom.xml|   1 +
 assembly/src/main/feature/feature.xml   |   7 +-
 7 files changed, 714 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/332ea772/appender/mongodb/LICENSE
--
diff --git a/appender/mongodb/LICENSE b/appender/mongodb/LICENSE
new file mode 100644
index 000..b36a53d
--- /dev/null
+++ b/appender/mongodb/LICENSE
@@ -0,0 +1,475 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner

karaf-decanter git commit: Cleanup Kibana resource

2016-08-01 Thread jbonofre

Repository: karaf-decanter
Updated Branches:
  refs/heads/master 332ea7729 -> 0aafeb6be


Cleanup Kibana resource


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

Branch: refs/heads/master
Commit: 0aafeb6be2b9ceab548db6844bb4d233c13fd05c
Parents: 332ea77
Author: Jean-Baptiste OnofrÃ© 
Authored: Mon Aug 1 11:38:34 2016 +0200
Committer: Jean-Baptiste OnofrÃ© 
Committed: Mon Aug 1 11:38:34 2016 +0200

--
 assembly/src/main/feature/feature.xml |   1 -
 kibana-4.x/pom.xml|  20 ---
 kibana-4.x/src/main/cfg/decanter.json | 279 -
 3 files changed, 300 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/0aafeb6b/assembly/src/main/feature/feature.xml
--
diff --git a/assembly/src/main/feature/feature.xml 
b/assembly/src/main/feature/feature.xml
index 2656808..139c2b7 100644
--- a/assembly/src/main/feature/feature.xml
+++ b/assembly/src/main/feature/feature.xml
@@ -281,7 +281,6 @@
 war
 elasticsearch
 
mvn:org.apache.karaf.decanter/org.apache.karaf.decanter.kibana-4.x/${project.version}
-mvn:org.apache.karaf.decanter/org.apache.karaf.decanter.kibana-4.x/${project.version}/json
 
 
 

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/0aafeb6b/kibana-4.x/pom.xml
--
diff --git a/kibana-4.x/pom.xml b/kibana-4.x/pom.xml
index 10e7ae2..4fb4faa 100644
--- a/kibana-4.x/pom.xml
+++ b/kibana-4.x/pom.xml
@@ -71,26 +71,6 @@
 
 
 
-
-org.codehaus.mojo
-build-helper-maven-plugin
-
-
-package
-
-attach-artifact
-
-
-
-
-src/main/cfg/decanter.json
-json
-
-
-
-
-
-
 
  
 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/0aafeb6b/kibana-4.x/src/main/cfg/decanter.json
--
diff --git a/kibana-4.x/src/main/cfg/decanter.json 
b/kibana-4.x/src/main/cfg/decanter.json
deleted file mode 100644
index 2918493..000
--- a/kibana-4.x/src/main/cfg/decanter.json
+++ /dev/null
@@ -1,279 +0,0 @@
-[
-  {
-"_id": "ActiveMQ",
-"_type": "dashboard",
-"_source": {
-  "title": "ActiveMQ",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": 
"[{\"id\":\"ActiveMQ-Connections\",\"type\":\"visualization\",\"size_x\":6,\"size_y\":5,\"col\":1,\"row\":1},{\"id\":\"ActiveMQ-Messages\",\"type\":\"visualization\",\"size_x\":6,\"size_y\":5,\"col\":7,\"row\":1},{\"id\":\"ActiveMQ-Log\",\"type\":\"search\",\"size_x\":12,\"size_y\":4,\"col\":1,\"row\":6,\"columns\":[\"_source\"],\"sort\":[\"@timestamp\",\"desc\"]}]",
-  "version": 1,
-  "timeRestore": false,
-  "kibanaSavedObjectMeta": {
-"searchSourceJSON": 
"{\"filter\":[{\"query\":{\"query_string\":{\"query\":\"*\",\"analyze_wildcard\":true}}}]}"
-  }
-}
-  },
-  {
-"_id": "Karaf",
-"_type": "dashboard",
-"_source": {
-  "title": "Karaf",
-  "hits": 0,
-  "description": "",
-  "panelsJSON": 
"[{\"col\":10,\"id\":\"Log-Levels\",\"row\":5,\"size_x\":3,\"size_y\":4,\"type\":\"visualization\"},{\"col\":9,\"id\":\"Garbage-Collector\",\"row\":1,\"size_x\":4,\"size_y\":4,\"type\":\"visualization\"},{\"col\":1,\"id\":\"Threads\",\"row\":1,\"size_x\":4,\"size_y\":4,\"type\":\"visualization\"},{\"col\":5,\"id\":\"JVM-Memory\",\"row\":1,\"size_x\":4,\"size_y\":4,\"type\":\"visualization\"},{\"col\":1,\"id\":\"Class-Loading\",\"row\":5,\"size_x\":4,\"size_y\":4,\"type\":\"visualization\"},{\"col\":5,\"id\":\"Operating-System\",\"row\":5,\"size_x\":5,\"size_y\":4,\"type\":\"visualization\"},{\"id\":\"Log\",\"type\":\"search\",\"size_x\":12,\"size_y\":2,\"col\":1,\"row\":9,\"columns\":[\"_source\"],\"sort\":[\"@timestamp\",\"desc\"]}]",
-  "version": 1,
-  "timeRestore": false,
-  "kibanaSavedObjectMeta": {
-"searchSourceJSON": 
"{\"filter\":[{\"query\":{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"*\"}}}]}"
-  }
-}

karaf-decanter git commit: Change version to 1.2.0-SNAPSHOT

2016-08-01 Thread jbonofre

Repository: karaf-decanter
Updated Branches:
  refs/heads/master c79f653a7 -> 12ee0be30


Change version to 1.2.0-SNAPSHOT


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

Branch: refs/heads/master
Commit: 12ee0be30a756369bf3f6257fbb5af7de4f56c60
Parents: c79f653
Author: Jean-Baptiste OnofrÃ© 
Authored: Mon Aug 1 17:18:15 2016 +0200
Committer: Jean-Baptiste OnofrÃ© 
Committed: Mon Aug 1 17:18:15 2016 +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/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 +-
 manual/pom.xml| 2 +-
 marshaller/json/pom.xml   | 2 +-
 marshaller/pom.xml| 2 +-
 pom.xml   | 2 +-
 scheduler/pom.xml | 2 +-
 scheduler/simple/pom.xml  | 2 +-
 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 +-
 48 files changed, 48 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/12ee0be3/api/pom.xml
--
diff --git a/api/pom.xml b/api/pom.xml
index 644587d..dd0d407 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.karaf
 decanter
-1.1.1-SNAPSHOT
+1.2.0-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/12ee0be3/appender/camel/pom.xml
--
diff --git a/appender/camel/pom.xml b/appender/camel/pom.xml
index b9bb818..a98937e 100644
--- a/appender/camel/pom.xml
+++ b/appender/camel/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.karaf.decanter
 appender
-1.1.1-SNAPSHOT
+1.2.0-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/12ee0be3/appender/cassandra/pom.xml
--
diff --git a/appender/cassandra/pom.xml b/appender/cassandra/pom.xml
index 019934d..72fbbae 100644
--- a/appender/cassandra/pom.xml
+++ b/appender/cassandra/pom.xml
@@ -23,7 +23,7 @@

org.apache.karaf.decanter
appender
-   1.1.1-SNAPSHOT
+   1.2.0-SNAPSHOT
../pom.xml

org.apache.karaf.decanter.appender

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

[1/2] karaf git commit: [KARAF-4643] Fix the feature repositories default version to RELEASE / karaf.version

2016-08-01 Thread gnodet

Repository: karaf
Updated Branches:
  refs/heads/master 783212924 -> f7e18e37f


[KARAF-4643] Fix the feature repositories default version to RELEASE / 
karaf.version

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

Branch: refs/heads/master
Commit: ec1e361da1725b3a7ac85fb0eddc0cc061243881
Parents: 7832129
Author: Guillaume Nodet 
Authored: Mon Aug 1 17:47:47 2016 +0200
Committer: Guillaume Nodet 
Committed: Mon Aug 1 17:48:05 2016 +0200

--
 .../etc/org.apache.karaf.features.repos.cfg | 51 
 .../etc/org.apache.karaf.features.repos.cfg | 51 
 2 files changed, 51 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/ec1e361d/assemblies/features/base/src/main/filtered-resources/resources/etc/org.apache.karaf.features.repos.cfg
--
diff --git 
a/assemblies/features/base/src/main/filtered-resources/resources/etc/org.apache.karaf.features.repos.cfg
 
b/assemblies/features/base/src/main/filtered-resources/resources/etc/org.apache.karaf.features.repos.cfg
new file mode 100644
index 000..ba2078e
--- /dev/null
+++ 
b/assemblies/features/base/src/main/filtered-resources/resources/etc/org.apache.karaf.features.repos.cfg
@@ -0,0 +1,51 @@
+
+#
+#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.
+#
+
+
+#
+# This file describes the features repository URL
+# It could be directly installed using feature:repo-add command
+#
+enterprise=mvn:org.apache.karaf.features/enterprise/${karaf.version}/xml/features
+spring=mvn:org.apache.karaf.features/spring/${karaf.version}/xml/features
+cellar=mvn:org.apache.karaf.cellar/apache-karaf-cellar/RELEASE/xml/features
+cave=mvn:org.apache.karaf.cave/apache-karaf-cave/RELEASE/xml/features
+camel=mvn:org.apache.camel.karaf/apache-camel/RELEASE/xml/features
+camel-extras=mvn:org.apache-extras.camel-extra.karaf/camel-extra/RELEASE/xml/features
+cxf=mvn:org.apache.cxf.karaf/apache-cxf/RELEASE/xml/features
+cxf-dosgi=mvn:org.apache.cxf.dosgi/cxf-dosgi/RELEASE/xml/features
+cxf-xkms=mvn:org.apache.cxf.services.xkms/cxf-services-xkms-features/RELEASE/xml
+activemq=mvn:org.apache.activemq/activemq-karaf/RELEASE/xml/features
+jclouds=mvn:org.apache.jclouds.karaf/jclouds-karaf/RELEASE/xml/features
+openejb=mvn:org.apache.openejb/openejb-feature/RELEASE/xml/features
+wicket=mvn:org.ops4j.pax.wicket/features/RELEASE/xml/features
+hawtio=mvn:io.hawt/hawtio-karaf/RELEASE/xml/features
+pax-cdi=mvn:org.ops4j.pax.cdi/pax-cdi-features/RELEASE/xml/features
+pax-jdbc=mvn:org.ops4j.pax.jdbc/pax-jdbc-features/RELEASE/xml/features
+pax-jpa=mvn:org.ops4j.pax.jpa/pax-jpa-features/RELEASE/xml/features
+pax-web=mvn:org.ops4j.pax.web/pax-web-features/RELEASE/xml/features
+pax-wicket=mvn:org.ops4j.pax.wicket/pax-wicket-features/RELEASE/xml/features
+ecf=http://download.eclipse.org/rt/ecf/RELEASE/site.p2/karaf-features.xml
+decanter=mvn:org.apache.karaf.decanter/apache-karaf-decanter/RELEASE/xml/features
+eclipsesource-jaxrs=mvn:com.eclipsesource.jaxrs/features/RELEASE/xml/features
+aries-jpa=mvn:org.apache.aries.jpa/jpa-features/RELEASE/xml/features
+aries-rsa=mvn:org.apache.aries.rsa/rsa-features/RELEASE/xml/features
+hibernate=mvn:org.hibernate/hibernate-osgi/RELEASE/xml/karaf
+ignite=mvn:org.apache.ignite/ignite-osgi-karaf/RELEASE/xml/features
+artemis=mvn:org.apache.activemq/artemis-features/RELEASE/xml/features
+

http://git-wip-us.apache.org/repos/asf/karaf/blob/ec1e361d/assemblies/features/base/src/main/resources/resources/etc/org.apache.karaf.features.repos.cfg
--
diff --git

[2/2] karaf git commit: Add missing options to requirement-add/-remove, and format the json output repository so that it’s readable

2016-08-01 Thread gnodet

Add missing options to requirement-add/-remove, and format the json output 
repository so that itâs readable

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

Branch: refs/heads/master
Commit: f7e18e37f6d148bd582e2690793fff385e72ae71
Parents: ec1e361
Author: Guillaume Nodet 
Authored: Mon Aug 1 17:49:44 2016 +0200
Committer: Guillaume Nodet 
Committed: Mon Aug 1 17:49:44 2016 +0200

--
 .../features/command/InstallFeatureCommand.java |  2 -
 .../karaf/features/command/RequirementAdd.java  | 12 
 .../features/command/RequirementRemove.java | 12 
 .../internal/region/SubsystemResolver.java  |  2 +-
 .../features/internal/util/JsonWriter.java  | 62 +---
 5 files changed, 80 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/f7e18e37/features/command/src/main/java/org/apache/karaf/features/command/InstallFeatureCommand.java
--
diff --git 
a/features/command/src/main/java/org/apache/karaf/features/command/InstallFeatureCommand.java
 
b/features/command/src/main/java/org/apache/karaf/features/command/InstallFeatureCommand.java
index abcff31..9df243b 100644
--- 
a/features/command/src/main/java/org/apache/karaf/features/command/InstallFeatureCommand.java
+++ 
b/features/command/src/main/java/org/apache/karaf/features/command/InstallFeatureCommand.java
@@ -31,8 +31,6 @@ import org.apache.karaf.shell.api.action.lifecycle.Service;
 @Service
 public class InstallFeatureCommand extends FeaturesCommandSupport {
 
-private static String DEFAULT_VERSION = "0.0.0";
-
 @Argument(index = 0, name = "features", description = "The name and 
version of the features to install. A feature id looks like name/version. The 
version is optional.", required = true, multiValued = true)
 @Completion(AvailableFeatureCompleter.class)
 List features;

http://git-wip-us.apache.org/repos/asf/karaf/blob/f7e18e37/features/command/src/main/java/org/apache/karaf/features/command/RequirementAdd.java
--
diff --git 
a/features/command/src/main/java/org/apache/karaf/features/command/RequirementAdd.java
 
b/features/command/src/main/java/org/apache/karaf/features/command/RequirementAdd.java
index 12b8917..78a6289 100644
--- 
a/features/command/src/main/java/org/apache/karaf/features/command/RequirementAdd.java
+++ 
b/features/command/src/main/java/org/apache/karaf/features/command/RequirementAdd.java
@@ -50,6 +50,15 @@ public class RequirementAdd extends FeaturesCommandSupport {
 @Option(name = "-t", aliases = "--simulate", description = "Perform a 
simulation only")
 boolean simulate;
 
+@Option(name = "--store", description = "Store the resolution into the 
given file and result for offline analysis")
+String outputFile;
+
+@Option(name = "--features-wiring", description = "Print the wiring 
between features")
+boolean featuresWiring;
+
+@Option(name = "--all-wiring", description = "Print the full wiring")
+boolean allWiring;
+
 @Option(name = "-g", aliases = "--region", description = "Region to 
install to")
 String region = FeaturesService.ROOT_REGION;
 
@@ -60,8 +69,11 @@ public class RequirementAdd extends FeaturesCommandSupport {
 addOption(FeaturesService.Option.NoAutoRefreshBundles, noRefresh);
 addOption(FeaturesService.Option.NoAutoManageBundles, noManage);
 addOption(FeaturesService.Option.Verbose, verbose);
+addOption(FeaturesService.Option.DisplayFeaturesWiring, 
featuresWiring);
+addOption(FeaturesService.Option.DisplayAllWiring, allWiring);
 Map reqs = new HashMap<>();
 reqs.put(region, new HashSet<>(requirements));
+featuresService.setResolutionOutputFile(outputFile);
 featuresService.addRequirements(reqs, options);
 }
 

http://git-wip-us.apache.org/repos/asf/karaf/blob/f7e18e37/features/command/src/main/java/org/apache/karaf/features/command/RequirementRemove.java
--
diff --git 
a/features/command/src/main/java/org/apache/karaf/features/command/RequirementRemove.java
 
b/features/command/src/main/java/org/apache/karaf/features/command/RequirementRemove.java
index ad800e0..11f700b 100644
--- 
a/features/command/src/main/java/org/apache/karaf/features/command/RequirementRemove.java
+++ 
b/features/command/src/main/java/org/apache/karaf/features/command/RequirementRemove.java
@@ -50,6 +50,15 @@ public class RequirementRemove extends

karaf-decanter git commit: Update RELEASE-NOTES in preparation for the 1.2.0 release

2016-08-01 Thread jbonofre

Repository: karaf-decanter
Updated Branches:
  refs/heads/master 12ee0be30 -> 726f21612


Update RELEASE-NOTES in preparation for the 1.2.0 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/726f2161
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/726f2161
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/726f2161

Branch: refs/heads/master
Commit: 726f21612007e28297550d1e5bf95692e5ff9b09
Parents: 12ee0be
Author: Jean-Baptiste OnofrÃ© 
Authored: Mon Aug 1 17:25:58 2016 +0200
Committer: Jean-Baptiste OnofrÃ© 
Committed: Mon Aug 1 17:25:58 2016 +0200

--
 RELEASE-NOTES | 45 +
 1 file changed, 45 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/726f2161/RELEASE-NOTES
--
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 1442955..d1a8de8 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -15,6 +15,51 @@
  * limitations under the License.
  */
 
+Apache Karaf Decanter 1.2.0
+===
+
+  Overview
+  
+Apache Karaf Decanter 1.2.0 is a major new Decanter release, providing lot of 
new features (new collectors, new
+appenders) 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-4516] - Extend Karaf feature import version range in Decanter 
Kibana bundle
+* [KARAF-4525] - Decanter log collector should not ignore the log alerter 
category
+* [KARAF-4532] - SystemCollector throws IOException
+* [KARAF-4574] - EventAdmin not injected in file collector
+* [KARAF-4580] - Installing elasticsearch feature fails on Windows
+* [KARAF-4594] - Log4J socket collector error handling mutiple clients
+* [KARAF-4604] - JsonUnMarshaller doesn't handle Map and Lists
+* [KARAF-4605] - Kafka Collector uses the same topic for eventadmin and 
kafka
+* [KARAF-4625] - JMS appender should use MapMessage property instead of 
JMS properties
+* [KARAF-4629] - Can't append into Elasticsearch
+
+** Dependency upgrade
+* [KARAF-4558] - Upgrade to Elasticsearch 1.7.4
+* [KARAF-4560] - Upgrade to ActiveMQ 5.13.3
+* [KARAF-4561] - Upgrade to Johnzon 0.9.3-incubating
+
+** Improvement
+* [KARAF-4565] - Set ConfigurationPolicy.REQUIRE for decanter appenders 
and collectors
+* [KARAF-4610] - Improve Decanter scheduler to reduce latency
+
+** New Feature
+* [KARAF-4298] - Add MongoDB appender
+* [KARAF-4320] - Create socket collector and appender
+* [KARAF-4530] - Create Kafka collector
+* [KARAF-4531] - Create JMS collector
+* [KARAF-4546] - Support embedding decanter into spring boot apps
+
 Apache Karaf Decanter 1.1.0
 ===

karaf-decanter git commit: Use Felix Connect 0.1.0

2016-08-01 Thread jbonofre

Repository: karaf-decanter
Updated Branches:
  refs/heads/master 726f21612 -> bcc02e2f3


Use Felix Connect 0.1.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/bcc02e2f
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/bcc02e2f
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/bcc02e2f

Branch: refs/heads/master
Commit: bcc02e2f38e85034321ce84767074e995fe635df
Parents: 726f216
Author: Jean-Baptiste OnofrÃ© 
Authored: Mon Aug 1 17:37:40 2016 +0200
Committer: Jean-Baptiste OnofrÃ© 
Committed: Mon Aug 1 17:37:40 2016 +0200

--
 spring-boot-starter-decanter/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/bcc02e2f/spring-boot-starter-decanter/pom.xml
--
diff --git a/spring-boot-starter-decanter/pom.xml 
b/spring-boot-starter-decanter/pom.xml
index 126c934..9f62200 100644
--- a/spring-boot-starter-decanter/pom.xml
+++ b/spring-boot-starter-decanter/pom.xml
@@ -36,7 +36,7 @@
 
 org.apache.felix
 org.apache.felix.connect
-0.1.1-SNAPSHOT
+0.1.0
 
 
 org.apache.felix

karaf-decanter git commit: [KARAF-4320] Create network socket collector and appender

2016-08-01 Thread jbonofre

Repository: karaf-decanter
Updated Branches:
  refs/heads/master 0aafeb6be -> c79f653a7


[KARAF-4320] Create network socket collector and appender


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

Branch: refs/heads/master
Commit: c79f653a7c30e679c62c58fb38d4967060a5ada5
Parents: 0aafeb6
Author: Jean-Baptiste OnofrÃ© 
Authored: Mon Aug 1 17:04:51 2016 +0200
Committer: Jean-Baptiste OnofrÃ© 
Committed: Mon Aug 1 17:04:51 2016 +0200

--
 appender/pom.xml|   1 +
 appender/socket/LICENSE | 475 +++
 appender/socket/NOTICE  |  36 ++
 appender/socket/pom.xml |  68 +++
 ...rg.apache.karaf.decanter.appender.socket.cfg |   7 +
 .../appender/socket/SocketAppender.java |  91 
 assembly/src/main/feature/feature.xml   |  12 +
 collector/pom.xml   |   1 +
 collector/socket/LICENSE| 475 +++
 collector/socket/NOTICE |  32 ++
 collector/socket/pom.xml|  67 +++
 ...g.apache.karaf.decanter.collector.socket.cfg |   7 +
 .../collector/socket/SocketCollector.java   | 162 +++
 .../src/main/asciidoc/user-guide/appenders.adoc |  31 +-
 .../main/asciidoc/user-guide/collectors.adoc|  25 +
 15 files changed, 1489 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/c79f653a/appender/pom.xml
--
diff --git a/appender/pom.xml b/appender/pom.xml
index 415de23..3be0a39 100644
--- a/appender/pom.xml
+++ b/appender/pom.xml
@@ -47,6 +47,7 @@
 redis
 rest
 mongodb
+socket
 
 
 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/c79f653a/appender/socket/LICENSE
--
diff --git a/appender/socket/LICENSE b/appender/socket/LICENSE
new file mode 100644
index 000..b36a53d
--- /dev/null
+++ b/appender/socket/LICENSE
@@ -0,0 +1,475 @@
+
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of

[karaf-decanter] Git Push Summary

2016-08-01 Thread jbonofre

Repository: karaf-decanter
Updated Tags:  refs/tags/decanter-1.2.0 [created] c8b04a715

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

2016-08-01 Thread jbonofre

Repository: karaf-decanter
Updated Branches:
  refs/heads/master 6cf4eae43 -> c5235eae0


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

Branch: refs/heads/master
Commit: c5235eae03ffa6eab428455a3d946d3377a6009e
Parents: 6cf4eae
Author: Jean-Baptiste OnofrÃ© 
Authored: Mon Aug 1 17:56:52 2016 +0200
Committer: Jean-Baptiste OnofrÃ© 
Committed: Mon Aug 1 17:56:52 2016 +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/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 ++--
 scheduler/pom.xml | 2 +-
 scheduler/simple/pom.xml  | 2 +-
 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 +-
 47 files changed, 48 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/c5235eae/api/pom.xml
--
diff --git a/api/pom.xml b/api/pom.xml
index e8e15fd..6a1420c 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.karaf
 decanter
-1.2.0
+1.2.1-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/c5235eae/appender/camel/pom.xml
--
diff --git a/appender/camel/pom.xml b/appender/camel/pom.xml
index c470a27..b8d1de2 100644
--- a/appender/camel/pom.xml
+++ b/appender/camel/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.karaf.decanter
 appender
-1.2.0
+1.2.1-SNAPSHOT
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/c5235eae/appender/cassandra/pom.xml
--
diff --git a/appender/cassandra/pom.xml b/appender/cassandra/pom.xml
index a1bd856..68ea240 100644
--- a/appender/cassandra/pom.xml
+++ b/appender/cassandra/pom.xml
@@ -23,7 +23,7 @@

org.apache.karaf.decanter
appender
-   1.2.0
+   1.2.1-SNAPSHOT
../pom.xml

org.apache.karaf.decanter.appender

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/c5235eae/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 d5b06d2..ee00d77 100644

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

2016-08-01 Thread jbonofre

Repository: karaf-decanter
Updated Branches:
  refs/heads/master bcc02e2f3 -> 6cf4eae43


[maven-release-plugin] prepare release decanter-1.2.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/6cf4eae4
Tree: http://git-wip-us.apache.org/repos/asf/karaf-decanter/tree/6cf4eae4
Diff: http://git-wip-us.apache.org/repos/asf/karaf-decanter/diff/6cf4eae4

Branch: refs/heads/master
Commit: 6cf4eae43773be92d4371d4e1eba59433e8d0f9f
Parents: bcc02e2
Author: Jean-Baptiste OnofrÃ© 
Authored: Mon Aug 1 17:56:30 2016 +0200
Committer: Jean-Baptiste OnofrÃ© 
Committed: Mon Aug 1 17:56:30 2016 +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/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   | 11 ---
 scheduler/pom.xml |  2 +-
 scheduler/simple/pom.xml  |  2 +-
 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 +-
 47 files changed, 50 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/6cf4eae4/api/pom.xml
--
diff --git a/api/pom.xml b/api/pom.xml
index dd0d407..e8e15fd 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.karaf
 decanter
-1.2.0-SNAPSHOT
+1.2.0
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/6cf4eae4/appender/camel/pom.xml
--
diff --git a/appender/camel/pom.xml b/appender/camel/pom.xml
index a98937e..c470a27 100644
--- a/appender/camel/pom.xml
+++ b/appender/camel/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.karaf.decanter
 appender
-1.2.0-SNAPSHOT
+1.2.0
 ../pom.xml
 
 

http://git-wip-us.apache.org/repos/asf/karaf-decanter/blob/6cf4eae4/appender/cassandra/pom.xml
--
diff --git a/appender/cassandra/pom.xml b/appender/cassandra/pom.xml
index 72fbbae..a1bd856 100644
--- a/appender/cassandra/pom.xml
+++ b/appender/cassandra/pom.xml
@@ -23,7 +23,7 @@

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

org.apache.karaf.decanter.appender

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

Build failed in Jenkins: karaf-master #3944

2016-08-01 Thread Apache Jenkins Server

See 

Changes:

[gnodet] [KARAF-4643] Fix the feature repositories default version to RELEASE /

[gnodet] Add missing options to requirement-add/-remove, and format the json

--
Started by an SCM change
[EnvInject] - Loading node environment variables.
Building remotely on H10 (docker Ubuntu ubuntu yahoo-not-h2) in workspace 

 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url 
 > https://git-wip-us.apache.org/repos/asf/karaf.git # timeout=10
Fetching upstream changes from https://git-wip-us.apache.org/repos/asf/karaf.git
 > git --version # timeout=10
 > git -c core.askpass=true fetch --tags --progress 
 > https://git-wip-us.apache.org/repos/asf/karaf.git 
 > +refs/heads/*:refs/remotes/origin/*
 > git rev-parse refs/remotes/origin/master^{commit} # timeout=10
 > git rev-parse refs/remotes/origin/origin/master^{commit} # timeout=10
Checking out Revision f7e18e37f6d148bd582e2690793fff385e72ae71 
(refs/remotes/origin/master)
 > git config core.sparsecheckout # timeout=10
 > git checkout -f f7e18e37f6d148bd582e2690793fff385e72ae71
 > git rev-list 783212924e67c0028240e55ce1d413141c0c6239 # timeout=10
Parsing POMs
Modules changed, recalculating dependency graph
Established TCP socket on 37192
maven32-agent.jar already up to date
maven32-interceptor.jar already up to date
maven3-interceptor-commons.jar already up to date
[karaf-master] $ 
/home/jenkins/jenkins-slave/tools/hudson.model.JDK/jdk1.8.0_66/bin/java 
-XX:MaxPermSize=256m -cp 
/home/jenkins/jenkins-slave/maven32-agent.jar:/home/jenkins/jenkins-slave/tools/hudson.tasks.Maven_MavenInstallation/maven-3.3.3/boot/plexus-classworlds-2.5.2.jar:/home/jenkins/jenkins-slave/tools/hudson.tasks.Maven_MavenInstallation/maven-3.3.3/conf/logging
 jenkins.maven3.agent.Maven32Main 
/home/jenkins/jenkins-slave/tools/hudson.tasks.Maven_MavenInstallation/maven-3.3.3
 /home/jenkins/jenkins-slave/slave.jar 
/home/jenkins/jenkins-slave/maven32-interceptor.jar 
/home/jenkins/jenkins-slave/maven3-interceptor-commons.jar 37192
Java HotSpot(TM) 64-Bit Server VM warning: ignoring option MaxPermSize=256m; 
support was removed in 8.0
Exception in thread "main" java.lang.ClassNotFoundException: 
hudson.remoting.Launcher
at 
org.codehaus.plexus.classworlds.strategy.SelfFirstStrategy.loadClass(SelfFirstStrategy.java:50)
at 
org.codehaus.plexus.classworlds.realm.ClassRealm.unsynchronizedLoadClass(ClassRealm.java:271)
at 
org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:247)
at 
org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:239)
at jenkins.maven3.agent.Maven32Main.main(Maven32Main.java:143)
at jenkins.maven3.agent.Maven32Main.main(Maven32Main.java:74)
ERROR: Failed to parse POMs
java.io.EOFException: unexpected stream termination
at hudson.remoting.ChannelBuilder.negotiate(ChannelBuilder.java:365)
at hudson.remoting.ChannelBuilder.build(ChannelBuilder.java:310)
at hudson.slaves.Channels.forProcess(Channels.java:115)
at 
hudson.maven.AbstractMavenProcessFactory.newProcess(AbstractMavenProcessFactory.java:297)
at hudson.maven.ProcessCache.get(ProcessCache.java:236)
at 
hudson.maven.MavenModuleSetBuild$MavenModuleSetBuildExecution.doRun(MavenModuleSetBuild.java:778)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:534)
at hudson.model.Run.execute(Run.java:1738)
at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:531)
at hudson.model.ResourceController.execute(ResourceController.java:98)
at hudson.model.Executor.run(Executor.java:410)

karaf git commit: KARAF-4642: featuresBoot order is not honored

2016-08-01 Thread jgoodyear

Repository: karaf
Updated Branches:
  refs/heads/karaf-3.0.x 75de07355 -> f72a527c4


KARAF-4642: featuresBoot order is not honored


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

Branch: refs/heads/karaf-3.0.x
Commit: f72a527c48ae39b12f6a6b1821846865da3c28e2
Parents: 75de073
Author: James Carman 
Authored: Fri Jul 29 14:40:57 2016 -0400
Committer: James Carman 
Committed: Fri Jul 29 14:40:57 2016 -0400

--
 .../internal/BootFeaturesInstaller.java |  5 ++-
 .../internal/BootFeaturesInstallerTest.java | 45 ++--
 2 files changed, 36 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/f72a527c/features/core/src/main/java/org/apache/karaf/features/internal/BootFeaturesInstaller.java
--
diff --git 
a/features/core/src/main/java/org/apache/karaf/features/internal/BootFeaturesInstaller.java
 
b/features/core/src/main/java/org/apache/karaf/features/internal/BootFeaturesInstaller.java
index caaa0e2..729710a 100644
--- 
a/features/core/src/main/java/org/apache/karaf/features/internal/BootFeaturesInstaller.java
+++ 
b/features/core/src/main/java/org/apache/karaf/features/internal/BootFeaturesInstaller.java
@@ -21,6 +21,7 @@ import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.Hashtable;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Matcher;
@@ -99,7 +100,7 @@ public class BootFeaturesInstaller {
private List toFeatureSetList(List 
stagedFeatures) {
ArrayList result = new ArrayList();
for (Set features : stagedFeatures) {
-   HashSet featureSet = new HashSet();
+   HashSet featureSet = new LinkedHashSet();
 for (String featureName : features) {
 try {
 Feature feature = getFeature(featureName);
@@ -152,7 +153,7 @@ public class BootFeaturesInstaller {
 }
 
 private Set parseFeatureList(String group) {
-HashSet features = new HashSet();
+HashSet features = new LinkedHashSet();
 for (String feature : Arrays.asList(group.trim().split("\\s*,\\s*"))) {
 if (feature.length() > 0) {
 features.add(feature);

http://git-wip-us.apache.org/repos/asf/karaf/blob/f72a527c/features/core/src/test/java/org/apache/karaf/features/internal/BootFeaturesInstallerTest.java
--
diff --git 
a/features/core/src/test/java/org/apache/karaf/features/internal/BootFeaturesInstallerTest.java
 
b/features/core/src/test/java/org/apache/karaf/features/internal/BootFeaturesInstallerTest.java
index 6da8c11..7b6b23d 100644
--- 
a/features/core/src/test/java/org/apache/karaf/features/internal/BootFeaturesInstallerTest.java
+++ 
b/features/core/src/test/java/org/apache/karaf/features/internal/BootFeaturesInstallerTest.java
@@ -16,29 +16,46 @@
  */
 package org.apache.karaf.features.internal;
 
-import static java.util.Arrays.asList;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-
+import java.util.Arrays;
 import java.util.EnumSet;
+import java.util.LinkedHashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
 
 import org.apache.karaf.features.Feature;
 import org.apache.karaf.features.FeaturesService.Option;
+import org.easymock.Capture;
 import org.easymock.EasyMock;
-import org.junit.Assert;
 import org.junit.Test;
 
+import static java.util.Arrays.asList;
+import static org.easymock.EasyMock.capture;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.junit.Assert.assertEquals;
+
 public class BootFeaturesInstallerTest extends TestBase {
 
 @Test
 @SuppressWarnings("unchecked")
 public void testParser() {
 BootFeaturesInstaller installer = new BootFeaturesInstaller(null, 
null, "", false);
-Assert.assertEquals(asList(setOf("test1", "test2"), setOf("test3")), 
installer.parseBootFeatures(" ( test1 , test2 ) , test3 "));
-Assert.assertEquals(asList(setOf("test1", "test2", "test3")), 
installer.parseBootFeatures(" test1 , test2, test3"));
-Assert.assertEquals(asList(setOf("test1"), setOf("test2"), 
setOf("test3")), installer.parseBootFeatures("(test1), (test2), test3"));
+
+assertEquals(asList(orderedSet("test1", "test2"), 
orderedSet("test3")),

Build failed in Jenkins: karaf-3.0.x #992

2016-08-01 Thread Apache Jenkins Server

See 

Changes:

[james.carman] KARAF-4642: featuresBoot order is not honored

--
Started by an SCM change
[EnvInject] - Loading node environment variables.
Building remotely on H10 (docker Ubuntu ubuntu yahoo-not-h2) in workspace 

Cloning the remote Git repository
Cloning repository https://git-wip-us.apache.org/repos/asf/karaf.git
 > git init  # timeout=10
Fetching upstream changes from https://git-wip-us.apache.org/repos/asf/karaf.git
 > git --version # timeout=10
 > git -c core.askpass=true fetch --tags --progress 
 > https://git-wip-us.apache.org/repos/asf/karaf.git 
 > +refs/heads/*:refs/remotes/origin/*
 > git config remote.origin.url 
 > https://git-wip-us.apache.org/repos/asf/karaf.git # timeout=10
 > git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # 
 > timeout=10
 > git config remote.origin.url 
 > https://git-wip-us.apache.org/repos/asf/karaf.git # timeout=10
Fetching upstream changes from https://git-wip-us.apache.org/repos/asf/karaf.git
 > git -c core.askpass=true fetch --tags --progress 
 > https://git-wip-us.apache.org/repos/asf/karaf.git 
 > +refs/heads/*:refs/remotes/origin/*
 > git rev-parse refs/remotes/origin/karaf-3.0.x^{commit} # timeout=10
 > git rev-parse refs/remotes/origin/origin/karaf-3.0.x^{commit} # timeout=10
Checking out Revision f72a527c48ae39b12f6a6b1821846865da3c28e2 
(refs/remotes/origin/karaf-3.0.x)
 > git config core.sparsecheckout # timeout=10
 > git checkout -f f72a527c48ae39b12f6a6b1821846865da3c28e2
 > git rev-list 75de073554c92822ebc09e1a2298e8caf4a2473c # timeout=10
Parsing POMs
Modules changed, recalculating dependency graph
Established TCP socket on 37620
maven3-agent.jar already up to date
maven3-interceptor.jar already up to date
maven3-interceptor-commons.jar already up to date
[karaf-3.0.x] $ /home/jenkins/tools/java/latest1.7/bin/java -Xmx2g -Xms256m 
-XX:MaxPermSize=512m -cp 
/home/jenkins/jenkins-slave/maven3-agent.jar:/home/jenkins/tools/maven/apache-maven-3.0.4/boot/plexus-classworlds-2.4.jar
 org.jvnet.hudson.maven3.agent.Maven3Main 
/home/jenkins/tools/maven/apache-maven-3.0.4 
/home/jenkins/jenkins-slave/slave.jar 
/home/jenkins/jenkins-slave/maven3-interceptor.jar 
/home/jenkins/jenkins-slave/maven3-interceptor-commons.jar 37620
Exception in thread "main" java.lang.ClassNotFoundException: 
hudson.remoting.Launcher
at 
org.codehaus.plexus.classworlds.strategy.SelfFirstStrategy.loadClass(SelfFirstStrategy.java:50)
at 
org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:244)
at 
org.codehaus.plexus.classworlds.realm.ClassRealm.loadClass(ClassRealm.java:230)
at org.jvnet.hudson.maven3.agent.Maven3Main.main(Maven3Main.java:138)
at org.jvnet.hudson.maven3.agent.Maven3Main.main(Maven3Main.java:70)
ERROR: Failed to parse POMs
java.io.EOFException: unexpected stream termination
at hudson.remoting.ChannelBuilder.negotiate(ChannelBuilder.java:365)
at hudson.remoting.ChannelBuilder.build(ChannelBuilder.java:310)
at hudson.slaves.Channels.forProcess(Channels.java:115)
at 
hudson.maven.AbstractMavenProcessFactory.newProcess(AbstractMavenProcessFactory.java:297)
at hudson.maven.ProcessCache.get(ProcessCache.java:236)
at 
hudson.maven.MavenModuleSetBuild$MavenModuleSetBuildExecution.doRun(MavenModuleSetBuild.java:778)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:534)
at hudson.model.Run.execute(Run.java:1738)
at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:531)
at hudson.model.ResourceController.execute(ResourceController.java:98)
at hudson.model.Executor.run(Executor.java:410)

karaf git commit: KARAF-4644: Pin 4.0.x Branch to CXF 3.1.7

2016-08-01 Thread jgoodyear

Repository: karaf
Updated Branches:
  refs/heads/karaf-4.0.x 2c0bf85f9 -> dbd58bcec


KARAF-4644: Pin 4.0.x Branch to CXF 3.1.7


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

Branch: refs/heads/karaf-4.0.x
Commit: dbd58bcec7f88cf9ae6e502e27d3cb84438ee048
Parents: 2c0bf85
Author: James Carman 
Authored: Mon Aug 1 15:59:06 2016 -0400
Committer: James Carman 
Committed: Mon Aug 1 15:59:06 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/karaf/blob/dbd58bce/jaas/modules/pom.xml
--
diff --git a/jaas/modules/pom.xml b/jaas/modules/pom.xml
index 23c6f9e..a94667c 100644
--- a/jaas/modules/pom.xml
+++ b/jaas/modules/pom.xml
@@ -118,7 +118,7 @@
 
 org.apache.cxf
 cxf-core
-3.1.7-SNAPSHOT
+3.1.7
 provided

karaf git commit: [KARAF-4642] featuresBoot order is not honored. Thank you James Carman for the patch.

2016-08-01 Thread jgoodyear

Repository: karaf
Updated Branches:
  refs/heads/master 90edb946a -> 78ec18859


[KARAF-4642] featuresBoot order is not honored. Thank you James Carman for the 
patch.


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

Branch: refs/heads/master
Commit: 78ec188594794ae549e36a1ef5bc3ffcd3fcb339
Parents: 90edb94
Author: jgoodyear 
Authored: Mon Aug 1 22:23:17 2016 -0230
Committer: jgoodyear 
Committed: Mon Aug 1 22:23:17 2016 -0230

--
 .../internal/service/BootFeaturesInstaller.java |  5 +-
 .../service/BootFeaturesInstallerTest.java  | 55 
 2 files changed, 37 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/78ec1885/features/core/src/main/java/org/apache/karaf/features/internal/service/BootFeaturesInstaller.java
--
diff --git 
a/features/core/src/main/java/org/apache/karaf/features/internal/service/BootFeaturesInstaller.java
 
b/features/core/src/main/java/org/apache/karaf/features/internal/service/BootFeaturesInstaller.java
index 2b3f81b..d0a703f 100644
--- 
a/features/core/src/main/java/org/apache/karaf/features/internal/service/BootFeaturesInstaller.java
+++ 
b/features/core/src/main/java/org/apache/karaf/features/internal/service/BootFeaturesInstaller.java
@@ -23,6 +23,7 @@ import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.Hashtable;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Matcher;
@@ -58,7 +59,7 @@ public class BootFeaturesInstaller {
  * The system separator character.
  */
 private static final char SYSTEM_SEPARATOR = File.separatorChar;
-
+
 public BootFeaturesInstaller(BundleContext bundleContext,
  FeaturesServiceImpl featuresService,
  String repositories,
@@ -138,7 +139,7 @@ public class BootFeaturesInstaller {
 }
 
 protected Set parseFeatureList(String group) {
-HashSet features = new HashSet<>();
+HashSet features = new LinkedHashSet<>();
 for (String feature : Arrays.asList(group.trim().split("\\s*,\\s*"))) {
 if (feature.length() > 0) {
 features.add(feature);

http://git-wip-us.apache.org/repos/asf/karaf/blob/78ec1885/features/core/src/test/java/org/apache/karaf/features/internal/service/BootFeaturesInstallerTest.java
--
diff --git 
a/features/core/src/test/java/org/apache/karaf/features/internal/service/BootFeaturesInstallerTest.java
 
b/features/core/src/test/java/org/apache/karaf/features/internal/service/BootFeaturesInstallerTest.java
index 1754e25..1c6b0d5 100644
--- 
a/features/core/src/test/java/org/apache/karaf/features/internal/service/BootFeaturesInstallerTest.java
+++ 
b/features/core/src/test/java/org/apache/karaf/features/internal/service/BootFeaturesInstallerTest.java
@@ -16,21 +16,28 @@
  */
 package org.apache.karaf.features.internal.service;
 
-import static java.util.Arrays.asList;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.junit.Assert.fail;
-
 import java.net.URI;
+import java.util.ArrayList;
 import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
 
-import org.apache.karaf.features.Feature;
 import org.apache.karaf.features.FeaturesService.Option;
 import org.apache.karaf.features.TestBase;
-import org.easymock.EasyMock;
+import org.easymock.Capture;
 import org.junit.Assert;
 import org.junit.Test;
 
+import static java.util.Arrays.asList;
+import static org.easymock.EasyMock.capture;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.createStrictMock;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.newCapture;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+
 public class BootFeaturesInstallerTest extends TestBase {
 
 @Test
@@ -44,51 +51,57 @@ public class BootFeaturesInstallerTest extends TestBase {
 
 @Test
 public void testDefaultBootFeatures() throws Exception  {
-FeaturesServiceImpl impl = 
EasyMock.createMock(FeaturesServiceImpl.class);
+FeaturesServiceImpl impl = createMock(FeaturesServiceImpl.class);
 
-impl.installFeatures(setOf("config", "standard", "region"), 
EnumSet.of(Option.NoFailOnFeatureNotFound));
-EasyMock.expectLastCall();
+

[2/2] karaf git commit: Merge branch 'KARAF-4642-4.0.x' of https://github.com/jwcarman/karaf into karaf-4.0.x

2016-08-01 Thread jgoodyear

Merge branch 'KARAF-4642-4.0.x' of https://github.com/jwcarman/karaf into 
karaf-4.0.x


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

Branch: refs/heads/karaf-4.0.x
Commit: 9f513b9505a3f6217c976706f0f7b6c81919a617
Parents: dbd58bc f86eb63
Author: jgoodyear 
Authored: Mon Aug 1 18:23:29 2016 -0230
Committer: jgoodyear 
Committed: Mon Aug 1 18:23:29 2016 -0230

--
 .../internal/service/BootFeaturesInstaller.java |  3 +-
 .../service/BootFeaturesInstallerTest.java  | 55 
 2 files changed, 36 insertions(+), 22 deletions(-)
--

[1/2] karaf git commit: KARAF-4642: featuresBoot order is not honored

2016-08-01 Thread jgoodyear

Repository: karaf
Updated Branches:
  refs/heads/karaf-4.0.x dbd58bcec -> 9f513b950


KARAF-4642: featuresBoot order is not honored


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

Branch: refs/heads/karaf-4.0.x
Commit: f86eb6389513a5aa2befc4c04df5855c276b
Parents: 2c0bf85
Author: James Carman 
Authored: Mon Aug 1 15:21:16 2016 -0400
Committer: James Carman 
Committed: Mon Aug 1 15:21:16 2016 -0400

--
 .../internal/service/BootFeaturesInstaller.java |  3 +-
 .../service/BootFeaturesInstallerTest.java  | 55 
 2 files changed, 36 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/karaf/blob/f86eb638/features/core/src/main/java/org/apache/karaf/features/internal/service/BootFeaturesInstaller.java
--
diff --git 
a/features/core/src/main/java/org/apache/karaf/features/internal/service/BootFeaturesInstaller.java
 
b/features/core/src/main/java/org/apache/karaf/features/internal/service/BootFeaturesInstaller.java
index f3b1647..d45cfc6 100644
--- 
a/features/core/src/main/java/org/apache/karaf/features/internal/service/BootFeaturesInstaller.java
+++ 
b/features/core/src/main/java/org/apache/karaf/features/internal/service/BootFeaturesInstaller.java
@@ -23,6 +23,7 @@ import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.HashSet;
 import java.util.Hashtable;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Matcher;
@@ -141,7 +142,7 @@ public class BootFeaturesInstaller {
 }
 
 protected Set parseFeatureList(String group) {
-HashSet features = new HashSet<>();
+HashSet features = new LinkedHashSet<>();
 for (String feature : Arrays.asList(group.trim().split("\\s*,\\s*"))) {
 if (feature.length() > 0) {
 features.add(feature);

http://git-wip-us.apache.org/repos/asf/karaf/blob/f86eb638/features/core/src/test/java/org/apache/karaf/features/internal/service/BootFeaturesInstallerTest.java
--
diff --git 
a/features/core/src/test/java/org/apache/karaf/features/internal/service/BootFeaturesInstallerTest.java
 
b/features/core/src/test/java/org/apache/karaf/features/internal/service/BootFeaturesInstallerTest.java
index 1754e25..1c6b0d5 100644
--- 
a/features/core/src/test/java/org/apache/karaf/features/internal/service/BootFeaturesInstallerTest.java
+++ 
b/features/core/src/test/java/org/apache/karaf/features/internal/service/BootFeaturesInstallerTest.java
@@ -16,21 +16,28 @@
  */
 package org.apache.karaf.features.internal.service;
 
-import static java.util.Arrays.asList;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.junit.Assert.fail;
-
 import java.net.URI;
+import java.util.ArrayList;
 import java.util.EnumSet;
+import java.util.List;
+import java.util.Set;
 
-import org.apache.karaf.features.Feature;
 import org.apache.karaf.features.FeaturesService.Option;
 import org.apache.karaf.features.TestBase;
-import org.easymock.EasyMock;
+import org.easymock.Capture;
 import org.junit.Assert;
 import org.junit.Test;
 
+import static java.util.Arrays.asList;
+import static org.easymock.EasyMock.capture;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.createStrictMock;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.newCapture;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+
 public class BootFeaturesInstallerTest extends TestBase {
 
 @Test
@@ -44,51 +51,57 @@ public class BootFeaturesInstallerTest extends TestBase {
 
 @Test
 public void testDefaultBootFeatures() throws Exception  {
-FeaturesServiceImpl impl = 
EasyMock.createMock(FeaturesServiceImpl.class);
+FeaturesServiceImpl impl = createMock(FeaturesServiceImpl.class);
 
-impl.installFeatures(setOf("config", "standard", "region"), 
EnumSet.of(Option.NoFailOnFeatureNotFound));
-EasyMock.expectLastCall();
+Capture featuresCapture = newCapture();
+impl.installFeatures(capture(featuresCapture), 
eq(EnumSet.of(Option.NoFailOnFeatureNotFound)));
+expectLastCall();
 
 impl.bootDone();
-EasyMock.expectLastCall();
+expectLastCall();
 
 replay(impl);
 BootFeaturesInstaller bootFeatures = new

[2/2] karaf git commit: Merge branch 'KARAF-4644-master' of https://github.com/jwcarman/karaf

2016-08-01 Thread jgoodyear

Merge branch 'KARAF-4644-master' of https://github.com/jwcarman/karaf


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

Branch: refs/heads/master
Commit: 90edb946ad578e13c16ce68383a35cc774a2c5a9
Parents: f7e18e3 e1918a4
Author: jgoodyear 
Authored: Mon Aug 1 17:51:44 2016 -0230
Committer: jgoodyear 
Committed: Mon Aug 1 17:51:44 2016 -0230

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

[1/2] karaf git commit: KARAF-4644: Pin 4.0.x Branch to CXF 3.1.7

2016-08-01 Thread jgoodyear

Repository: karaf
Updated Branches:
  refs/heads/master f7e18e37f -> 90edb946a


KARAF-4644: Pin 4.0.x Branch to CXF 3.1.7


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

Branch: refs/heads/master
Commit: e1918a458310d0a678ac2ab3639d0b211efcd3d1
Parents: 7832129
Author: James Carman 
Authored: Mon Aug 1 16:03:11 2016 -0400
Committer: James Carman 
Committed: Mon Aug 1 16:03:11 2016 -0400

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


http://git-wip-us.apache.org/repos/asf/karaf/blob/e1918a45/jaas/modules/pom.xml
--
diff --git a/jaas/modules/pom.xml b/jaas/modules/pom.xml
index 54ca79a..c635b44 100644
--- a/jaas/modules/pom.xml
+++ b/jaas/modules/pom.xml
@@ -118,7 +118,7 @@
 
 org.apache.cxf
 cxf-core
-3.1.7-SNAPSHOT
+3.1.7
 provided