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-5651) Add a feature for the cellar manual
Date Sun, 04 Mar 2018 05:38:00 GMT

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

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

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

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 c546c32d..1c6ecf81 100644
--- a/assembly/src/main/resources/features.xml
+++ b/assembly/src/main/resources/features.xml
@@ -167,4 +167,9 @@
         </conditional>
     </feature>
 
+    <feature name="cellar-documentation" description="Documentation of Karaf Cellar sub-project
in HTML" version="${project.version}">
+        <feature>war</feature>
+        <bundle>mvn:org.apache.karaf.cellar/manual/${project.version}</bundle>
+    </feature>
+
 </features>
diff --git a/manual/pom.xml b/manual/pom.xml
index 62a03131..e3aca6ea 100644
--- a/manual/pom.xml
+++ b/manual/pom.xml
@@ -24,14 +24,14 @@
     <parent>
         <groupId>org.apache.karaf</groupId>
         <artifactId>cellar</artifactId>
-        <version>4.1.1-SNAPSHOT</version>
+        <version>4.1.2-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.karaf.cellar</groupId>
     <artifactId>manual</artifactId>
     <name>Apache Karaf :: Cellar :: Manual</name>
-    <packaging>pom</packaging>
+    <packaging>bundle</packaging>
 
     <build>
         <plugins>
@@ -73,6 +73,18 @@
                     <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-cellar</Web-ContextPath>
+                        <Private-Package>*</Private-Package>
+                        <Include-Resource>target/generated-docs</Include-Resource>
+                    </instructions>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
diff --git a/pom.xml b/pom.xml
index 99ff829f..9770ea14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,6 +72,7 @@
         <module>dns</module>
         <module>etcd</module>
         <module>webconsole</module>
+        <module>manual</module>
         <module>assembly</module>
         <module>samples</module>
         <module>itests</module>
@@ -403,7 +404,7 @@
                         <useReleaseProfile>false</useReleaseProfile>
                         <preparationGoals>clean install</preparationGoals>
                         <goals>deploy</goals>
-                        <arguments>-Prelease,deploy,manual</arguments>
+                        <arguments>-Prelease,deploy</arguments>
                         <autoVersionSubmodules>true</autoVersionSubmodules>
                     </configuration>
                 </plugin>
@@ -577,17 +578,8 @@
     </build>
 
     <profiles>
-        <profile>
-            <id>manual</id>
-            <modules>
-                <module>manual</module>
-            </modules>
-        </profile>
         <profile>
             <id>release</id>
-            <modules>
-                <module>manual</module>
-            </modules>
             <build>
                 <plugins>
                     <plugin>


 

----------------------------------------------------------------
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 cellar manual
> -----------------------------------
>
>                 Key: KARAF-5651
>                 URL: https://issues.apache.org/jira/browse/KARAF-5651
>             Project: Karaf
>          Issue Type: Improvement
>          Components: cellar-documentation
>    Affects Versions: cellar-4.1.1
>            Reporter: Francois Papon
>            Priority: Minor
>             Fix For: cellar-4.1.2
>
>
> 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