cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r700432 - in /cayenne/main/trunk/framework: cayenne-client/pom.xml cayenne-server/pom.xml pom.xml
Date Tue, 30 Sep 2008 12:32:28 GMT
Author: aadamchik
Date: Tue Sep 30 05:32:27 2008
New Revision: 700432

URL: http://svn.apache.org/viewvc?rev=700432&view=rev
Log:
profile driven build

Modified:
    cayenne/main/trunk/framework/cayenne-client/pom.xml
    cayenne/main/trunk/framework/cayenne-server/pom.xml
    cayenne/main/trunk/framework/pom.xml

Modified: cayenne/main/trunk/framework/cayenne-client/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-client/pom.xml?rev=700432&r1=700431&r2=700432&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-client/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-client/pom.xml Tue Sep 30 05:32:27 2008
@@ -17,23 +17,18 @@
 	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"
+<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>
 		<groupId>org.apache.cayenne</groupId>
 		<artifactId>cayenne-parent</artifactId>
 		<version>3.0-SNAPSHOT</version>
 	</parent>
-
 	<artifactId>cayenne-client</artifactId>
 	<packaging>jar</packaging>
 	<name>Cayenne Aggregated Client Jar</name>
 	<description>An aggregation of 1.5 module into an ROP client jar.</description>
-
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.cayenne.unpublished</groupId>
@@ -41,31 +36,26 @@
 			<version>${version}</version>
 			<scope>provided</scope>
 		</dependency>
-		
 		<dependency>
 			<groupId>org.apache.cayenne.unpublished</groupId>
 			<artifactId>cayenne-legal-unpublished</artifactId>
 			<version>${version}</version>
 			<scope>provided</scope>
 		</dependency>
-		
 		<dependency>
 			<groupId>commons-collections</groupId>
 			<artifactId>commons-collections</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
 		</dependency>
-		
 		<dependency>
 			<groupId>com.caucho</groupId>
 			<artifactId>resin-hessian</artifactId>
 			<scope>compile</scope>
 		</dependency>
 	</dependencies>
-
 	<build>
 		<plugins>
 			<plugin>
@@ -99,4 +89,58 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+	<profiles>
+		<profile>
+			<id>java6</id>
+			<activation>
+				<jdk>1.6</jdk>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.apache.cayenne.unpublished</groupId>
+					<artifactId>cayenne-jdk1.6-unpublished</artifactId>
+					<version>${version}</version>
+					<scope>provided</scope>
+				</dependency>
+			</dependencies>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.cayenne.build-tools</groupId>
+						<artifactId>maven-cayenne-build-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>aggregate-all</id>
+								<phase>package</phase>
+								<goals>
+									<goal>aggregate-bin</goal>
+									<goal>aggregate-sources</goal>
+								</goals>
+								<configuration>
+									<excludesFile>src/main/aggregator/excludes.txt</excludesFile>
+									<artifactItems>
+										<artifactItem>
+											<groupId>org.apache.cayenne.unpublished</groupId>
+											<artifactId>cayenne-jdk1.5-unpublished</artifactId>
+											<version>${version}</version>
+										</artifactItem>
+										<artifactItem>
+											<groupId>org.apache.cayenne.unpublished</groupId>
+											<artifactId>cayenne-jdk1.6-unpublished</artifactId>
+											<version>${version}</version>
+										</artifactItem>
+										<artifactItem>
+											<groupId>org.apache.cayenne.unpublished</groupId>
+											<artifactId>cayenne-legal-unpublished</artifactId>
+											<version>${version}</version>
+										</artifactItem>
+									</artifactItems>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>
\ No newline at end of file

Modified: cayenne/main/trunk/framework/cayenne-server/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-server/pom.xml?rev=700432&r1=700431&r2=700432&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-server/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-server/pom.xml Tue Sep 30 05:32:27 2008
@@ -17,83 +17,66 @@
 	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"
+<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>
 		<groupId>org.apache.cayenne</groupId>
 		<artifactId>cayenne-parent</artifactId>
 		<version>3.0-SNAPSHOT</version>
 	</parent>
-
 	<artifactId>cayenne-server</artifactId>
 	<packaging>jar</packaging>
 	<name>Cayenne Aggregated Server Jar</name>
 	<description>An aggregation of 1.5 and JPA modules.</description>
-
 	<dependencies>
-
 		<dependency>
 			<groupId>org.apache.cayenne.unpublished</groupId>
 			<artifactId>cayenne-jdk1.5-unpublished</artifactId>
 			<version>${version}</version>
 			<scope>provided</scope>
 		</dependency>
-
 		<dependency>
 			<groupId>org.apache.cayenne.unpublished</groupId>
 			<artifactId>cayenne-jpa-unpublished</artifactId>
 			<version>${version}</version>
 			<scope>provided</scope>
 		</dependency>
-		
 		<dependency>
 			<groupId>org.apache.cayenne.unpublished</groupId>
 			<artifactId>cayenne-legal-unpublished</artifactId>
 			<version>${version}</version>
 			<scope>provided</scope>
 		</dependency>
