[BROOKLYN-183] Adjust commits from master to match OSGI changes Rename injectManagementContext to setManagementContext
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a5979a71 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a5979a71 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a5979a71 Branch: refs/heads/master Commit: a5979a715263752fd7589669f5dabad4c2110a39 Parents: 640a0b2 Author: Ciprian Ciubotariu <[email protected]> Authored: Sun Nov 22 03:01:39 2015 +0200 Committer: Ciprian Ciubotariu <[email protected]> Committed: Sun Nov 22 03:01:39 2015 +0200 ---------------------------------------------------------------------- .../apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java | 2 +- .../org/apache/brooklyn/core/typereg/TypePlanTransformers.java | 2 +- .../core/typereg/JavaClassNameTypePlanTransformerTest.java | 2 +- karaf/features/src/main/history/dependencies.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a5979a71/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java b/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java index 79085ea..ee49d39 100644 --- a/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java +++ b/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java @@ -43,7 +43,7 @@ public abstract class AbstractTypePlanTransformer implements BrooklynTypePlanTra protected ManagementContext mgmt; @Override - public void injectManagementContext(ManagementContext mgmt) { + public void setManagementContext(ManagementContext mgmt) { this.mgmt = mgmt; } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a5979a71/core/src/main/java/org/apache/brooklyn/core/typereg/TypePlanTransformers.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/brooklyn/core/typereg/TypePlanTransformers.java b/core/src/main/java/org/apache/brooklyn/core/typereg/TypePlanTransformers.java index e24660e..fb1bbd6 100644 --- a/core/src/main/java/org/apache/brooklyn/core/typereg/TypePlanTransformers.java +++ b/core/src/main/java/org/apache/brooklyn/core/typereg/TypePlanTransformers.java @@ -80,7 +80,7 @@ public class TypePlanTransformers { result.addAll(getAll()); } for(BrooklynTypePlanTransformer t : result) { - t.injectManagementContext(mgmt); + t.setManagementContext(mgmt); } return result; } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a5979a71/core/src/test/java/org/apache/brooklyn/core/typereg/JavaClassNameTypePlanTransformerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/typereg/JavaClassNameTypePlanTransformerTest.java b/core/src/test/java/org/apache/brooklyn/core/typereg/JavaClassNameTypePlanTransformerTest.java index 23dc2f3..55b5d3b 100644 --- a/core/src/test/java/org/apache/brooklyn/core/typereg/JavaClassNameTypePlanTransformerTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/typereg/JavaClassNameTypePlanTransformerTest.java @@ -47,7 +47,7 @@ public class JavaClassNameTypePlanTransformerTest extends BrooklynMgmtUnitTestSu protected BrooklynTypePlanTransformer newTransformer() { BrooklynTypePlanTransformer xf = new JavaClassNameTypePlanTransformer(); - xf.injectManagementContext(mgmt); + xf.setManagementContext(mgmt); return xf; } http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a5979a71/karaf/features/src/main/history/dependencies.xml ---------------------------------------------------------------------- diff --git a/karaf/features/src/main/history/dependencies.xml b/karaf/features/src/main/history/dependencies.xml index 98add88..8d705b5 100644 --- a/karaf/features/src/main/history/dependencies.xml +++ b/karaf/features/src/main/history/dependencies.xml @@ -96,7 +96,7 @@ <bundle>mvn:org.yaml/snakeyaml/1.11</bundle> <bundle>wrap:mvn:com.google.http-client/google-http-client/1.18.0-rc</bundle> <bundle>wrap:mvn:com.maxmind.geoip2/geoip2/0.8.1</bundle> - <bundle>wrap:mvn:javax.validation/validation-api/1.0.0.GA</bundle> + <bundle>wrap:mvn:javax.validation/validation-api/1.1.0.Final</bundle> <bundle>wrap:mvn:org.tukaani/xz/1.4</bundle> <bundle>wrap:mvn:xpp3/xpp3_min/1.1.4c</bundle> </feature>
