Repository: incubator-unomi Updated Branches: refs/heads/feature-UNOMI-5-KARAF4 dd2e5bce8 -> 1daaf2a2a
UNOMI-5 Upgrade to Karaf 4 - Upgrading to Karaf 4.1.1, still some issues building the project. Signed-off-by: Serge Huber <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/1daaf2a2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/1daaf2a2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/1daaf2a2 Branch: refs/heads/feature-UNOMI-5-KARAF4 Commit: 1daaf2a2a39b69791ad0381115f811423340a3b5 Parents: dd2e5bc Author: Serge Huber <[email protected]> Authored: Mon Jun 26 14:39:55 2017 +0200 Committer: Serge Huber <[email protected]> Committed: Mon Jun 26 14:39:55 2017 +0200 ---------------------------------------------------------------------- itests/src/test/java/org/apache/unomi/itests/BaseIT.java | 3 ++- .../test/java/org/apache/unomi/performancetests/BasicTest.java | 3 ++- pom.xml | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1daaf2a2/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 cfb8ed3..c48769e 100644 --- a/itests/src/test/java/org/apache/unomi/itests/BaseIT.java +++ b/itests/src/test/java/org/apache/unomi/itests/BaseIT.java @@ -44,7 +44,7 @@ public abstract class BaseIT { MavenArtifactUrlReference karafUrl = maven() .groupId("org.apache.karaf") .artifactId("apache-karaf") - .version("3.0.8") + .version("4.1.1") .type("tar.gz"); MavenUrlReference karafStandardRepo = maven() @@ -92,6 +92,7 @@ public abstract class BaseIT { systemProperty("org.ops4j.pax.exam.rbc.rmi.port").value("1199"), systemProperty("org.apache.unomi.itests.elasticsearch.transport.port").value("9500"), systemProperty("org.apache.unomi.itests.elasticsearch.http.port").value("9400"), + features(karafStandardRepo, "wrap"), features(karafPaxWebRepo, "war"), features(karafCxfRepo, "cxf"), features(karafCellarRepo, "cellar"), http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1daaf2a2/performance-tests/src/test/java/org/apache/unomi/performancetests/BasicTest.java ---------------------------------------------------------------------- diff --git a/performance-tests/src/test/java/org/apache/unomi/performancetests/BasicTest.java b/performance-tests/src/test/java/org/apache/unomi/performancetests/BasicTest.java index 4ed0ea6..d37ff5f 100644 --- a/performance-tests/src/test/java/org/apache/unomi/performancetests/BasicTest.java +++ b/performance-tests/src/test/java/org/apache/unomi/performancetests/BasicTest.java @@ -82,7 +82,7 @@ public class BasicTest { MavenArtifactUrlReference karafUrl = maven() .groupId("org.apache.karaf") .artifactId("apache-karaf") - .version("3.0.1") + .version("4.1.1") .type("tar.gz"); MavenUrlReference karafStandardRepo = maven() @@ -129,6 +129,7 @@ public class BasicTest { .unpackDirectory(new File("target/exam")) .useDeployFolder(false), keepRuntimeFolder(), + KarafDistributionOption.features(karafStandardRepo, "wrap") KarafDistributionOption.features(karafPaxWebRepo, "war"), KarafDistributionOption.features(karafCxfRepo, "cxf"), KarafDistributionOption.features(contextServerRepo, "unomi-kar"), http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1daaf2a2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index cf8d65d..e8f22b0 100644 --- a/pom.xml +++ b/pom.xml @@ -67,8 +67,8 @@ <cxf.version>3.1.10</cxf.version> <version.jackson.core>2.8.6</version.jackson.core> <version.jackson.jaxb>2.8.6</version.jackson.jaxb> - <version.karaf>4.0.8</version.karaf> - <version.karaf.cellar>4.0.3</version.karaf.cellar> + <version.karaf>4.1.1</version.karaf> + <version.karaf.cellar>4.1.0</version.karaf.cellar> <version.pax.exam>4.11.2</version.pax.exam> <elasticsearch.version>5.2.2</elasticsearch.version> @@ -897,6 +897,7 @@ <groupId>org.apache.karaf.tooling</groupId> <artifactId>karaf-maven-plugin</artifactId> <version>${version.karaf}</version> + <extensions>true</extensions> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId>
