This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/main by this push:
new 531122d96f [KARAF-7957] Rename karaf-bom-nodeps to karaf-bom-artifacts
(#1947)
531122d96f is described below
commit 531122d96fb4b7dd66d8da28c427eebaa6cd69f4
Author: Matt Pavlovich <[email protected]>
AuthorDate: Sat Jul 19 23:38:41 2025 -0500
[KARAF-7957] Rename karaf-bom-nodeps to karaf-bom-artifacts (#1947)
* [KARAF-7957] Rename karaf-bom-nodeps to karaf-bom-artifacts
- Add transitive dep excludes for dist artifacts
* [KARAF-7950] Update itests common and example/karaf-example-itests
dependency scopes
---
bom/{nodeps => artifacts}/pom.xml | 30 +++++++++++++++++++++++++++---
bom/pom.xml | 4 ++--
examples/karaf-itest-example/pom.xml | 5 +++++
itests/common/pom.xml | 3 +++
4 files changed, 37 insertions(+), 5 deletions(-)
diff --git a/bom/nodeps/pom.xml b/bom/artifacts/pom.xml
similarity index 95%
rename from bom/nodeps/pom.xml
rename to bom/artifacts/pom.xml
index 3f09a915d7..ac7c5d1355 100644
--- a/bom/nodeps/pom.xml
+++ b/bom/artifacts/pom.xml
@@ -28,8 +28,8 @@
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>karaf-bom-nodeps</artifactId>
- <name>Apache Karaf :: BOM :: Karaf Only</name>
+ <artifactId>karaf-bom-artifacts</artifactId>
+ <name>Apache Karaf :: BOM :: Karaf Artifacts</name>
<packaging>pom</packaging>
<dependencyManagement>
@@ -40,25 +40,49 @@
<artifactId>apache-karaf</artifactId>
<type>tar.gz</type>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
<type>zip</type>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf-minimal</artifactId>
<type>tar.gz</type>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf-minimal</artifactId>
<type>zip</type>
<version>${project.version}</version>
- </dependency>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>manual</artifactId>
diff --git a/bom/pom.xml b/bom/pom.xml
index 508c613755..1d570a9d24 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -36,7 +36,7 @@
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
- <artifactId>karaf-bom-nodeps</artifactId>
+ <artifactId>karaf-bom-artifacts</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
@@ -1286,7 +1286,7 @@
</dependencyManagement>
<modules>
- <module>nodeps</module>
+ <module>artifacts</module>
</modules>
</project>
diff --git a/examples/karaf-itest-example/pom.xml
b/examples/karaf-itest-example/pom.xml
index 492babab22..584c8bc92f 100644
--- a/examples/karaf-itest-example/pom.xml
+++ b/examples/karaf-itest-example/pom.xml
@@ -52,6 +52,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${javax.annotation.version}</version>
+ </dependency>
<!-- Define the Apache Karaf version to download and use for the test
-->
<!-- We use a released version here to avoid SNAPSHOT resolution -->
<dependency>
diff --git a/itests/common/pom.xml b/itests/common/pom.xml
index 0c31b1eec9..0aabe1fbf8 100644
--- a/itests/common/pom.xml
+++ b/itests/common/pom.xml
@@ -85,14 +85,17 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.framework</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.util.tracker</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
