Author: aadamchik
Date: Sun Dec 24 14:46:56 2006
New Revision: 490080

URL: http://svn.apache.org/viewvc?view=rev&rev=490080
Log:
configuring pom to use the new Cayenne build-maven-plugin

Modified:
    incubator/cayenne/main/trunk/assembly/cayenne-jars/pom.xml

Modified: incubator/cayenne/main/trunk/assembly/cayenne-jars/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-jars/pom.xml?view=diff&rev=490080&r1=490079&r2=490080
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-jars/pom.xml (original)
+++ incubator/cayenne/main/trunk/assembly/cayenne-jars/pom.xml Sun Dec 24 
14:46:56 2006
@@ -27,7 +27,7 @@
        </parent>
 
        <artifactId>cayenne-jars</artifactId>
-       <packaging>pom</packaging>
+       <packaging>jar</packaging>
        <name>Cayenne :: Jars Assembly</name>
 
        <description>An assembly of Cayenne jar files.</description>
@@ -62,72 +62,35 @@
        <build>
                <plugins>
                        <plugin>
-                               <artifactId>maven-assembly-plugin</artifactId>
+                               
<groupId>org.apache.cayenne.maven.plugin</groupId>
+                               <artifactId>build-maven-plugin</artifactId>
                                <executions>
                                        <execution>
-                                               <id>bin</id>
+                                               <id>aggregate-all</id>
                                                <phase>package</phase>
                                                <goals>
-                                                       <goal>attached</goal>
-                                               </goals>
-                                               <configuration>
-                                                       
<finalName>cayenne</finalName>
-                                                       <outputDirectory>
-                                                               
${project.build.directory}/assembly/jars
-                                                       </outputDirectory>
-                                                       <descriptors>
-                                                               
<descriptor>${pom.basedir}/src/main/assembly/agent.xml</descriptor>
-                                                               
<descriptor>${pom.basedir}/src/main/assembly/client.xml</descriptor>
-                                                               
<descriptor>${pom.basedir}/src/main/assembly/server.xml</descriptor>
-                                                               <descriptor>
-                                                                       
${pom.basedir}/src/main/assembly/server-deps.xml
-                                                               </descriptor>
-                                                       </descriptors>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>dependency-maven-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>unpack-sources</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>unpack</goal>
+                                                       
<goal>aggregate-bin</goal>
+                                                       
<goal>aggregate-sources</goal>
+                                                       
<goal>aggregate-javadocs</goal>
                                                </goals>
                                                <configuration>
                                                        <artifactItems>
                                                                <artifactItem>
                                                                        
<groupId>org.apache.cayenne.core</groupId>
                                                                        
<artifactId>cayenne-jdk1.4</artifactId>
-                                                                       
<classifier>sources</classifier>
                                                                        
<version>${version}</version>
                                                                </artifactItem>
                                                                <artifactItem>
                                                                        
<groupId>org.apache.cayenne.core</groupId>
                                                                        
<artifactId>cayenne-jdk1.5</artifactId>
-                                                                       
<classifier>sources</classifier>
                                                                        
<version>${version}</version>
                                                                </artifactItem>
                                                                <artifactItem>
                                                                        
<groupId>org.apache.cayenne.core</groupId>
                                                                        
<artifactId>cayenne-jpa</artifactId>
-                                                                       
<classifier>sources</classifier>
-                                                                       
<version>${version}</version>
-                                                               </artifactItem>
-                                                               <artifactItem>
-                                                                       
<groupId>org.apache.cayenne.core</groupId>
-                                                                       
<artifactId>cayenne-agent</artifactId>
-                                                                       
<classifier>sources</classifier>
                                                                        
<version>${version}</version>
                                                                </artifactItem>
                                                        </artifactItems>
-                                                       <outputDirectory>
-                                                               
${project.build.directory}/assembly/sources
-                                                       </outputDirectory>
                                                </configuration>
                                        </execution>
                                </executions>


Reply via email to