cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r1542715 - in /cayenne/main/trunk: ./ build-tools/ build-tools/cayenne-build-maven-plugin/ build-tools/cayenne-legal/ build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/ cayenne-di/ cayenne-di/src/main/resources/org/apache/cayenn...
Date Sun, 17 Nov 2013 12:33:04 GMT
Author: aadamchik
Date: Sun Nov 17 12:33:04 2013
New Revision: 1542715

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

removing cayenne-build-maven-plugin... we'll be initializing date via Maven

Removed:
    cayenne/main/trunk/build-tools/cayenne-build-maven-plugin/
Modified:
    cayenne/main/trunk/build-tools/cayenne-legal/pom.xml
    cayenne/main/trunk/build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt
    cayenne/main/trunk/build-tools/pom.xml
    cayenne/main/trunk/cayenne-di/pom.xml
    cayenne/main/trunk/cayenne-di/src/main/resources/org/apache/cayenne/cayenne-strings.properties
    cayenne/main/trunk/cayenne-server/pom.xml
    cayenne/main/trunk/docs/doc/pom.xml
    cayenne/main/trunk/docs/doc/src/main/resources/doc/index.html
    cayenne/main/trunk/pom.xml

Modified: cayenne/main/trunk/build-tools/cayenne-legal/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/build-tools/cayenne-legal/pom.xml?rev=1542715&r1=1542714&r2=1542715&view=diff
==============================================================================
--- cayenne/main/trunk/build-tools/cayenne-legal/pom.xml (original)
+++ cayenne/main/trunk/build-tools/cayenne-legal/pom.xml Sun Nov 17 12:33:04 2013
@@ -43,19 +43,6 @@
 
 		<plugins>
 			<plugin>
-				<groupId>org.apache.cayenne.build-tools</groupId>
-				<artifactId>cayenne-build-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>date</id>
-						<goals>
-							<goal>date</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
 				<artifactId>maven-remote-resources-plugin</artifactId>
 				<executions>
 					<execution>

Modified: cayenne/main/trunk/build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt?rev=1542715&r1=1542714&r2=1542715&view=diff
==============================================================================
--- cayenne/main/trunk/build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt
(original)
+++ cayenne/main/trunk/build-tools/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt
Sun Nov 17 12:33:04 2013
@@ -1,5 +1,5 @@
 Apache Cayenne
-Copyright 2001-${project.build.year} The Apache Software Foundation
+Copyright 2001-2013 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

Modified: cayenne/main/trunk/build-tools/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/build-tools/pom.xml?rev=1542715&r1=1542714&r2=1542715&view=diff
==============================================================================
--- cayenne/main/trunk/build-tools/pom.xml (original)
+++ cayenne/main/trunk/build-tools/pom.xml Sun Nov 17 12:33:04 2013
@@ -34,7 +34,6 @@
 	<packaging>pom</packaging>
 
 	<modules>
-		<module>cayenne-build-maven-plugin</module>
 		<module>cayenne-legal</module>
 		<module>cayenne-test-utilities</module>
 	</modules>

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

Modified: cayenne/main/trunk/cayenne-di/src/main/resources/org/apache/cayenne/cayenne-strings.properties
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-di/src/main/resources/org/apache/cayenne/cayenne-strings.properties?rev=1542715&r1=1542714&r2=1542715&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-di/src/main/resources/org/apache/cayenne/cayenne-strings.properties
(original)
+++ cayenne/main/trunk/cayenne-di/src/main/resources/org/apache/cayenne/cayenne-strings.properties
Sun Nov 17 12:33:04 2013
@@ -16,6 +16,4 @@
 #  under the License.
 
 cayenne.version = ${project.version}
-
-# these properties are coming from maven-cayenne-build plugin.
-cayenne.build.date = ${project.build.date} ${project.build.time}
+cayenne.build.date = ${project.build.datetime}

Modified: cayenne/main/trunk/cayenne-server/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/cayenne-server/pom.xml?rev=1542715&r1=1542714&r2=1542715&view=diff
==============================================================================
--- cayenne/main/trunk/cayenne-server/pom.xml (original)
+++ cayenne/main/trunk/cayenne-server/pom.xml Sun Nov 17 12:33:04 2013
@@ -194,18 +194,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.cayenne.build-tools</groupId>
-				<artifactId>cayenne-build-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>date</id>
-						<goals>
-							<goal>date</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 </project>

Modified: cayenne/main/trunk/docs/doc/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/pom.xml?rev=1542715&r1=1542714&r2=1542715&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/pom.xml (original)
+++ cayenne/main/trunk/docs/doc/pom.xml Sun Nov 17 12:33:04 2013
@@ -204,18 +204,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.cayenne.build-tools</groupId>
-				<artifactId>cayenne-build-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>date</id>
-						<goals>
-							<goal>date</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
 		</plugins>
 	</build>
 </project>

Modified: cayenne/main/trunk/docs/doc/src/main/resources/doc/index.html
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/docs/doc/src/main/resources/doc/index.html?rev=1542715&r1=1542714&r2=1542715&view=diff
==============================================================================
--- cayenne/main/trunk/docs/doc/src/main/resources/doc/index.html (original)
+++ cayenne/main/trunk/docs/doc/src/main/resources/doc/index.html Sun Nov 17 12:33:04 2013
@@ -24,7 +24,7 @@
 
 <body>
 <h1><img src="images/logo.gif" align="absmiddle" border="0"> Cayenne ${project.version}</h1>
-<i>Built on ${project.build.date} ${project.build.time} by ${user.name}</i>
+<i>Built on ${project.build.datetime} by ${user.name}</i>
 
 <h2>Included HTML Documentation:</h2>
 <ul>

Modified: cayenne/main/trunk/pom.xml
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/pom.xml?rev=1542715&r1=1542714&r2=1542715&view=diff
==============================================================================
--- cayenne/main/trunk/pom.xml (original)
+++ cayenne/main/trunk/pom.xml Sun Nov 17 12:33:04 2013
@@ -34,6 +34,12 @@
 		Relational Mapping (ORM) and remoting services for persistence.
 		The software is licensed under the Apache License.
 	</description>
+
+	<properties>
+		<maven.build.timestamp.format>MMM dd yyyy HH:mm:ss</maven.build.timestamp.format>
+		<project.build.datetime>${maven.build.timestamp}</project.build.datetime>
+	</properties>
+
 	<url>http://cayenne.apache.org/</url>
 	<modules>
 		<module>build-tools</module>
@@ -509,19 +515,6 @@
 							<pluginExecutions>
 								<pluginExecution>
 									<pluginExecutionFilter>
-										<groupId>org.apache.cayenne.build-tools</groupId>
-										<artifactId>cayenne-build-maven-plugin</artifactId>
-										<versionRange>[1.0,)</versionRange>
-										<goals>
-											<goal>date</goal>
-										</goals>
-									</pluginExecutionFilter>
-									<action>
-										<ignore />
-									</action>
-								</pluginExecution>
-								<pluginExecution>
-									<pluginExecutionFilter>
 										<groupId>org.apache.maven.plugins</groupId>
 										<artifactId>maven-antrun-plugin</artifactId>
 										<versionRange>[1.0,)</versionRange>
@@ -635,11 +628,6 @@
 					<version>2.4.3</version>
 				</plugin>
 				<plugin>
-					<groupId>org.apache.cayenne.build-tools</groupId>
-					<artifactId>cayenne-build-maven-plugin</artifactId>
-					<version>${project.version}</version>
-				</plugin>
-				<plugin>
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>2.3.2</version>
 					<configuration>



Mime
View raw message