Skip to content

KARAF-7951: modularize karaf-bom #1938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rovarga wants to merge 6 commits into
base: main
Choose a base branch
from
Open

KARAF-7951: modularize karaf-bom #1938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e62f7cb
[KARAF-7950] Use modular OSGi dependencies
rovarga Apr 23, 2025
ce03b63
[KARAF-7951] Add karaf-bom-osgi
rovarga Apr 23, 2025
82e4685
[KARAF-7951] Add karaf-bom-framework
rovarga Apr 23, 2025
ea168ef
[KARAF-7951] Add karaf-bom-standard
rovarga Apr 23, 2025
29401e7
[KARAF-7951] Add karaf-bom-enterprise
rovarga Apr 23, 2025
35f372b
Merge branch 'main' into karaf7951
rovarga Apr 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions assemblies/features/specs/src/main/feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,9 +104,9 @@

<!-- namespace -->
<feature name="namespace" version="1.0.0">
<bundle>mvn:org.osgi/org.osgi.namespace.service/1.0.0</bundle>
<bundle>mvn:org.osgi/org.osgi.namespace.implementation/1.0.0</bundle>
<bundle>mvn:org.osgi/org.osgi.namespace.extender/1.0.1</bundle>
<bundle>mvn:org.osgi/org.osgi.namespace.service/${org.osgi.namespace.service.version}</bundle>
<bundle>mvn:org.osgi/org.osgi.namespace.implementation/${org.osgi.namespace.implementation.version}</bundle>
<bundle>mvn:org.osgi/org.osgi.namespace.extender/${org.osgi.namespace.extender.version}</bundle>
</feature>

<!-- util -->
Expand Down
2 changes: 1 addition & 1 deletion audit/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.core</artifactId>
<artifactId>org.osgi.framework</artifactId>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
Expand Down
60 changes: 60 additions & 0 deletions bom/enterprise/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/xsd/maven-4.0.0.xsd">

<!--

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.
-->

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
<version>4.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>karaf-bom-standard</artifactId>
<name>Apache Karaf :: BOM :: Enterprise</name>
<packaging>pom</packaging>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf-bom-standard</artifactId>
<version>${project.version}</version>
<type>bom</type>
<scope>import</scope>
</dependency>

<!-- Modular pieces of osgi.cmpn, i.e. the pieces of OSGi Companion we support. -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.jdbc</artifactId>
<version>${org.osgi.service.jdbc.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.subsystem</artifactId>
<version>${org.osgi.service.subsystem.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>

</project>
115 changes: 115 additions & 0 deletions bom/framework/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/xsd/maven-4.0.0.xsd">

<!--

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.
-->

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
<version>4.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>karaf-bom-framework</artifactId>
<name>Apache Karaf :: BOM :: Framework</name>
<packaging>pom</packaging>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf-bom-osgi</artifactId>
<version>${project.version}</version>
<type>bom</type>
<scope>import</scope>
</dependency>

<!-- Modular pieces of osgi.cmpn, i.e. the pieces of OSGi Companion we support. -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.contract</artifactId>
<version>${org.osgi.namespace.contract.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.extender</artifactId>
<version>${org.osgi.namespace.extender.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.implementation</artifactId>
<version>${org.osgi.namespace.implementation.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.service</artifactId>
<version>${org.osgi.namespace.service.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.namespace.unresolvable</artifactId>
<version>${org.osgi.namespace.unresolvable.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.cm</artifactId>
<version>${org.osgi.service.cm.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.metatype</artifactId>
<version>${org.osgi.service.metatype.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.metatype.annotations</artifactId>
<version>${org.osgi.service.metatype.annotations.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.converter</artifactId>
<version>${org.osgi.util.converter.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.function</artifactId>
<version>${org.osgi.util.function.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.promise</artifactId>
<version>${org.osgi.util.promise.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>

</project>
129 changes: 129 additions & 0 deletions bom/osgi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/xsd/maven-4.0.0.xsd">

<!--

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.
-->

<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.karaf</groupId>
<artifactId>karaf</artifactId>
<version>4.5.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

<artifactId>karaf-bom</artifactId>
<name>Apache Karaf :: BOM :: OSGi Core</name>
<packaging>pom</packaging>

<dependencyManagement>
<dependencies>
<!-- Modular equivalent of osgi.annotation, i.e. the annotation processing of OSGi Core. -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.annotation.bundle</artifactId>
<version>${org.osgi.annotation.bundle.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.annotation.versioning</artifactId>
<version>${org.osgi.annotation.versioning.version}</version>
<scope>provided</scope>
</dependency>

<!-- Modular equivalent of osgi.core, i.e. the run-time of OSGi Core. -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.dto</artifactId>
<version>${org.osgi.dto.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.framework</artifactId>
<version>${org.osgi.framework.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.resource</artifactId>
<version>${org.osgi.resource.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.condition</artifactId>
<version>${org.osgi.service.condition.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.condpermadmin</artifactId>
<version>${org.osgi.service.condpermadmin.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.log</artifactId>
<version>${org.osgi.service.log.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<!-- Note: replaced by org.osgi.framework.wiring since at least OSGi Core Release 4 -->
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.packageadmin</artifactId>
<version>${org.osgi.service.packageadmin.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.permissionadmin</artifactId>
<version>${org.osgi.service.permissionadmin.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.resolver</artifactId>
<version>${org.osgi.service.resolver.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<!-- Note: replaced by org.osgi.framework.startlevel since at least OSGi Core Release 4 -->
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.startlevel</artifactId>
<version>${org.osgi.service.startlevel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.service.url</artifactId>
<version>${org.osgi.service.url.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.tracker</artifactId>
<version>${org.osgi.util.tracker.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>

</project>
Loading