cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r490144 - in /incubator/cayenne/main/trunk/assembly/cayenne-generic: pom.xml src/main/assembly/main.xml
Date Mon, 25 Dec 2006 12:38:46 GMT
Author: aadamchik
Date: Mon Dec 25 04:38:46 2006
New Revision: 490144

URL: http://svn.apache.org/viewvc?view=rev&rev=490144
Log:
CAY-719: Finalize Maven assembly scripts for the upcoming 3.0 milestone releases (packaging
the right modules)

Modified:
    incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml
    incubator/cayenne/main/trunk/assembly/cayenne-generic/src/main/assembly/main.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=490144&r1=490143&r2=490144
==============================================================================
--- incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml (original)
+++ incubator/cayenne/main/trunk/assembly/cayenne-generic/pom.xml Mon Dec 25 04:38:46 2006
@@ -35,20 +35,20 @@
 	<dependencies>
 
 		<dependency>
-			<groupId>org.apache.cayenne.core</groupId>
-			<artifactId>cayenne-jdk1.4</artifactId>
+			<groupId>org.apache.cayenne</groupId>
+			<artifactId>cayenne-server</artifactId>
 			<version>${version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.apache.cayenne.core</groupId>
-			<artifactId>cayenne-jdk1.5</artifactId>
+			<groupId>org.apache.cayenne</groupId>
+			<artifactId>cayenne-client</artifactId>
 			<version>${version}</version>
 		</dependency>
 
 		<dependency>
-			<groupId>org.apache.cayenne.core</groupId>
-			<artifactId>cayenne-jpa</artifactId>
+			<groupId>org.apache.cayenne</groupId>
+			<artifactId>cayenne-agent</artifactId>
 			<version>${version}</version>
 		</dependency>
 
@@ -125,75 +125,7 @@
 	<build>
 		<plugins>
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>dependency-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>copy-javadoc</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>javadoc</classifier>
-								</artifactItem>
-
-								<artifactItem>
-									<groupId>org.apache.cayenne.core</groupId>
-									<artifactId>cayenne-jdk1.5</artifactId>
-									<version>${version}</version>
-									<classifier>javadoc</classifier>
-								</artifactItem>
-
-								<artifactItem>
-									<groupId>org.apache.cayenne.core</groupId>
-									<artifactId>cayenne-jpa</artifactId>
-									<version>${version}</version>
-									<classifier>javadoc</classifier>
-								</artifactItem>
-
-							</artifactItems>
-							<outputDirectory>
-								${project.build.directory}/doc/javadoc
-							</outputDirectory>
-						</configuration>
-					</execution>
-
-					<execution>
-						<id>copy-bin</id>
-						<phase>package</phase>
-						<goals>
-							<goal>unpack</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-
-								<artifactItem>
-									<groupId>org.apache.cayenne.modeler</groupId>
-									<artifactId>cayenne-modeler</artifactId>
-									<version>${version}</version>
-								</artifactItem>
-
-							</artifactItems>
-
-							<outputDirectory>
-								${project.build.directory}/modeler
-							</outputDirectory>
-						</configuration>
-					</execution>
-
-				</executions>
-			</plugin>
-
-			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
-
 				<executions>
 					<execution>
 						<id>bin</id>

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=490144&r1=490143&r2=490144
==============================================================================
--- 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 Mon Dec
25 04:38:46 2006
@@ -37,27 +37,13 @@
 				<include>org.scopemvc:scopemvc</include>
 			</includes>
 		</dependencySet>
-	</dependencySets>
-
-	<fileSets>
-		<fileSet>
-			<directory>../cayenne-jars/target/assembly/jars</directory>
+		<dependencySet>
 			<outputDirectory>lib</outputDirectory>
-		</fileSet>
-
-		<fileSet>
-			<directory>../cayenne-jars/target/assembly/sources</directory>
-			<outputDirectory>src</outputDirectory>
-		</fileSet>
-
-		<fileSet>
-			<directory>target/doc</directory>
-			<outputDirectory>doc</outputDirectory>
-		</fileSet>
-
-		<fileSet>
-			<directory>target/modeler/bin</directory>
-			<outputDirectory>bin</outputDirectory>
-		</fileSet>
-	</fileSets>
+			<includes>
+				<include>org.apache.cayenne:cayenne-server</include>
+				<include>org.apache.cayenne:cayenne-client</include>
+				<include>org.apache.cayenne:cayenne-agent</include>
+			</includes>
+		</dependencySet>
+	</dependencySets>
 </assembly>



Mime
View raw message