You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by gn...@apache.org on 2016/03/15 18:29:04 UTC
[1/2] karaf git commit: [KARAF-4420] Ensure the maven plugin uses the
same policy for service requirements
Repository: karaf
Updated Branches:
refs/heads/karaf-4.0.x c03fd3b62 -> a3257ca27
[KARAF-4420] Ensure the maven plugin uses the same policy for service requirements
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/1b7ddc8e
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/1b7ddc8e
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/1b7ddc8e
Branch: refs/heads/karaf-4.0.x
Commit: 1b7ddc8e1da0f6d70586c7b76f4992a3f0c64f52
Parents: c03fd3b
Author: Guillaume Nodet <gn...@apache.org>
Authored: Tue Mar 15 17:56:30 2016 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Tue Mar 15 18:28:46 2016 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/karaf/profile/assembly/Builder.java | 1 +
.../src/main/java/org/apache/karaf/tooling/VerifyMojo.java | 1 +
2 files changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/1b7ddc8e/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
----------------------------------------------------------------------
diff --git a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
index 3076375..9768f26 100644
--- a/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
+++ b/profile/src/main/java/org/apache/karaf/profile/assembly/Builder.java
@@ -1246,6 +1246,7 @@ public class Builder {
Deployer.DeploymentRequest request = new Deployer.DeploymentRequest();
request.bundleUpdateRange = FeaturesService.DEFAULT_BUNDLE_UPDATE_RANGE;
request.featureResolutionRange = FeaturesService.DEFAULT_FEATURE_RESOLUTION_RANGE;
+ request.serviceRequirements = FeaturesService.SERVICE_REQUIREMENTS_DEFAULT;
request.overrides = new HashSet<>();
request.requirements = new HashMap<>();
request.stateChanges = new HashMap<>();
http://git-wip-us.apache.org/repos/asf/karaf/blob/1b7ddc8e/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java
----------------------------------------------------------------------
diff --git a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java
index 24953c1..17fa69c 100644
--- a/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java
+++ b/tooling/karaf-maven-plugin/src/main/java/org/apache/karaf/tooling/VerifyMojo.java
@@ -424,6 +424,7 @@ public class VerifyMojo extends MojoSupport {
Deployer.DeploymentRequest request = new Deployer.DeploymentRequest();
request.bundleUpdateRange = FeaturesService.DEFAULT_BUNDLE_UPDATE_RANGE;
request.featureResolutionRange = FeaturesService.DEFAULT_FEATURE_RESOLUTION_RANGE;
+ request.serviceRequirements = FeaturesService.SERVICE_REQUIREMENTS_DEFAULT;
request.overrides = new HashSet<>();
request.requirements = new HashMap<>();
request.stateChanges = new HashMap<>();
[2/2] karaf git commit: [KARAF-4421] Upgrade to JLine 2.14.x
Posted by gn...@apache.org.
[KARAF-4421] Upgrade to JLine 2.14.x
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/a3257ca2
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a3257ca2
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a3257ca2
Branch: refs/heads/karaf-4.0.x
Commit: a3257ca274cae7064dfdcfa64e1c60a05af8d8fa
Parents: 1b7ddc8
Author: Guillaume Nodet <gn...@apache.org>
Authored: Tue Mar 15 18:28:22 2016 +0100
Committer: Guillaume Nodet <gn...@apache.org>
Committed: Tue Mar 15 18:28:52 2016 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/karaf/blob/a3257ca2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b5598a0..be6e7be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -245,7 +245,7 @@
<hibernate.validator.version>5.0.3.Final</hibernate.validator.version>
<jansi.version>1.11</jansi.version>
<javassist.version>3.9.0.GA</javassist.version>
- <jline.version>2.13</jline.version>
+ <jline.version>2.14.1</jline.version>
<jledit.version>0.2.1</jledit.version>
<jsw.version>3.2.3</jsw.version>
<log4j.version>1.2.17</log4j.version>