-		
 		<dependency>
 			<groupId>asm</groupId>
 			<artifactId>asm</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>asm</groupId>
 			<artifactId>asm-commons</artifactId>
 		</dependency>
-		
 		<dependency>
 			<groupId>org.apache.geronimo.specs</groupId>
 			<artifactId>geronimo-jpa_3.0_spec</artifactId>
 		</dependency>
-                
 		<dependency>
 			<groupId>commons-collections</groupId>
 			<artifactId>commons-collections</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
 		</dependency>
-		
 		<dependency>
 			<groupId>velocity</groupId>
 			<artifactId>velocity</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.objectstyle.ashwood</groupId>
 			<artifactId>ashwood</artifactId>
 		</dependency>
-
 	</dependencies>
-
 	<build>
 		<plugins>
 			<plugin>
@@ -131,4 +114,62 @@
 			</plugin>
 		</plugins>
 	</build>
-</project>
+	<profiles>
+		<profile>
+			<id>java6</id>
+			<activation>
+				<jdk>1.6</jdk>
+			</activation>
+			<dependencies>
+				<dependency>
+					<groupId>org.apache.cayenne.unpublished</groupId>
+					<artifactId>cayenne-jdk1.6-unpublished</artifactId>
+					<version>${version}</version>
+					<scope>provided</scope>
+				</dependency>
+			</dependencies>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.cayenne.build-tools</groupId>
+						<artifactId>maven-cayenne-build-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>aggregate-all</id>
+								<phase>package</phase>
+								<goals>
+									<goal>aggregate-bin</goal>
+									<goal>aggregate-sources</goal>
+								</goals>
+								<configuration>
+									<artifactItems>
+										<artifactItem>
+											<groupId>org.apache.cayenne.unpublished</groupId>
+											<artifactId>cayenne-jdk1.5-unpublished</artifactId>
+											<version>${version}</version>
+										</artifactItem>
+										<artifactItem>
+											<groupId>org.apache.cayenne.unpublished</groupId>
+											<artifactId>cayenne-jdk1.6-unpublished</artifactId>
+											<version>${version}</version>
+										</artifactItem>
+										<artifactItem>
+											<groupId>org.apache.cayenne.unpublished</groupId>
+											<artifactId>cayenne-jpa-unpublished</artifactId>
+											<version>${version}</version>
+										</artifactItem>
+										<artifactItem>
+											<groupId>org.apache.cayenne.unpublished</groupId>
+											<artifactId>cayenne-legal-unpublished</artifactId>
+											<version>${version}</version>
+										</artifactItem>
+									</artifactItems>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+</project>
\ No newline at end of file

Modified: cayenne/main/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/pom.xml?rev=700432&r1=700431&r2=700432&view=diff
==============================================================================
--- cayenne/main/trunk/framework/pom.xml (original)
+++ cayenne/main/trunk/framework/pom.xml Tue Sep 30 05:32:27 2008
@@ -17,29 +17,24 @@
 	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"
+<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>
 		<groupId>org.apache.cayenne</groupId>
 		<artifactId>cayenne-parent</artifactId>
 		<version>3.0-SNAPSHOT</version>
 	</parent>
-
 	<groupId>org.apache.cayenne.parents</groupId>
 	<artifactId>cayenne-framework-parent</artifactId>
 	<name>Cayenne Framework Aggregator Project</name>
 	<packaging>pom</packaging>
-
-        <profiles>
-                <profile>
-                        <id>generic</id>
-                        <activation>
-                                <activeByDefault>true</activeByDefault>
-                        </activation>
+	<profiles>
+		<profile>
+			<id>generic</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
 			<modules>
 				<module>cayenne-legal-unpublished</module>
 				<module>cayenne-jdk1.5-unpublished</module>
@@ -50,22 +45,29 @@
 				<module>cayenne-modeler</module>
 				<module>maven-cayenne-plugin</module>
 			</modules>
-                </profile>
-                <profile>
-                        <id>java6</id>
-                        <activation>
+		</profile>
+		<profile>
+			<id>java6</id>
+			<activation>
 				<jdk>1.6</jdk>
-                        </activation>
-                        <modules>
+			</activation>
+			<modules>
+				<module>cayenne-legal-unpublished</module>
+				<module>cayenne-jdk1.5-unpublished</module>
 				<module>cayenne-jdk1.6-unpublished</module>
-                        </modules>
-                </profile>
-                <profile>
-                        <id>windows</id>
-                        <modules>
-                                <module>cayenne-modeler-win</module>
-                        </modules>
-                </profile>
-        </profiles>
-
-</project>
+				<module>cayenne-jpa-unpublished</module>
+				<module>cayenne-agent</module>
+				<module>cayenne-server</module>
+				<module>cayenne-client</module>
+				<module>cayenne-modeler</module>
+				<module>maven-cayenne-plugin</module>
+			</modules>
+		</profile>
+		<profile>
+			<id>windows</id>
+			<modules>
+				<module>cayenne-modeler-win</module>
+			</modules>
+		</profile>
+	</profiles>
+</project>
\ No newline at end of file



Mime
View raw message