cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r1064674 - in /cayenne/main/trunk: ./ assembly/ assembly/src/main/resources/assemblies/ framework/ framework/cayenne-lifecycle/
Date Fri, 28 Jan 2011 13:54:22 GMT
Author: aadamchik
Date: Fri Jan 28 13:54:22 2011
New Revision: 1064674

URL: http://svn.apache.org/viewvc?rev=1064674&view=rev
Log:
CAY-1532 Import cayenne-lifecycle from sandbox

maven setup

Modified:
    cayenne/main/trunk/assembly/pom.xml
    cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-generic.xml
    cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-mac.xml
    cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-windows.xml
    cayenne/main/trunk/framework/cayenne-lifecycle/.project
    cayenne/main/trunk/framework/cayenne-lifecycle/pom.xml
    cayenne/main/trunk/framework/pom.xml
    cayenne/main/trunk/pom.xml

Modified: cayenne/main/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/assembly/pom.xml?rev=1064674&r1=1064673&r2=1064674&view=diff
==============================================================================
--- cayenne/main/trunk/assembly/pom.xml (original)
+++ cayenne/main/trunk/assembly/pom.xml Fri Jan 28 13:54:22 2011
@@ -58,6 +58,12 @@
 		
 		<dependency>
 			<groupId>org.apache.cayenne</groupId>
+			<artifactId>cayenne-lifecycle</artifactId>
+			<version>${version}</version>
+		</dependency>
+		
+		<dependency>
+			<groupId>org.apache.cayenne</groupId>
 			<artifactId>cayenne-modeler</artifactId>
 			<version>${version}</version>
 		</dependency>

Modified: cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-generic.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-generic.xml?rev=1064674&r1=1064673&r2=1064674&view=diff
==============================================================================
--- cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-generic.xml (original)
+++ cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-generic.xml Fri Jan
28 13:54:22 2011
@@ -53,6 +53,7 @@
 				<include>org.apache.cayenne:cayenne-server</include>
 				<include>org.apache.cayenne:cayenne-client</include>
 				<include>org.apache.cayenne:cayenne-tools</include>
+				<include>org.apache.cayenne:cayenne-lifecycle</include>
 			</includes>
 		</dependencySet>
 		<dependencySet>

Modified: cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-mac.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-mac.xml?rev=1064674&r1=1064673&r2=1064674&view=diff
==============================================================================
--- cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-mac.xml (original)
+++ cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-mac.xml Fri Jan 28
13:54:22 2011
@@ -53,6 +53,7 @@
 				<include>org.apache.cayenne:cayenne-server</include>
 				<include>org.apache.cayenne:cayenne-client</include>
 				<include>org.apache.cayenne:cayenne-tools</include>
+				<include>org.apache.cayenne:cayenne-lifecycle</include>
 			</includes>
 		</dependencySet>
 		<dependencySet>

Modified: cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-windows.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-windows.xml?rev=1064674&r1=1064673&r2=1064674&view=diff
==============================================================================
--- cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-windows.xml (original)
+++ cayenne/main/trunk/assembly/src/main/resources/assemblies/assembly-windows.xml Fri Jan
28 13:54:22 2011
@@ -53,6 +53,7 @@
 				<include>org.apache.cayenne:cayenne-server</include>
 				<include>org.apache.cayenne:cayenne-client</include>
 				<include>org.apache.cayenne:cayenne-tools</include>
+				<include>org.apache.cayenne:cayenne-lifecycle</include>
 			</includes>
 		</dependencySet>
 		<dependencySet>

Modified: cayenne/main/trunk/framework/cayenne-lifecycle/.project
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-lifecycle/.project?rev=1064674&r1=1064673&r2=1064674&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-lifecycle/.project (original)
+++ cayenne/main/trunk/framework/cayenne-lifecycle/.project Fri Jan 28 13:54:22 2011
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>cayenne-mixin</name>
+	<name>cayenne-lifecycle</name>
 	<comment></comment>
 	<projects>
 	</projects>

Modified: cayenne/main/trunk/framework/cayenne-lifecycle/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-lifecycle/pom.xml?rev=1064674&r1=1064673&r2=1064674&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-lifecycle/pom.xml (original)
+++ cayenne/main/trunk/framework/cayenne-lifecycle/pom.xml Fri Jan 28 13:54:22 2011
@@ -5,34 +5,75 @@
 	<parent>
 		<artifactId>cayenne-parent</artifactId>
 		<groupId>org.apache.cayenne</groupId>
-		<version>3.1M1</version>
+		<version>3.1-SNAPSHOT</version>
 	</parent>
-	<artifactId>cayenne-mixin</artifactId>
-	<version>3.1.0.13</version>
-	<name>Library: cayenne-mixin</name>
+	<artifactId>cayenne-lifecycle</artifactId>
+	<name>Library: cayenne-lifecycle</name>
 	<packaging>jar</packaging>
-	<properties>
-		<cayenne.version>3.1-SNAPSHOT</cayenne.version>
-		<mockito.version>1.8.5</mockito.version>
-	</properties>
 	<dependencies>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
 		</dependency>
 		<dependency>
+            <groupId>org.apache.cayenne.unpublished</groupId>
+            <artifactId>cayenne-legal-unpublished</artifactId>
+            <version>${version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <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</groupId>
 			<artifactId>cayenne-server</artifactId>
-			<version>${cayenne.version}</version>
+			<version>${version}</version>
 		</dependency>
 		<dependency>
-				<groupId>org.mockito</groupId>
-				<artifactId>mockito-all</artifactId>
-				<version>${mockito.version}</version>
-				<scope>test</scope>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-all</artifactId>
 		</dependency>
 	</dependencies>
 	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>bundle-source-jar</id>
+						<phase>package</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+                <artifactId>maven-remote-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <phase>process-resources</phase>
+                        <configuration>
+                            <outputDirectory>
+                                ${project.build.directory}/classes
+                            </outputDirectory>
+                            <resourceBundles>
+                                <resourceBundle>
+                                    org.apache.cayenne.unpublished:cayenne-legal-unpublished:${version}
+                                </resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+		</plugins>
 		<pluginManagement>
 			<plugins>
 				<plugin>

Modified: cayenne/main/trunk/framework/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/pom.xml?rev=1064674&r1=1064673&r2=1064674&view=diff
==============================================================================
--- cayenne/main/trunk/framework/pom.xml (original)
+++ cayenne/main/trunk/framework/pom.xml Fri Jan 28 13:54:22 2011
@@ -56,6 +56,7 @@
 				<module>cayenne-server</module>
 				<module>cayenne-client</module>
 				<module>cayenne-tools</module>
+				<module>cayenne-lifecycle</module>
 				<module>maven-cayenne-plugin</module>
 			</modules>
 		</profile>
@@ -74,6 +75,7 @@
 				<module>cayenne-server</module>
 				<module>cayenne-client</module>
 				<module>cayenne-tools</module>
+				<module>cayenne-lifecycle</module>
 				<module>maven-cayenne-plugin</module>
 			</modules>
 		</profile>

Modified: cayenne/main/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/pom.xml?rev=1064674&r1=1064673&r2=1064674&view=diff
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Fri Jan 28 13:54:22 2011
@@ -461,6 +461,12 @@
 				<version>3.8.1</version>
 				<scope>test</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.mockito</groupId>
+				<artifactId>mockito-all</artifactId>
+				<version>1.8.5</version>
+				<scope>test</scope>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<repositories>



Mime
View raw message