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 <[email protected]> Authored: Tue Mar 15 17:56:30 2016 +0100 Committer: Guillaume Nodet <[email protected]> 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<>();
