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 cd18133427 Update to parent pom 8 and remove intermediate http parent
pom
cd18133427 is described below
commit cd18133427fe307769a936ae748899756de677b3
Author: Carsten Ziegeler <[email protected]>
AuthorDate: Wed Nov 29 11:01:05 2023 +0100
Update to parent pom 8 and remove intermediate http parent pom
---
http/base/pom.xml | 61 +++++++++++++++--
http/bridge/pom.xml | 39 +++++++----
http/inventoryprinter/pom.xml | 31 +++++++--
http/itest/pom.xml | 20 +++++-
http/jetty/pom.xml | 59 ++++++++++++----
http/parent/pom.xml | 145 ----------------------------------------
http/pom.xml | 14 ++--
http/proxy/pom.xml | 37 +++++++++-
http/samples/whiteboard/pom.xml | 21 ++++--
http/servlet-api/pom.xml | 23 ++++++-
http/sslfilter/pom.xml | 35 ++++++++--
http/webconsoleplugin/pom.xml | 29 ++++++--
http/wrappers/pom.xml | 41 ++++++++++--
13 files changed, 340 insertions(+), 215 deletions(-)
diff --git a/http/base/pom.xml b/http/base/pom.xml
index 0b4d50617f..6dba2208d2 100644
--- a/http/base/pom.xml
+++ b/http/base/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.parent</artifactId>
- <version>13</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <artifactId>felix-parent</artifactId>
+ <version>8</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<name>Apache Felix Http Base</name>
@@ -35,13 +35,51 @@
<connection>scm:git:https://github.com/apache/felix-dev.git</connection>
<developerConnection>scm:git:https://github.com/apache/felix-dev.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=felix-dev.git</url>
- </scm>
+ </scm>
<properties>
<felix.java.version>11</felix.java.version>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>5.1.9</version>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>baseline</id>
+ <goals>
+ <goal>baseline</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <instructions>
+
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${project.version}</Bundle-Version>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
<dependencies>
+ <dependency>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
+ <version>16.0.2</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -101,6 +139,19 @@
<artifactId>org.apache.felix.http.wrappers</artifactId>
<version>1.0.0</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
+ <!-- Testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>5.7.0</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/http/bridge/pom.xml b/http/bridge/pom.xml
index c363e0ecbc..4279cd6d6f 100644
--- a/http/bridge/pom.xml
+++ b/http/bridge/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.parent</artifactId>
- <version>13</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <artifactId>felix-parent</artifactId>
+ <version>8</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<name>Apache Felix Http Bridge</name>
@@ -52,6 +52,8 @@
<extensions>true</extensions>
<configuration>
<instructions>
+
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Activator>
org.apache.felix.http.bridge.internal.BridgeActivator
</Bundle-Activator>
@@ -64,9 +66,9 @@
org.osgi.service.http.context,
org.osgi.service.http.runtime,
org.osgi.service.http.runtime.dto,
- org.osgi.service.http.whiteboard,
- org.apache.felix.http.jakartawrappers,
- org.apache.felix.http.javaxwrappers
+ org.osgi.service.http.whiteboard,
+ org.apache.felix.http.jakartawrappers,
+ org.apache.felix.http.javaxwrappers
</Export-Package>
<Private-Package>
org.apache.felix.http.base.*,
@@ -78,8 +80,8 @@
<Import-Package>
org.osgi.service.useradmin;resolution:=optional;version="[1.1,2)",
sun.misc;resolution:=optional,
- sun.nio.ch;resolution:=optional,
- *
+ sun.nio.ch;resolution:=optional,
+ *
</Import-Package>
<Provide-Capability>
osgi.implementation;osgi.implementation="osgi.http";version:Version="1.1";
@@ -97,6 +99,19 @@
</instructions>
</configuration>
<executions>
+ <execution>
+ <id>bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>baseline</id>
+ <goals>
+ <goal>baseline</goal>
+ </goals>
+ </execution>
<execution>
<id>light-bundle</id>
<goals>
@@ -169,10 +184,10 @@
<artifactId>org.apache.felix.http.base</artifactId>
<version>5.1.3-SNAPSHOT</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.wrappers</artifactId>
- <version>1.0.2</version>
- </dependency>
+ <artifactId>org.apache.felix.http.wrappers</artifactId>
+ <version>1.0.2</version>
+ </dependency>
</dependencies>
</project>
diff --git a/http/inventoryprinter/pom.xml b/http/inventoryprinter/pom.xml
index 2647d83729..8bf3abf387 100644
--- a/http/inventoryprinter/pom.xml
+++ b/http/inventoryprinter/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.parent</artifactId>
- <version>13</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <artifactId>felix-parent</artifactId>
+ <version>8</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<name>Apache Felix Http Inventory Printer</name>
@@ -43,8 +43,29 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.4</version>
+ <version>5.1.9</version>
<extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>baseline</id>
+ <goals>
+ <goal>baseline</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <instructions>
+
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${project.version}</Bundle-Version>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -53,6 +74,8 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
+ <version>6.0.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
diff --git a/http/itest/pom.xml b/http/itest/pom.xml
index c006a35fb6..bfbc78b005 100644
--- a/http/itest/pom.xml
+++ b/http/itest/pom.xml
@@ -14,9 +14,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.parent</artifactId>
- <version>13</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <artifactId>felix-parent</artifactId>
+ <version>8</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<name>Apache Felix Http Integration Tests</name>
@@ -56,6 +56,8 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
+ <version>8.0.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -140,6 +142,18 @@
<version>${pax.url.aether.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>5.7.0</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>javax.inject</groupId>
<artifactId>javax.inject</artifactId>
diff --git a/http/jetty/pom.xml b/http/jetty/pom.xml
index 2a902c5313..43d7fbf4a5 100644
--- a/http/jetty/pom.xml
+++ b/http/jetty/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.parent</artifactId>
- <version>13</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <artifactId>felix-parent</artifactId>
+ <version>8</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<name>Apache Felix Http Jetty</name>
@@ -38,7 +38,7 @@
<developerConnection>scm:git:https://github.com/apache/felix-dev.git</developerConnection>
<url>https://gitbox.apache.org/repos/asf?p=felix-dev.git</url>
<tag>HEAD</tag>
- </scm>
+ </scm>
<properties>
<felix.java.version>11</felix.java.version>
@@ -147,6 +147,8 @@
<extensions>true</extensions>
<configuration>
<instructions>
+
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${project.version}</Bundle-Version>
<X-Jetty-Version>
${jetty.version}
</X-Jetty-Version>
@@ -166,9 +168,9 @@
!org.eclipse.jetty,
!org.eclipse.jetty.version,
org.eclipse.jetty.*,
- org.apache.felix.http.jetty,
+ org.apache.felix.http.jetty,
org.apache.felix.http.jakartawrappers,
- org.apache.felix.http.javaxwrappers
+ org.apache.felix.http.javaxwrappers
</Export-Package>
<Private-Package>
org.apache.felix.http.base.*,
@@ -233,6 +235,19 @@
</instructions>
</configuration>
<executions>
+ <execution>
+ <id>bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>baseline</id>
+ <goals>
+ <goal>baseline</goal>
+ </goals>
+ </execution>
<execution>
<id>light-bundle</id>
<goals>
@@ -254,9 +269,9 @@
org.osgi.service.http.runtime.dto,
org.osgi.service.http.whiteboard,
!org.osgi.service.servlet.*,
- org.apache.felix.http.jetty,
- org.apache.felix.http.javaxwrappers,
- org.apache.felix.http.jakartawrappers
+ org.apache.felix.http.jetty,
+ org.apache.felix.http.javaxwrappers,
+ org.apache.felix.http.jakartawrappers
</Export-Package>
<Private-Package>
org.apache.felix.http.base.*,
@@ -312,10 +327,14 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
+ <version>6.0.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -414,11 +433,11 @@
<artifactId>org.apache.felix.http.base</artifactId>
<version>5.1.3-SNAPSHOT</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.wrappers</artifactId>
- <version>1.0.2</version>
- </dependency>
+ <artifactId>org.apache.felix.http.wrappers</artifactId>
+ <version>1.0.2</version>
+ </dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
@@ -429,7 +448,19 @@
<artifactId>commons-io</artifactId>
<version>2.11.0</version>
</dependency>
- <!-- Testing -->
+ <!-- Testing -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.13.2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>5.7.0</version>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.log</artifactId>
diff --git a/http/parent/pom.xml b/http/parent/pom.xml
deleted file mode 100644
index db7c4dfb7d..0000000000
--- a/http/parent/pom.xml
+++ /dev/null
@@ -1,145 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.felix</groupId>
- <artifactId>felix-parent</artifactId>
- <version>7</version>
- <relativePath>../../pom/pom.xml</relativePath>
- </parent>
-
- <name>Apache Felix Http Parent POM</name>
- <artifactId>org.apache.felix.http.parent</artifactId>
- <version>14-SNAPSHOT</version>
- <packaging>pom</packaging>
-
-
- <properties>
- <servlet.version>3.1.0</servlet.version>
- </properties>
-
- <scm>
-
<connection>scm:git:https://github.com/apache/felix-dev.git</connection>
-
<developerConnection>scm:git:https://github.com/apache/felix-dev.git</developerConnection>
- <url>https://gitbox.apache.org/repos/asf?p=felix-dev.git</url>
- <tag>HEAD</tag>
- </scm>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <version>3.5.0</version>
- <executions>
- <execution>
- <id>bundle</id>
- <phase>package</phase>
- <goals>
- <goal>bundle</goal>
- </goals>
- </execution>
- <execution>
- <id>baseline</id>
- <goals>
- <goal>baseline</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <instructions>
-
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${project.version}</Bundle-Version>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
-
- <dependencies>
- <!-- Annotations -->
- <dependency>
- <groupId>org.jetbrains</groupId>
- <artifactId>annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.annotation</artifactId>
- </dependency>
- <!-- Testing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- </dependency>
- </dependencies>
-
- <dependencyManagement>
- <dependencies>
- <!-- Annotations -->
- <dependency>
- <groupId>org.jetbrains</groupId>
- <artifactId>annotations</artifactId>
- <version>16.0.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.annotation</artifactId>
- <version>6.0.1</version>
- <scope>provided</scope>
- </dependency>
- <!-- Servlet API -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <version>${servlet.version}</version>
- <scope>provided</scope>
- </dependency>
- <!-- OSGi Core -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>osgi.core</artifactId>
- <version>6.0.0</version>
- <scope>provided</scope>
- </dependency>
- <!-- Testing -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>3.5.13</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-</project>
diff --git a/http/pom.xml b/http/pom.xml
index 6479bdce33..8684e405ff 100644
--- a/http/pom.xml
+++ b/http/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix-parent</artifactId>
- <version>7</version>
+ <version>8</version>
<relativePath>../pom/pom.xml</relativePath>
</parent>
@@ -39,16 +39,16 @@
</scm>
<modules>
- <module>servlet-api</module>
<module>base</module>
<module>bridge</module>
+ <module>inventoryprinter</module>
+ <module>itest</module>
<module>jetty</module>
- <module>parent</module>
<module>proxy</module>
- <module>itest</module>
- <module>webconsoleplugin</module>
- <module>inventoryprinter</module>
- <module>sslfilter</module>
<module>samples/whiteboard</module>
+ <module>servlet-api</module>
+ <module>sslfilter</module>
+ <module>webconsoleplugin</module>
+ <module>wrappers</module>
</modules>
</project>
diff --git a/http/proxy/pom.xml b/http/proxy/pom.xml
index ad8d461541..678c111849 100644
--- a/http/proxy/pom.xml
+++ b/http/proxy/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.parent</artifactId>
- <version>12</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <artifactId>felix-parent</artifactId>
+ <version>8</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<name>Apache Felix Http Proxy</name>
@@ -43,11 +43,40 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
+ <version>5.1.9</version>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>baseline</id>
+ <goals>
+ <goal>baseline</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <instructions>
+
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${project.version}</Bundle-Version>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
<dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <version>6.0.1</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
@@ -57,6 +86,8 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
+ <version>6.0.0</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
diff --git a/http/samples/whiteboard/pom.xml b/http/samples/whiteboard/pom.xml
index f3e8fbafbc..ef0862fca3 100644
--- a/http/samples/whiteboard/pom.xml
+++ b/http/samples/whiteboard/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.parent</artifactId>
- <version>13</version>
- <relativePath>../../parent/pom.xml</relativePath>
+ <artifactId>felix-parent</artifactId>
+ <version>8</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<name>Apache Felix Http Samples - Whiteboard</name>
@@ -43,10 +43,21 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>5.1.4</version>
+ <version>5.1.9</version>
<extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<instructions>
+
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${project.version}</Bundle-Version>
<Bundle-Activator>
org.apache.felix.http.samples.whiteboard.Activator
</Bundle-Activator>
@@ -69,6 +80,8 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
+ <version>6.0.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
diff --git a/http/servlet-api/pom.xml b/http/servlet-api/pom.xml
index 6bacf73f2f..cd0e82de8e 100644
--- a/http/servlet-api/pom.xml
+++ b/http/servlet-api/pom.xml
@@ -13,9 +13,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.parent</artifactId>
- <version>12</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <artifactId>felix-parent</artifactId>
+ <version>8</version>
+ <relativePath>../../pom/pom.xml</relativePath>
</parent>
<name>Apache Felix Servlet API</name>
@@ -61,8 +61,25 @@
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.9</version>
<extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>baseline</id>
+ <goals>
+ <goal>baseline</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<instructions>
+
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${project.version}</Bundle-Version>
<Export-Package>
javax.servlet;version=2.6;uses:="javax.servlet.annotation,javax.servlet.descriptor",
javax.servlet.annotation;version=2.6;uses:="javax.servlet",
diff --git a/http/sslfilter/pom.xml b/http/sslfilter/pom.xml
index 96b60f2fcb..84f85bb6a6 100644
--- a/http/sslfilter/pom.xml
+++ b/http/sslfilter/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.parent</artifactId>
- <version>13</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <artifactId>felix-parent</artifactId>
+ <version>8</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<name>Apache Felix Http SSL Filter</name>
@@ -48,16 +48,33 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.9</version>
- <extensions>true</extensions>
- <configuration>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>baseline</id>
+ <goals>
+ <goal>baseline</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
<instructions>
+
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${project.version}</Bundle-Version>
<Import-Package>
jakarta.servlet;version="[5.0,7)",
jakarta.servlet.http;version="[5.0,7)",
*
</Import-Package>
</instructions>
- </configuration>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -66,6 +83,8 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
+ <version>6.0.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -107,10 +126,14 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>4.13.2</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <version>5.7.0</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
diff --git a/http/webconsoleplugin/pom.xml b/http/webconsoleplugin/pom.xml
index 37c4dea634..cc24522106 100644
--- a/http/webconsoleplugin/pom.xml
+++ b/http/webconsoleplugin/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.parent</artifactId>
- <version>13</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <artifactId>felix-parent</artifactId>
+ <version>8</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<name>Apache Felix Http Webconsole Plugin</name>
@@ -49,15 +49,32 @@
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.9</version>
<extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>baseline</id>
+ <goals>
+ <goal>baseline</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<instructions>
+
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${project.version}</Bundle-Version>
<Import-Package>
jakarta.servlet;version="[5.0,7)",
jakarta.servlet.http;version="[5.0,7)",
*
- </Import-Package>
+ </Import-Package>
</instructions>
- </configuration>
+ </configuration>
</plugin>
</plugins>
</build>
@@ -66,6 +83,8 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
+ <version>6.0.0</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
diff --git a/http/wrappers/pom.xml b/http/wrappers/pom.xml
index 01a828c280..2a8800c7d0 100644
--- a/http/wrappers/pom.xml
+++ b/http/wrappers/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.parent</artifactId>
- <version>13</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <artifactId>felix-parent</artifactId>
+ <version>8</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<name>Apache Felix Http Wrappers</name>
@@ -49,11 +49,44 @@
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.9</version>
<extensions>true</extensions>
+ <executions>
+ <execution>
+ <id>bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>baseline</id>
+ <goals>
+ <goal>baseline</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <instructions>
+
<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+ <Bundle-Version>${project.version}</Bundle-Version>
+ </instructions>
+ </configuration>
</plugin>
</plugins>
</build>
<dependencies>
+ <dependency>
+ <groupId>org.jetbrains</groupId>
+ <artifactId>annotations</artifactId>
+ <version>16.0.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.annotation</artifactId>
+ <version>6.0.1</version>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
@@ -75,7 +108,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>5.5.0</version>
+ <version>5.7.0</version>
<scope>test</scope>
</dependency>
</dependencies>
