This closes #1152
diff --git a/brooklyn-server/karaf/features/src/main/feature/feature.xml b/brooklyn-server/karaf/features/src/main/feature/feature.xml
index 384bc7d..49a90e6 100644
--- a/brooklyn-server/karaf/features/src/main/feature/feature.xml
+++ b/brooklyn-server/karaf/features/src/main/feature/feature.xml
@@ -197,4 +197,22 @@
<!--<feature version="${project.version}">brooklyn-core</feature>-->
</feature>
+ <feature name="brooklyn-software-winrm" version="${project.version}" description="Brooklyn WinRM Software Entities">
+ <bundle>mvn:org.apache.brooklyn/brooklyn-software-winrm/${project.version}</bundle>
+ <feature>brooklyn-core</feature>
+ <bundle dependency="true">wrap:mvn:io.cloudsoft.windows/winrm4j/${winrm4j.version}</bundle>
+ </feature>
+
+ <feature name="brooklyn-policy" version="${project.version}" description="Brooklyn Policies">
+ <bundle>mvn:org.apache.brooklyn/brooklyn-policy/${project.version}</bundle>
+ <feature>brooklyn-core</feature>
+ </feature>
+
+ <feature name="brooklyn-software-base" version="${project.version}" description="Brooklyn Software Base">
+ <bundle>mvn:org.apache.brooklyn/brooklyn-software-base/${project.version}</bundle>
+ <feature>brooklyn-software-winrm</feature>
+ <feature>brooklyn-policy</feature>
+ <!-- python dependency required but not supported since karaf cannot handle its runtime bindings -->
+ </feature>
+
</features>
diff --git a/brooklyn-server/software/base/pom.xml b/brooklyn-server/software/base/pom.xml
index 556e982..51ae966 100644
--- a/brooklyn-server/software/base/pom.xml
+++ b/brooklyn-server/software/base/pom.xml
@@ -163,6 +163,10 @@
<configuration>
<instructions>
<Include-Resource>{maven-resources}, target/classes/brooklyn-jmxmp-agent-shaded-${project.version}.jar, target/classes/brooklyn-jmxrmi-agent-${project.version}.jar</Include-Resource>
+ <Import-Package>
+ !org.python.core,
+ *
+ </Import-Package>
</instructions>
</configuration>
</plugin>