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-5653) Add a feature for the decanter manual
Date Mon, 05 Mar 2018 20:45:00 GMT

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

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

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

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/feature/feature.xml b/assembly/src/main/feature/feature.xml
index a440b21..3cada8b 100644
--- a/assembly/src/main/feature/feature.xml
+++ b/assembly/src/main/feature/feature.xml
@@ -430,6 +430,11 @@
         <configfile finalname="/etc/org.apache.karaf.decanter.alerting.camel.cfg">mvn:org.apache.karaf.decanter.alerting/org.apache.karaf.decanter.alerting.camel/${project.version}/cfg</configfile>
     </feature>
 
+    <feature name="decanter-documentation" description="Documentation of Karaf Decanter
sub-project in HTML" version="${project.version}">
+        <feature>war</feature>
+        <bundle>mvn:org.apache.karaf.decanter/manual/${project.version}</bundle>
+    </feature>
+
     <feature name="elasticsearch" version="${elasticsearch1.version}" description="Embedded
Elasticsearch 1.x node">
         <feature>scr</feature>
         <feature prerequisite="true">war</feature>
diff --git a/manual/pom.xml b/manual/pom.xml
index d374eba..a9a1a6a 100644
--- a/manual/pom.xml
+++ b/manual/pom.xml
@@ -24,13 +24,13 @@
     <parent>
         <groupId>org.apache.karaf</groupId>
         <artifactId>decanter</artifactId>
-        <version>2.0.0-SNAPSHOT</version>
+        <version>2.1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.karaf.decanter</groupId>
     <artifactId>manual</artifactId>
-    <packaging>pom</packaging>
+    <packaging>bundle</packaging>
     <name>Apache Karaf :: Decanter :: Manual</name>
 
     <build>
@@ -73,6 +73,21 @@
                     <content>${project.build.directory}/generated-docs</content>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <inherited>true</inherited>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Web-ContextPath>/documentation-decanter</Web-ContextPath>
+                        <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 e499b08..b6398b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,6 +72,7 @@
         <module>backend</module>
         <module>spring-boot-starter-decanter</module>
         <module>tools-jar-wrapper</module>
+        <module>manual</module>
         <module>assembly</module>
     </modules>
 
@@ -176,7 +177,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>
@@ -396,9 +397,7 @@
     <profiles>
         <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 decanter manual
> -------------------------------------
>
>                 Key: KARAF-5653
>                 URL: https://issues.apache.org/jira/browse/KARAF-5653
>             Project: Karaf
>          Issue Type: Improvement
>          Components: decanter
>    Affects Versions: decanter-2.0.0
>            Reporter: Francois Papon
>            Priority: Minor
>             Fix For: decanter-2.1.0
>
>
> 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