cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r1542716 - in /cayenne/main/trunk: cayenne-client/pom.xml cayenne-di/pom.xml cayenne-lifecycle/pom.xml cayenne-project/pom.xml cayenne-server/pom.xml cayenne-tools/pom.xml modeler/pom.xml plugins/pom.xml pom.xml
Date Sun, 17 Nov 2013 12:33:29 GMT
Author: aadamchik
Date: Sun Nov 17 12:33:29 2013
New Revision: 1542716

URL: http://svn.apache.org/r1542716
Log:
CAY-1883 - Clean up Cayenne maven structure - get rid of aggregate modules

have to explicitly declare license inclusion in each distributed module...

Modified:
    cayenne/main/trunk/cayenne-client/pom.xml
    cayenne/main/trunk/cayenne-di/pom.xml
    cayenne/main/trunk/cayenne-lifecycle/pom.xml
    cayenne/main/trunk/cayenne-project/pom.xml
    cayenne/main/trunk/cayenne-server/pom.xml
    cayenne/main/trunk/cayenne-tools/pom.xml
    cayenne/main/trunk/modeler/pom.xml
    cayenne/main/trunk/plugins/pom.xml
    cayenne/main/trunk/pom.xml

Modified: cayenne/main/trunk/cayenne-client/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-client/pom.xml?rev=1542716&r1=1542715&r2=1542716&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-client/pom.xml (original)
+++ cayenne/main/trunk/cayenne-client/pom.xml Sun Nov 17 12:33:29 2013
@@ -76,4 +76,18 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-remote-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>process</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>

Modified: cayenne/main/trunk/cayenne-di/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/pom.xml?rev=1542716&r1=1542715&r2=1542716&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-di/pom.xml (original)
+++ cayenne/main/trunk/cayenne-di/pom.xml Sun Nov 17 12:33:29 2013
@@ -35,5 +35,17 @@
 				<filtering>true</filtering>
 			</resource>
 		</resources>
+		<plugins>
+			<plugin>
+				<artifactId>maven-remote-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>process</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
 	</build>
 </project>

Modified: cayenne/main/trunk/cayenne-lifecycle/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-lifecycle/pom.xml?rev=1542716&r1=1542715&r2=1542716&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-lifecycle/pom.xml (original)
+++ cayenne/main/trunk/cayenne-lifecycle/pom.xml Sun Nov 17 12:33:29 2013
@@ -48,4 +48,18 @@
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
+		<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-remote-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>process</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>

Modified: cayenne/main/trunk/cayenne-project/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-project/pom.xml?rev=1542716&r1=1542715&r2=1542716&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-project/pom.xml (original)
+++ cayenne/main/trunk/cayenne-project/pom.xml Sun Nov 17 12:33:29 2013
@@ -53,4 +53,19 @@
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-remote-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>process</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>

Modified: cayenne/main/trunk/cayenne-server/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/pom.xml?rev=1542716&r1=1542715&r2=1542716&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/pom.xml (original)
+++ cayenne/main/trunk/cayenne-server/pom.xml Sun Nov 17 12:33:29 2013
@@ -136,6 +136,17 @@
 	</dependencies>
 	<build>
 		<plugins>
+			<plugin>
+				<artifactId>maven-remote-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>process</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			
 			<!-- share tests with downstream modules -->
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

Modified: cayenne/main/trunk/cayenne-tools/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-tools/pom.xml?rev=1542716&r1=1542715&r2=1542716&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-tools/pom.xml (original)
+++ cayenne/main/trunk/cayenne-tools/pom.xml Sun Nov 17 12:33:29 2013
@@ -98,4 +98,19 @@
 		</dependency>
 
 	</dependencies>
+	
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-remote-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>process</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>
\ No newline at end of file

Modified: cayenne/main/trunk/modeler/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/modeler/pom.xml?rev=1542716&r1=1542715&r2=1542716&view=diff
==============================================================================
--- cayenne/main/trunk/modeler/pom.xml (original)
+++ cayenne/main/trunk/modeler/pom.xml Sun Nov 17 12:33:29 2013
@@ -60,4 +60,19 @@
 			</modules>
 		</profile>
 	</profiles>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-remote-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>process</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>

Modified: cayenne/main/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/plugins/pom.xml?rev=1542716&r1=1542715&r2=1542716&view=diff
==============================================================================
--- cayenne/main/trunk/plugins/pom.xml (original)
+++ cayenne/main/trunk/plugins/pom.xml Sun Nov 17 12:33:29 2013
@@ -64,4 +64,19 @@
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
+
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-remote-resources-plugin</artifactId>
+				<executions>
+					<execution>
+						<goals>
+							<goal>process</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 </project>

Modified: cayenne/main/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/pom.xml?rev=1542716&r1=1542715&r2=1542716&view=diff
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Sun Nov 17 12:33:29 2013
@@ -688,7 +688,17 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-remote-resources-plugin</artifactId>
-					<version>1.2</version>
+					<version>1.5</version>
+					<configuration>
+						<outputDirectory>
+								${project.build.directory}/classes
+						</outputDirectory>
+						<resourceBundles>
+							<resourceBundle>
+								org.apache.cayenne.build-tools:cayenne-legal:${project.version}
+							</resourceBundle>
+						</resourceBundles>
+					</configuration>
 				</plugin>
 				<plugin>
 					<artifactId>maven-javadoc-plugin</artifactId>
@@ -763,27 +773,6 @@
 				</configuration>
 			</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.build-tools:cayenne-legal:${project.version}
-								</resourceBundle>
-							</resourceBundles>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
 				<groupId>org.apache.rat</groupId>
 				<artifactId>apache-rat-plugin</artifactId>
 				<configuration>



Mime
View raw message