karaf-issues mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "ASF GitHub Bot (JIRA)" <j...@apache.org>
Subject [jira] [Commented] (KARAF-5652) Add a feature for the cave manual
Date Sun, 04 Mar 2018 06:51:00 GMT

    [ https://issues.apache.org/jira/browse/KARAF-5652?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16384995#comment-16384995
] 

ASF GitHub Bot commented on KARAF-5652:
---------------------------------------

jbonofre closed pull request #8: [KARAF-5652] Add a feature for the cave manual
URL: https://github.com/apache/karaf-cave/pull/8
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/assembly/src/main/resources/features.xml b/assembly/src/main/resources/features.xml
index e40a2dc..a4d2b88 100644
--- a/assembly/src/main/resources/features.xml
+++ b/assembly/src/main/resources/features.xml
@@ -109,4 +109,10 @@
         </conditional>
     </feature>
 
+    <feature name="cave-documentation" description="Documentation of Karaf Cave sub-project
in HTML" version="${project.version}">
+        <feature>war</feature>
+        <bundle>mvn:org.apache.karaf.cave/manual/${project.version}</bundle>
+    </feature>
+
+
 </features>
\ No newline at end of file
diff --git a/manual/pom.xml b/manual/pom.xml
index 0d296f3..d4b08ce 100644
--- a/manual/pom.xml
+++ b/manual/pom.xml
@@ -31,7 +31,7 @@
     <groupId>org.apache.karaf.cave</groupId>
     <artifactId>manual</artifactId>
     <name>Apache Karaf :: Cave :: Manual</name>
-    <packaging>pom</packaging>
+    <packaging>bundle</packaging>
 
     <build>
         <plugins>
@@ -73,6 +73,21 @@
                     <content>${project.build.directory}/generated-docs</content>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>3.3.0</version>
+                <configuration>
+                    <instructions>
+                        <Web-ContextPath>/documentation-cave</Web-ContextPath>
+                        <Private-Package>*</Private-Package>
+                        <Import-Package>
+                            org.slf4j;resolution:=optional
+                        </Import-Package>
+                        <Include-Resource>target/generated-docs</Include-Resource>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/pom.xml b/pom.xml
index ed8063a..d54fcb1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,6 +55,7 @@
         <module>server</module>
         <!-- <module>client</module> -->
         <module>deployer</module>
+        <module>manual</module>
         <module>assembly</module>
     </modules>
 
@@ -314,19 +315,13 @@
                     <releaseProfiles>release,deploy</releaseProfiles>
                     <preparationGoals>clean install</preparationGoals>
                     <goals>deploy</goals>
-                    <arguments>-Prelease,manual,deploy</arguments>
+                    <arguments>-Prelease,deploy</arguments>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
     <profiles>
-        <profile>
-            <id>manual</id>
-            <modules>
-                <module>manual</module>
-            </modules>
-        </profile>
         <profile>
             <id>release</id>
             <modules>


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


> Add a feature for the cave manual
> ---------------------------------
>
>                 Key: KARAF-5652
>                 URL: https://issues.apache.org/jira/browse/KARAF-5652
>             Project: Karaf
>          Issue Type: Improvement
>          Components: cave-documentation
>    Affects Versions: cave-4.1.0
>            Reporter: Francois Papon
>            Priority: Minor
>             Fix For: cave-4.1.1
>
>
> Adding a documentation feature in order to published the generated manual in html with
the http service.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

Mime
View raw message