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/02/27 15:55:26 UTC
[08/11] incubator-unomi git commit: UNOMI-5 Upgrade to Karaf 4 -
Upgrading to Karaf 4.1.1, still some issues building the project.
UNOMI-5 Upgrade to Karaf 4
- Upgrading to Karaf 4.1.1, still some issues building the project.
Signed-off-by: Serge Huber <sh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/463193d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/463193d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/463193d2
Branch: refs/heads/feature-UNOMI-5-KARAF4-1
Commit: 463193d255343b9f882b8b982465464bd82a0568
Parents: 9199f3f
Author: Serge Huber <sh...@apache.org>
Authored: Mon Jun 26 14:39:55 2017 +0200
Committer: Serge Huber <sh...@apache.org>
Committed: Tue Feb 27 16:42:03 2018 +0100
----------------------------------------------------------------------
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/463193d2/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 2db9834..0cb81cd 100644
--- a/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
@@ -46,7 +46,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()
@@ -116,6 +116,7 @@ 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"),
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/463193d2/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/463193d2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0a44ca2..81224c5 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.6.3</elasticsearch.version>
@@ -912,6 +912,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>