make wrap a prerequisite feature and remove unnecessary bundles and features
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/1927b667 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/1927b667 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/1927b667 Branch: refs/heads/feature-UNOMI-5-KARAF4-1 Commit: 1927b667e3571d888c4beef367274ea1a25e5447 Parents: 319243a Author: Oliver Lietz <o...@apache.org> Authored: Tue Mar 6 00:43:02 2018 +0100 Committer: Serge Huber <shu...@apache.org> Committed: Tue Mar 6 15:55:13 2018 +0100 ---------------------------------------------------------------------- .../src/test/java/org/apache/unomi/itests/BaseIT.java | 12 +----------- kar/src/main/feature/feature.xml | 1 + 2 files changed, 2 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1927b667/itests/src/test/java/org/apache/unomi/itests/BaseIT.java ---------------------------------------------------------------------- diff --git a/itests/src/test/java/org/apache/unomi/itests/BaseIT.java b/itests/src/test/java/org/apache/unomi/itests/BaseIT.java index b610685..9da6b85 100644 --- a/itests/src/test/java/org/apache/unomi/itests/BaseIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/BaseIT.java @@ -117,20 +117,10 @@ public abstract class BaseIT { systemProperty("org.apache.unomi.itests.elasticsearch.http.port").value("9400"), systemProperty("org.apache.unomi.itests.elasticsearch.bootstrap.seccomp").value("false"), systemProperty("unomi.autoStart").value("true"), - features(karafStandardRepo, "shell"), - features(karafPaxWebRepo, "war"), features(karafCxfRepo, "cxf"), features(karafCellarRepo, "cellar"), features(contextServerRepo, "unomi-kar"), - features(routerRepo, "unomi-router-karaf-feature"), - mavenBundle().groupId("org.ops4j.pax.url").artifactId("pax-url-wrap").classifier("uber").versionAsInProject(), - // we need to wrap the HttpComponents libraries ourselves since the OSGi bundles provided by the project are incorrect - wrappedBundle(mavenBundle("org.apache.httpcomponents", - "httpcore").versionAsInProject()), - wrappedBundle(mavenBundle("org.apache.httpcomponents", - "httpmime").versionAsInProject()), - wrappedBundle(mavenBundle("org.apache.httpcomponents", - "httpclient").versionAsInProject()) + features(routerRepo, "unomi-router-karaf-feature") }; } } http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1927b667/kar/src/main/feature/feature.xml ---------------------------------------------------------------------- diff --git a/kar/src/main/feature/feature.xml b/kar/src/main/feature/feature.xml index f9e37e9..3e74eb7 100644 --- a/kar/src/main/feature/feature.xml +++ b/kar/src/main/feature/feature.xml @@ -23,6 +23,7 @@ <feature>cxf</feature> <feature>cellar</feature> <feature>eventadmin</feature> + <feature prerequisite="true">wrap</feature> <configfile finalname="/etc/org.apache.unomi.web.cfg">mvn:org.apache.unomi/unomi-wab/${project.version}/cfg/unomicfg</configfile> <configfile finalname="/etc/org.apache.unomi.persistence.elasticsearch.cfg">mvn:org.apache.unomi/unomi-persistence-elasticsearch-core/${project.version}/cfg/elasticsearchcfg</configfile> <configfile finalname="/etc/org.apache.unomi.plugins.request.cfg">mvn:org.apache.unomi/unomi-plugins-request/${project.version}/cfg/requestcfg</configfile>
