You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by cz...@apache.org on 2021/12/21 07:03:48 UTC
[felix-dev] branch master updated: Update integration test to latest framework implementation and logging implementations
This is an automated email from the ASF dual-hosted git repository.
cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push:
new 1b0cafb Update integration test to latest framework implementation and logging implementations
1b0cafb is described below
commit 1b0cafbfe8e96de6ffd3b95ae3a16576d22ca2df
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Tue Dec 21 08:03:38 2021 +0100
Update integration test to latest framework implementation and logging implementations
---
http/itest/pom.xml | 4 ++--
.../org/apache/felix/http/itest/BaseIntegrationTest.java | 13 +++++++------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/http/itest/pom.xml b/http/itest/pom.xml
index fcee816..4566d3e 100644
--- a/http/itest/pom.xml
+++ b/http/itest/pom.xml
@@ -35,7 +35,7 @@
<pax.exam.version>4.13.1</pax.exam.version>
<pax.url.aether.version>2.6.2</pax.url.aether.version>
<http.servlet.api.version>1.1.2</http.servlet.api.version>
- <http.jetty.version>4.1.13-SNAPSHOT</http.jetty.version>
+ <http.jetty.version>4.1.15-SNAPSHOT</http.jetty.version>
</properties>
<build>
@@ -149,7 +149,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
- <version>6.0.3</version>
+ <version>7.0.3</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/http/itest/src/test/java/org/apache/felix/http/itest/BaseIntegrationTest.java b/http/itest/src/test/java/org/apache/felix/http/itest/BaseIntegrationTest.java
index 49ac38f..3c675b4 100644
--- a/http/itest/src/test/java/org/apache/felix/http/itest/BaseIntegrationTest.java
+++ b/http/itest/src/test/java/org/apache/felix/http/itest/BaseIntegrationTest.java
@@ -316,17 +316,18 @@ public abstract class BaseIntegrationTest
// scavenge sessions every 10 seconds (10 minutes is default in 9.4.x)
systemProperty("org.eclipse.jetty.servlet.SessionScavengingInterval").value("10"),
- mavenBundle("org.slf4j", "slf4j-api", "1.7.5"),
- mavenBundle("org.slf4j", "jcl-over-slf4j", "1.7.5"),
- mavenBundle("org.slf4j", "log4j-over-slf4j", "1.7.5"),
+ mavenBundle("org.slf4j", "slf4j-api", "1.7.32"),
+ mavenBundle("org.slf4j", "jcl-over-slf4j", "1.7.32"),
+ mavenBundle("org.slf4j", "log4j-over-slf4j", "1.7.32"),
- mavenBundle("org.apache.sling", "org.apache.sling.commons.log", "4.0.0"),
- mavenBundle("org.apache.sling", "org.apache.sling.commons.logservice", "1.0.2"),
+ mavenBundle("org.apache.felix", "org.apache.felix.log", "1.2.6"),
+ mavenBundle("org.apache.sling", "org.apache.sling.commons.log", "5.3.0"),
+ mavenBundle("org.apache.sling", "org.apache.sling.commons.logservice", "1.1.0"),
mavenBundle("org.apache.geronimo.specs", "geronimo-json_1.0_spec", "1.0-alpha-1").startLevel(START_LEVEL_SYSTEM_BUNDLES),
mavenBundle("org.apache.johnzon", "johnzon-core", "1.0.0").startLevel(START_LEVEL_SYSTEM_BUNDLES),
- mavenBundle("org.apache.felix", "org.apache.felix.configadmin").version("1.8.14").startLevel(START_LEVEL_SYSTEM_BUNDLES),
+ mavenBundle("org.apache.felix", "org.apache.felix.configadmin").version("1.9.22").startLevel(START_LEVEL_SYSTEM_BUNDLES),
mavenBundle("org.apache.felix", "org.apache.felix.http.servlet-api", System.getProperty("http.servlet.api.version")).startLevel(START_LEVEL_SYSTEM_BUNDLES),
mavenBundle("org.apache.felix", ORG_APACHE_FELIX_HTTP_JETTY, System.getProperty("http.jetty.version")).startLevel(START_LEVEL_SYSTEM_BUNDLES),
mavenBundle("org.apache.felix", "org.apache.felix.http.whiteboard", "4.0.0").startLevel(START_LEVEL_SYSTEM_BUNDLES),