Repository: incubator-unomi Updated Branches: refs/heads/feature-UNOMI-5-KARAF4-1 b670fdd0e -> cb956a1bd
fix unknown protocol: wrap Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/cb956a1b Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/cb956a1b Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/cb956a1b Branch: refs/heads/feature-UNOMI-5-KARAF4-1 Commit: cb956a1bd01b110ab9c8b7f83717dc4ec7f5c923 Parents: b670fdd Author: Oliver Lietz <[email protected]> Authored: Mon Mar 5 16:53:23 2018 +0100 Committer: Oliver Lietz <[email protected]> Committed: Mon Mar 5 16:53:23 2018 +0100 ---------------------------------------------------------------------- itests/pom.xml | 7 +++++++ itests/src/test/java/org/apache/unomi/itests/BaseIT.java | 2 +- pom.xml | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/cb956a1b/itests/pom.xml ---------------------------------------------------------------------- diff --git a/itests/pom.xml b/itests/pom.xml index 73a5859..9f5fcda 100644 --- a/itests/pom.xml +++ b/itests/pom.xml @@ -136,6 +136,13 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.ops4j.pax.url</groupId> + <artifactId>pax-url-wrap</artifactId> + <classifier>uber</classifier> + <version>2.5.4</version> + <scope>test</scope> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/cb956a1b/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 5c9d6ae..2ee849f 100644 --- a/itests/src/test/java/org/apache/unomi/itests/BaseIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/BaseIT.java @@ -116,12 +116,12 @@ public abstract class BaseIT { systemProperty("org.apache.unomi.itests.elasticsearch.bootstrap.seccomp").value("false"), systemProperty("unomi.autoStart").value("true"), features(karafPaxWebRepo, "shell"), - features(karafStandardRepo, "wrap"), 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()), http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/cb956a1b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8692ee5..fd8b400 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ <version.jackson.jaxb>2.8.6</version.jackson.jaxb> <version.karaf>4.1.5</version.karaf> <version.karaf.cellar>4.1.0</version.karaf.cellar> - <version.pax.exam>4.11.2</version.pax.exam> + <version.pax.exam>4.11.0</version.pax.exam> <elasticsearch.version>5.6.3</elasticsearch.version> <maven.compiler.source>1.7</maven.compiler.source> @@ -960,7 +960,7 @@ <plugin> <groupId>org.apache.servicemix.tooling</groupId> <artifactId>depends-maven-plugin</artifactId> - <version>1.2</version> + <version>1.4.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId>
