From: Olivier Lamy <olamy@apache.org>
Date: Fri, 5 Oct 2012 14:29:57 +0000 (+0000)
Subject: not use bundle packaging as enunciate doc is not included
X-Git-Tag: archiva-1.4-M4~827
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=33beb5e1213a37524065388e2bf454a8d96cd0ce;p=archiva.git

not use bundle packaging as enunciate doc is not included

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1394544 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
index 28802fdbc..9219e3356 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/pom.xml
@@ -17,7 +17,8 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>archiva-rest</artifactId>
@@ -25,7 +26,8 @@
     <version>1.4-M4-SNAPSHOT</version>
   </parent>
   <artifactId>archiva-rest-api</artifactId>
-  <packaging>bundle</packaging>
+  <!-- DO NOT USE bundle packaging generated documentation is not included in the jar !!! -->
+  <packaging>jar</packaging>
   <name>Archiva Web :: REST support :: Api</name>
 
   <properties>
@@ -142,7 +144,17 @@
               org.apache.archiva.maven2.model
             </Import-Package>
           </instructions>
+
         </configuration>
+        <executions>
+          <execution>
+            <id>create-manifest</id>
+            <phase>process-test-classes</phase>
+            <goals>
+              <goal>manifest</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -157,32 +169,41 @@
         </executions>
       </plugin>
 
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
+          </archive>
+        </configuration>
+      </plugin>
 
-     <plugin>
-       <groupId>org.codehaus.enunciate</groupId>
-       <artifactId>maven-enunciate-plugin</artifactId>
-       <version>${enunciate.version}</version>
-       <executions>
-         <execution>
-           <phase>process-classes</phase>
-           <goals>
-             <goal>docs</goal>
-           </goals>
-         </execution>
-       </executions>
-       <configuration>
-         <docsDir>${project.build.outputDirectory}/rest-docs-archiva-rest-api</docsDir>
-         <configFile>src/enunciate/enunciate.xml</configFile>
-         <compileDebug>${enunciate.debug}</compileDebug>
-       </configuration>
-       <dependencies>
-         <dependency>
-           <groupId>org.codehaus.enunciate</groupId>
-           <artifactId>enunciate-docs</artifactId>
-           <version>${enunciate.version}</version>
-         </dependency>
-       </dependencies>
-     </plugin>
+      <plugin>
+        <groupId>org.codehaus.enunciate</groupId>
+        <artifactId>maven-enunciate-plugin</artifactId>
+        <version>${enunciate.version}</version>
+        <executions>
+          <execution>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>docs</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <docsDir>${project.build.outputDirectory}/rest-docs-archiva-rest-api</docsDir>
+          <configFile>src/enunciate/enunciate.xml</configFile>
+          <compileDebug>${enunciate.debug}</compileDebug>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.codehaus.enunciate</groupId>
+            <artifactId>enunciate-docs</artifactId>
+            <version>${enunciate.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
 
     </plugins>
   </build>