Author: aadamchik Date: Sun Dec 17 10:18:01 2006 New Revision: 488019 URL: http://svn.apache.org/viewvc?view=rev&rev=488019 Log: CAY-719: Finalize Maven assembly scripts for the upcoming 3.0 milestone releases (adding unpacked sources to the assembly)
Modified:
incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml
incubator/cayenne/main/trunk/assembly/cayenne-jars/pom.xml
Modified: incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml?view=diff&rev=488019&r1=488018&r2=488019
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml (original)
+++ incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml Sun Dec 17
10:18:01 2006
@@ -166,41 +166,6 @@
</execution>
<execution>
- <id>copy-source</id>
- <phase>package</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
-
- <artifactItem>
-
<groupId>org.apache.cayenne.core</groupId>
-
<artifactId>cayenne-jdk1.4</artifactId>
-
<version>${version}</version>
-
<classifier>sources</classifier>
- </artifactItem>
-
- <artifactItem>
-
<groupId>org.apache.cayenne.core</groupId>
-
<artifactId>cayenne-jdk1.5</artifactId>
-
<version>${version}</version>
-
<classifier>sources</classifier>
- </artifactItem>
-
- <artifactItem>
-
<groupId>org.apache.cayenne.core</groupId>
-
<artifactId>cayenne-jpa</artifactId>
-
<version>${version}</version>
-
<classifier>sources</classifier>
- </artifactItem>
-
- </artifactItems>
-
<outputDirectory>${project.build.directory}/src</outputDirectory>
- </configuration>
- </execution>
-
- <execution>
<id>copy-bin</id>
<phase>package</phase>
<goals>
Modified:
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml?view=diff&rev=488019&r1=488018&r2=488019
==============================================================================
---
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml
(original)
+++
incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.xml
Sun Dec 17 10:18:01 2006
@@ -41,18 +41,18 @@
<fileSets>
<fileSet>
-
<directory>../cayenne-jars/target/assembly/out</directory>
+
<directory>../cayenne-jars/target/assembly/jars</directory>
<outputDirectory>lib</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/doc</directory>
- <outputDirectory>doc</outputDirectory>
+
<directory>../cayenne-jars/target/assembly/sources</directory>
+ <outputDirectory>src</outputDirectory>
</fileSet>
<fileSet>
- <directory>target/src</directory>
- <outputDirectory>src</outputDirectory>
+ <directory>target/doc</directory>
+ <outputDirectory>doc</outputDirectory>
</fileSet>
<fileSet>
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=488019&r1=488018&r2=488019
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-jars/pom.xml (original)
+++ incubator/cayenne/main/trunk/assembly/cayenne-jars/pom.xml Sun Dec 17
10:18:01 2006
@@ -73,7 +73,7 @@
<configuration>
<finalName>cayenne</finalName>
<outputDirectory>
-
${project.build.directory}/assembly/out
+
${project.build.directory}/assembly/jars
</outputDirectory>
<descriptors>
<descriptor>${pom.basedir}/src/main/assembly/agent.xml</descriptor>
@@ -83,6 +83,51 @@
${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>
+ </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>
