servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r722843 - /servicemix/components/components-pom/trunk/pom.xml
Date Wed, 03 Dec 2008 11:49:19 GMT
Author: gnodet
Date: Wed Dec  3 03:49:19 2008
New Revision: 722843

URL: http://svn.apache.org/viewvc?rev=722843&view=rev
Log:
SM-1716: components jars should not include the jbi descriptor

Modified:
    servicemix/components/components-pom/trunk/pom.xml

Modified: servicemix/components/components-pom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/components-pom/trunk/pom.xml?rev=722843&r1=722842&r2=722843&view=diff
==============================================================================
--- servicemix/components/components-pom/trunk/pom.xml (original)
+++ servicemix/components/components-pom/trunk/pom.xml Wed Dec  3 03:49:19 2008
@@ -319,8 +319,11 @@
         <plugin>
           <groupId>org.apache.servicemix.tooling</groupId>
           <artifactId>jbi-maven-plugin</artifactId>
-          <version>3.2.2</version>
+          <version>4.0</version>
           <extensions>true</extensions>
+          <configuration>
+             <generatedDescriptorLocation>${project.build.directory}/jbi</generatedDescriptorLocation>
+          </configuration>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -381,7 +384,7 @@
         <executions>
           <execution>
             <id>copy-legal</id>
-            <phase>generate-resources</phase>
+            <phase>generate-sources</phase>
             <goals>
               <goal>copy</goal>
             </goals>
@@ -419,13 +422,14 @@
           </dependency>
         </dependencies>
         <executions>
-          <!-- First execution for standard (jar) packaging -->
           <execution>
             <id>std-packaging</id>
+            <phase>generate-sources</phase>
             <goals>
               <goal>process</goal>
             </goals>
             <configuration>
+              <outputDirectory>${project.build.directory}/maven-shared-archive-resources</outputDirectory>
               <resourceBundles>
                 <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
               </resourceBundles>
@@ -439,26 +443,25 @@
               </properties>
             </configuration>
           </execution>
-          <!-- Second execution for JBI packaging -->
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <version>1.3</version>
+        <executions>
           <execution>
-            <id>jbi-packaging</id>
-            <goals>
-              <goal>process</goal>
-            </goals>
+            <phase>generate-resources</phase>
             <configuration>
-              <outputDirectory>${project.build.directory}/${project.artifactId}-${project.version}-installer</outputDirectory>
-              <resourceBundles>
-                <resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
-              </resourceBundles>
-              <supplementalModels>
-                <supplementalModel>target/legal/legal.xml</supplementalModel>
-              </supplementalModels>
-              <properties>
-                <addLicense>true</addLicense>
-                <addArtifact>true</addArtifact>
-                <projectName>Apache ServiceMix</projectName>
-              </properties>
+              <tasks>
+                <copy todir="${project.build.directory}/${project.artifactId}-${project.version}-installer">
+                  <fileset dir="${project.build.directory}/maven-shared-archive-resources"
/>
+                </copy>
+              </tasks>
             </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
           </execution>
         </executions>
       </plugin>



Mime
View raw message