You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2018/03/06 14:55:47 UTC
[20/26] incubator-unomi git commit: fix unknown protocol: wrap
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/b9e5c95d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/b9e5c95d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/b9e5c95d
Branch: refs/heads/feature-UNOMI-5-KARAF4-1
Commit: b9e5c95d04f31ba0213338563b904cb74af8d5c0
Parents: 92905ac
Author: Oliver Lietz <ol...@apache.org>
Authored: Mon Mar 5 16:53:23 2018 +0100
Committer: Serge Huber <sh...@apache.org>
Committed: Tue Mar 6 15:55:13 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/b9e5c95d/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/b9e5c95d/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/b9e5c95d/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>