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 0a7488a55f FELIX-6792 : Adjust tests and clean up poms
0a7488a55f is described below
commit 0a7488a55f4f97ba1b7ae5dc51e4531f19aaf8c5
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Tue Aug 5 14:21:10 2025 +0200
FELIX-6792 : Adjust tests and clean up poms
---
http/bridge/pom.xml | 11 +----------
http/itest/pom.xml | 4 ++--
.../apache/felix/http/itest/BaseIntegrationTest.java | 2 ++
http/jetty/pom.xml | 11 +----------
.../felix/http/jetty/it/AbstractJettyTestSupport.java | 2 ++
http/jetty12/pom.xml | 18 +-----------------
.../felix/http/jetty/it/AbstractJettyTestSupport.java | 2 ++
7 files changed, 11 insertions(+), 39 deletions(-)
diff --git a/http/bridge/pom.xml b/http/bridge/pom.xml
index baa2fbec75..cc9496620e 100644
--- a/http/bridge/pom.xml
+++ b/http/bridge/pom.xml
@@ -29,7 +29,7 @@
<name>Apache Felix Http Bridge</name>
<description>This is an implementation of the OSGi Servlet Service, the
OSGi Http Service and the OSGi Http Whiteboard Specification used when run as a
web application</description>
<artifactId>org.apache.felix.http.bridge</artifactId>
- <version>6.0.1-SNAPSHOT</version>
+ <version>6.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<scm>
@@ -123,10 +123,6 @@
<instructions>
<Bundle-Name>${project.name}
Light</Bundle-Name>
<Bundle-SymbolicName>${project.artifactId}.light</Bundle-SymbolicName>
- <!-- We need to override this from the base
configuration -->
- <Conditional-Package>
- foo
- </Conditional-Package>
</instructions>
</configuration>
</execution>
@@ -175,11 +171,6 @@
<artifactId>commons-fileupload</artifactId>
<version>1.6.0</version>
</dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.15.0</version>
- </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.http.base</artifactId>
diff --git a/http/itest/pom.xml b/http/itest/pom.xml
index df93733d2e..bd776a4655 100644
--- a/http/itest/pom.xml
+++ b/http/itest/pom.xml
@@ -33,7 +33,7 @@
<properties>
<felix.java.version>11</felix.java.version>
<http.servlet.api.version>6.1.0</http.servlet.api.version>
- <http.jetty.version>5.1.35-SNAPSHOT</http.jetty.version>
+ <http.jetty.version>5.2.0-SNAPSHOT</http.jetty.version>
<http.jetty.id>org.apache.felix.http.jetty</http.jetty.id>
<pax.exam.version>4.13.3</pax.exam.version>
<pax.url.aether.version>2.6.14</pax.url.aether.version>
@@ -45,7 +45,7 @@
<properties>
<felix.java.version>17</felix.java.version>
<http.servlet.api.version>6.1.0</http.servlet.api.version>
- <http.jetty.version>1.0.35-SNAPSHOT</http.jetty.version>
+ <http.jetty.version>1.1.0-SNAPSHOT</http.jetty.version>
<http.jetty.id>org.apache.felix.http.jetty12</http.jetty.id>
</properties>
</profile>
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 81b518a72c..312fb62e6f 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
@@ -159,6 +159,8 @@ public abstract class BaseIntegrationTest {
// update pax logging for SLF4J 2
mavenBundle().groupId("org.ops4j.pax.logging").artifactId("pax-logging-api").version("2.3.0"),
mavenBundle("org.slf4j", "slf4j-api", "2.0.17"),
mavenBundle("org.apache.sling",
"org.apache.sling.commons.johnzon",
"1.2.16").startLevel(START_LEVEL_SYSTEM_BUNDLES),
+ mavenBundle("commons-io", "commons-io",
"2.19.0").startLevel(START_LEVEL_SYSTEM_BUNDLES),
+ mavenBundle("commons-fileupload", "commons-fileupload",
"1.6.0").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),
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 184e65d4b4..6d9547b4e4 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -30,7 +30,7 @@
<description>This is an implementation of the R8.1 OSGi Servlet Service,
the R7 OSGi Http Service and the R7 OSGi Http Whiteboard
Specification</description>
<artifactId>org.apache.felix.http.jetty</artifactId>
- <version>5.1.35-SNAPSHOT</version>
+ <version>5.2.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<scm>
@@ -267,10 +267,6 @@
<instructions>
<Bundle-Name>${project.name} Light</Bundle-Name>
<Bundle-SymbolicName>${project.artifactId}.light</Bundle-SymbolicName>
- <!-- We need to override this from the base
configuration -->
- <Conditional-Package>
- foo
- </Conditional-Package>
<Export-Package>
org.osgi.service.http,
org.osgi.service.http.context,
@@ -508,11 +504,6 @@
<artifactId>commons-fileupload</artifactId>
<version>1.6.0</version>
</dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.19.0</version>
- </dependency>
<!-- Testing -->
<dependency>
<groupId>junit</groupId>
diff --git
a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
index 54f3210d56..8ee177e806 100644
---
a/http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
+++
b/http/jetty/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
@@ -76,6 +76,8 @@ public abstract class AbstractJettyTestSupport {
// update pax logging for SLF4J 2
mavenBundle().groupId("org.ops4j.pax.logging").artifactId("pax-logging-api").version("2.3.0"),
optionalRemoteDebug(),
+
mavenBundle().groupId("commons-fileupload").artifactId("commons-fileupload").version("1.6.0"),
+
mavenBundle().groupId("commons-io").artifactId("commons-io").version("2.19.0"),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.servlet-api").version("6.1.0"),
testBundle("bundle.filename"),
junitBundles(),
diff --git a/http/jetty12/pom.xml b/http/jetty12/pom.xml
index 46dd227046..e8ce9fee59 100644
--- a/http/jetty12/pom.xml
+++ b/http/jetty12/pom.xml
@@ -30,7 +30,7 @@
<description>This is an implementation of the R8.1 OSGi Servlet Service,
the R7 OSGi Http Service and the R7 OSGi Http Whiteboard
Specification</description>
<artifactId>org.apache.felix.http.jetty12</artifactId>
- <version>1.0.37-SNAPSHOT</version>
+ <version>1.1.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<scm>
@@ -271,10 +271,6 @@
<instructions>
<Bundle-Name>${project.name} Light</Bundle-Name>
<Bundle-SymbolicName>${project.artifactId}.light</Bundle-SymbolicName>
- <!-- We need to override this from the base
configuration -->
- <Conditional-Package>
- foo
- </Conditional-Package>
<Export-Package>
org.osgi.service.http,
org.osgi.service.http.context,
@@ -382,9 +378,6 @@
org.apache.felix.http.jetty.*,
org.eclipse.jetty.version
</Private-Package>
- <Conditional-Package>
- org.apache.commons.*
- </Conditional-Package>
<Import-Package>
org.eclipse.jetty.client;resolution:=optional,
sun.misc;resolution:=optional,
@@ -489,9 +482,6 @@
org.apache.felix.http.jetty.*,
org.eclipse.jetty.version
</Private-Package>
- <Conditional-Package>
- org.apache.commons.*
- </Conditional-Package>
<Import-Package>
org.eclipse.jetty.client;resolution:=optional,
sun.misc;resolution:=optional,
@@ -735,12 +725,6 @@
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.6.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.19.0</version>
</dependency>
<!-- Testing -->
<dependency>
diff --git
a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
index 3488b97dcb..07a3bbd272 100644
---
a/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
+++
b/http/jetty12/src/test/java/org/apache/felix/http/jetty/it/AbstractJettyTestSupport.java
@@ -76,6 +76,8 @@ public abstract class AbstractJettyTestSupport {
// update pax logging for SLF4J 2
mavenBundle().groupId("org.ops4j.pax.logging").artifactId("pax-logging-api").version("2.3.0"),
optionalRemoteDebug(),
+
mavenBundle().groupId("commons-fileupload").artifactId("commons-fileupload").version("1.6.0"),
+
mavenBundle().groupId("commons-io").artifactId("commons-io").version("2.19.0"),
mavenBundle().groupId("org.apache.felix").artifactId("org.apache.felix.http.servlet-api").version("6.1.0"),
testBundle("bundle.filename"),
junitBundles(),
