Bump org.apache.felix:org.apache.felix.webconsole from 4.3.0 to 4.9.10 (#10)
diff --git a/bnd.bnd b/bnd.bnd
index e2688a2..e942ebc 100644
--- a/bnd.bnd
+++ b/bnd.bnd
@@ -1,4 +1 @@
Bundle-DocURL: http://sling.apache.org/site/logging.html
-Import-Package: javax.servlet; \
- javax.servlet.http;version=2.3, \
- *
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f730aad..41ab824 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,9 +41,9 @@
</scm>
<properties>
- <sling.java.version>8</sling.java.version>
+ <sling.java.version>17</sling.java.version>
<slf4j.version>1.7.21</slf4j.version>
- <pax-exam.version>4.13.3</pax-exam.version>
+ <pax-exam.version>4.14.0</pax-exam.version>
<project.build.outputTimestamp>1734083968</project.build.outputTimestamp>
<bundle.build.dir>${basedir}/target</bundle.build.dir>
@@ -67,7 +67,8 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.log</artifactId>
- <version>5.5.0</version>
+ <version>6.0.0</version>
+ <classifier>all</classifier>
<scope>provided</scope>
</dependency>
@@ -90,15 +91,14 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
- <version>4.3.0</version>
+ <version>4.9.10</version>
<scope>provided</scope>
</dependency>
<!-- servlet API for the web console plugin -->
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
+ <artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
@@ -146,13 +146,12 @@
<dependency>
<groupId>org.ops4j.pax.tinybundles</groupId>
<artifactId>tinybundles</artifactId>
- <version>2.0.0</version>
+ <version>4.0.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
- <version>1</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -195,8 +194,8 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>2.2.0</version>
+ <artifactId>org.apache.felix.http.jetty12</artifactId>
+ <version>1.1.0</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -286,7 +285,6 @@
<plugin>
<groupId>org.apache.servicemix.tooling</groupId>
<artifactId>depends-maven-plugin</artifactId>
- <version>1.2</version>
<executions>
<execution>
<id>generate-depends-file</id>
diff --git a/src/test/java/org/apache/sling/commons/log/webconsole/ITWebConsoleRemote.java b/src/test/java/org/apache/sling/commons/log/webconsole/ITWebConsoleRemote.java
index bdf2fc6..73fe1a0 100644
--- a/src/test/java/org/apache/sling/commons/log/webconsole/ITWebConsoleRemote.java
+++ b/src/test/java/org/apache/sling/commons/log/webconsole/ITWebConsoleRemote.java
@@ -36,19 +36,19 @@
import org.ops4j.pax.exam.TestContainer;
import org.ops4j.pax.exam.spi.DefaultExamSystem;
import org.ops4j.pax.exam.spi.PaxExamRuntime;
-import org.ops4j.pax.tinybundles.core.TinyBundle;
+import org.ops4j.pax.tinybundles.TinyBundle;
import org.osgi.framework.Constants;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.not;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import static org.ops4j.pax.exam.CoreOptions.composite;
import static org.ops4j.pax.exam.CoreOptions.frameworkProperty;
import static org.ops4j.pax.exam.CoreOptions.provision;
-import static org.ops4j.pax.tinybundles.core.TinyBundles.bundle;
-import static org.ops4j.pax.tinybundles.core.TinyBundles.withBnd;
+import static org.ops4j.pax.tinybundles.TinyBundles.bndBuilder;
+import static org.ops4j.pax.tinybundles.TinyBundles.bundle;
public class ITWebConsoleRemote extends LogTestBase {
@@ -76,13 +76,13 @@
private Option createWebConsoleTestBundle() {
TinyBundle bundle = bundle();
- for (Class c : WebConsoleTestActivator.BUNDLE_CLASS_NAMES) {
- bundle.add(c);
+ for (Class<?> c : WebConsoleTestActivator.BUNDLE_CLASS_NAMES) {
+ bundle.addClass(c);
}
- bundle.set(Constants.BUNDLE_SYMBOLICNAME, "org.apache.sling.common.log.testbundle")
- .set(Constants.BUNDLE_ACTIVATOR, WebConsoleTestActivator.class.getName());
- return provision(bundle.build(withBnd()));
+ bundle.setHeader(Constants.BUNDLE_SYMBOLICNAME, "org.apache.sling.common.log.testbundle")
+ .setHeader(Constants.BUNDLE_ACTIVATOR, WebConsoleTestActivator.class.getName());
+ return provision(bundle.build(bndBuilder()));
}
@Before
diff --git a/src/test/java/org/apache/sling/commons/log/webconsole/LogTestBase.java b/src/test/java/org/apache/sling/commons/log/webconsole/LogTestBase.java
index 04146e6..a3ef60e 100644
--- a/src/test/java/org/apache/sling/commons/log/webconsole/LogTestBase.java
+++ b/src/test/java/org/apache/sling/commons/log/webconsole/LogTestBase.java
@@ -89,12 +89,17 @@
repository("https://repository.apache.org/snapshots/")
.id("apache-snapshots")
.allowSnapshots(),
- mavenBundle("org.slf4j", "slf4j-api").versionAsInProject(),
mavenBundle("org.apache.sling", "org.apache.sling.commons.logservice")
.versionAsInProject(),
LogTestBase.webSupport(),
- mavenBundle("org.apache.sling", "org.apache.sling.commons.log").versionAsInProject(),
- mavenBundle("org.apache.felix", "org.apache.felix.http.jetty").versionAsInProject(),
+ mavenBundle("org.apache.sling", "org.apache.sling.commons.log")
+ .classifier("all")
+ .versionAsInProject(),
+ mavenBundle("org.osgi", "org.osgi.util.converter").version("1.0.9"),
+ mavenBundle("org.owasp.encoder", "encoder").version("1.3.1"),
+ mavenBundle("org.apache.felix", "org.apache.felix.http.servlet-api")
+ .version("6.1.0"),
+ mavenBundle("org.apache.felix", "org.apache.felix.http.jetty12").versionAsInProject(),
mavenBundle("org.apache.felix", "org.apache.felix.webconsole").versionAsInProject(),
mavenBundle("org.apache.felix", "org.apache.felix.inventory").versionAsInProject(),
mavenBundle("org.apache.felix", "org.apache.felix.metatype").versionAsInProject(),
