Author: aadamchik
Date: Sun Dec 17 07:09:52 2006
New Revision: 487992

URL: http://svn.apache.org/viewvc?view=rev&rev=487992
Log:
CAY-719: Finalize Maven assembly scripts for the upcoming 3.0 milestone 
releases (removing profile activation - we may always want to build generic 
assembly as default, and active OS profiles manually)

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

Modified: incubator/cayenne/main/trunk/assembly/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/pom.xml?view=diff&rev=487992&r1=487991&r2=487992
==============================================================================
--- incubator/cayenne/main/trunk/assembly/pom.xml (original)
+++ incubator/cayenne/main/trunk/assembly/pom.xml Sun Dec 17 07:09:52 2006
@@ -1,73 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-    Copyright 2006 The Apache Software Foundation
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
+       Copyright 2006 The Apache Software Foundation
+       
+       Licensed under the Apache License, Version 2.0 (the "License");
+       you may not use this file except in compliance with the License.
+       You may obtain a copy of the License at
+       
+       http://www.apache.org/licenses/LICENSE-2.0
+       
+       Unless required by applicable law or agreed to in writing, software
+       distributed under the License is distributed on an "AS IS" BASIS,
+       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+       See the License for the 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";
-        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-incubating-SNAPSHOT</version>
-  </parent>
-
-  <groupId>org.apache.cayenne.assembly</groupId>
-  <artifactId>cayenne-assembly-parent</artifactId>
-  <packaging>pom</packaging>
-  <name>Cayenne :: Assembly</name>
-
-  <!-- Build the generic distribution in all cases. -->
-  <modules>
-    <module>cayenne-generic</module>
-  </modules>
-  
-  <!-- Set up the OS-specific distributions. -->
-  <profiles>
-  
-    <!-- Only build the Mac distribution if running on a Mac. -->
-    <profile>
-      <id>mac</id>
-      
-      <activation>
-        <os>
-         <family>mac</family>
-       </os>
-      </activation>
-      
-      <modules>
-        <module>cayenne-osx</module>
-      </modules>
-    </profile>
-    
-    <!-- Only build the Windows distribution if running on Windows. -->
-    <profile>
-      <id>windows</id>
-      
-      <activation>
-        <os>
-         <family>windows</family>
-       </os>
-      </activation>
-      
-      <modules>
-        <module>cayenne-win</module>
-      </modules>
-    </profile>
-  </profiles>
+<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-incubating-SNAPSHOT</version>
+       </parent>
+
+       <groupId>org.apache.cayenne.assembly</groupId>
+       <artifactId>cayenne-assembly-parent</artifactId>
+       <packaging>pom</packaging>
+       <name>Cayenne :: Assembly</name>
+
+       <!-- Build the generic distribution in all cases. -->
+       <modules>
+               <module>cayenne-generic</module>
+       </modules>
+
+       <!-- Set up the OS-specific distributions. -->
+       <profiles>
+
+               <profile>
+                       <id>mac</id>
+
+                       <modules>
+                               <module>cayenne-osx</module>
+                       </modules>
+               </profile>
+               <profile>
+                       <id>windows</id>
+
+                       <modules>
+                               <module>cayenne-win</module>
+                       </modules>
+               </profile>
+       </profiles>
 
 </project>


Reply via email to