You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2020/10/26 08:01:25 UTC

[karaf] branch master updated: Fix Maven reactor order

This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/master by this push:
     new 0fa8851  Fix Maven reactor order
0fa8851 is described below

commit 0fa8851e70bbda123edee9cd494bae9e47871ae3
Author: jbonofre <jb...@apache.org>
AuthorDate: Mon Oct 26 09:01:12 2020 +0100

    Fix Maven reactor order
---
 assemblies/features/standard/pom.xml | 20 ++++++++++++++++++++
 bom/pom.xml                          | 15 +++++++++++++++
 manual/pom.xml                       | 10 ++++++++++
 3 files changed, 45 insertions(+)

diff --git a/assemblies/features/standard/pom.xml b/assemblies/features/standard/pom.xml
index ada7eb3..30474fc 100644
--- a/assemblies/features/standard/pom.xml
+++ b/assemblies/features/standard/pom.xml
@@ -372,6 +372,11 @@
             <artifactId>org.apache.karaf.services.eventadmin</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.karaf</groupId>
+            <artifactId>org.apache.karaf.event</artifactId>
+            <scope>provided</scope>
+        </dependency>
 
         <!-- jasypt-encryption deps -->
         <dependency>
@@ -396,6 +401,21 @@
             <artifactId>org.apache.karaf.scr.management</artifactId>
             <scope>provided</scope>
         </dependency>
+
+        <!-- audit -->
+        <dependency>
+            <groupId>org.apache.karaf.audit</groupId>
+            <artifactId>org.apache.karaf.audit.core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- manual -->
+        <dependency>
+            <groupId>org.apache.karaf</groupId>
+            <artifactId>manual</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/bom/pom.xml b/bom/pom.xml
index b7f2ca2..18f3118 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -43,6 +43,11 @@
             <dependency>
                 <groupId>org.apache.karaf</groupId>
                 <artifactId>manual</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.karaf</groupId>
+                <artifactId>manual</artifactId>
                 <type>pdf</type>
                 <version>${project.version}</version>
             </dependency>
@@ -58,6 +63,11 @@
                 <version>${project.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.karaf.audit</groupId>
+                <artifactId>org.apache.karaf.audit.core</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.karaf</groupId>
                 <artifactId>org.apache.karaf.util</artifactId>
                 <version>${project.version}</version>
@@ -364,6 +374,11 @@
                 <version>${project.version}</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.karaf</groupId>
+                <artifactId>org.apache.karaf.event</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.karaf.services</groupId>
                 <artifactId>org.apache.karaf.services.coordinator</artifactId>
                 <version>${project.version}</version>
diff --git a/manual/pom.xml b/manual/pom.xml
index 19c004d..5e81731 100644
--- a/manual/pom.xml
+++ b/manual/pom.xml
@@ -25,6 +25,16 @@
 	<name>Apache Karaf :: Manual</name>
 	<packaging>bundle</packaging>
 
+	<dependencies>
+		<dependency>
+			<groupId>org.apache.karaf.subsystem</groupId>
+			<artifactId>org.apache.karaf.subsystem.core</artifactId>
+			<version>${project.version}</version>
+			<scope>provided</scope>
+			<optional>true</optional>
+		</dependency>
+	</dependencies>
+
 	<build>
 		<plugins>
 			<plugin>