You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2007/01/17 11:02:05 UTC
svn commit: r496980 - in /incubator/cayenne/main/trunk: assembly/
assembly/src/main/assembly/ core/cayenne-legal/
core/cayenne-legal/src/main/resources/META-INF/
core/cayenne-legal/src/main/resources/META-INF/cayenne/
core/cayenne-legal/src/main/resour...
Author: aadamchik
Date: Wed Jan 17 02:01:58 2007
New Revision: 496980
URL: http://svn.apache.org/viewvc?view=rev&rev=496980
Log:
finalizing assemblies
Added:
incubator/cayenne/main/trunk/core/cayenne-legal/src/main/resources/META-INF/
incubator/cayenne/main/trunk/core/cayenne-legal/src/main/resources/META-INF/cayenne/
- copied from r496968, incubator/cayenne/main/trunk/core/cayenne-legal/src/main/resources/legal/
Removed:
incubator/cayenne/main/trunk/core/cayenne-legal/src/main/resources/legal/
Modified:
incubator/cayenne/main/trunk/assembly/pom.xml
incubator/cayenne/main/trunk/assembly/src/main/assembly/main.xml
incubator/cayenne/main/trunk/core/cayenne-legal/pom.xml
incubator/cayenne/main/trunk/core/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt
incubator/cayenne/main/trunk/framework/cayenne-agent/pom.xml
incubator/cayenne/main/trunk/framework/cayenne-client/pom.xml
incubator/cayenne/main/trunk/framework/cayenne-server/pom.xml
incubator/cayenne/main/trunk/modeler/cayenne-modeler/pom.xml
incubator/cayenne/main/trunk/other/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/date/DateMojo.java
Modified: incubator/cayenne/main/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/pom.xml?view=diff&rev=496980&r1=496979&r2=496980
==============================================================================
--- incubator/cayenne/main/trunk/assembly/pom.xml (original)
+++ incubator/cayenne/main/trunk/assembly/pom.xml Wed Jan 17 02:01:58 2007
@@ -72,6 +72,27 @@
<build>
<plugins>
<plugin>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <outputDirectory>
+ ${project.build.directory}/legal
+ </outputDirectory>
+ <resourceBundles>
+ <resourceBundle>
+ org.apache.cayenne:cayenne-legal:${version}
+ </resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>dependency-maven-plugin</artifactId>
<executions>
Modified: incubator/cayenne/main/trunk/assembly/src/main/assembly/main.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/assembly/src/main/assembly/main.xml?view=diff&rev=496980&r1=496979&r2=496980
==============================================================================
--- incubator/cayenne/main/trunk/assembly/src/main/assembly/main.xml (original)
+++ incubator/cayenne/main/trunk/assembly/src/main/assembly/main.xml Wed Jan 17 02:01:58 2007
@@ -51,6 +51,10 @@
<fileSets>
<fileSet>
+ <directory>target/legal/META-INF/cayenne</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>target/modeler</directory>
<outputDirectory>bin</outputDirectory>
<excludes>
Modified: incubator/cayenne/main/trunk/core/cayenne-legal/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-legal/pom.xml?view=diff&rev=496980&r1=496979&r2=496980
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-legal/pom.xml (original)
+++ incubator/cayenne/main/trunk/core/cayenne-legal/pom.xml Wed Jan 17 02:01:58 2007
@@ -7,9 +7,9 @@
to you 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
-
+
+ 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
@@ -35,14 +35,47 @@
<packaging>jar</packaging>
<build>
+ <resources>
+ <!-- replace variables here, as maven-remote-resources-plugin is not always used to include stuff -->
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+
<plugins>
<plugin>
+ <groupId>org.apache.cayenne.maven.plugin</groupId>
+ <artifactId>maven-cayenne-build-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>date</id>
+ <goals>
+ <goal>date</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
<version>1.0-alpha-1</version>
<executions>
<execution>
<goals>
<goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>bundle-source-jar</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
</goals>
</execution>
</executions>
Modified: incubator/cayenne/main/trunk/core/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt?view=diff&rev=496980&r1=496968&r2=496980
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt (original)
+++ incubator/cayenne/main/trunk/core/cayenne-legal/src/main/resources/META-INF/cayenne/NOTICE.txt Wed Jan 17 02:01:58 2007
@@ -1,5 +1,5 @@
Apache Cayenne
-Copyright 2001-${presentYear} The Apache Software Foundation
+Copyright 2001-${project.build.year} The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: incubator/cayenne/main/trunk/framework/cayenne-agent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/framework/cayenne-agent/pom.xml?view=diff&rev=496980&r1=496979&r2=496980
==============================================================================
--- incubator/cayenne/main/trunk/framework/cayenne-agent/pom.xml (original)
+++ incubator/cayenne/main/trunk/framework/cayenne-agent/pom.xml Wed Jan 17 02:01:58 2007
@@ -54,7 +54,7 @@
<phase>process-resources</phase>
<configuration>
<outputDirectory>
- ${project.build.directory}/classes/META-INF/cayenne
+ ${project.build.directory}/classes
</outputDirectory>
<resourceBundles>
<resourceBundle>
Modified: incubator/cayenne/main/trunk/framework/cayenne-client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/framework/cayenne-client/pom.xml?view=diff&rev=496980&r1=496979&r2=496980
==============================================================================
--- incubator/cayenne/main/trunk/framework/cayenne-client/pom.xml (original)
+++ incubator/cayenne/main/trunk/framework/cayenne-client/pom.xml Wed Jan 17 02:01:58 2007
@@ -75,6 +75,11 @@
<artifactId>cayenne-jdk1.5</artifactId>
<version>${version}</version>
</artifactItem>
+ <artifactItem>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-legal</artifactId>
+ <version>${version}</version>
+ </artifactItem>
</artifactItems>
</configuration>
</execution>
Modified: incubator/cayenne/main/trunk/framework/cayenne-server/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/framework/cayenne-server/pom.xml?view=diff&rev=496980&r1=496979&r2=496980
==============================================================================
--- incubator/cayenne/main/trunk/framework/cayenne-server/pom.xml (original)
+++ incubator/cayenne/main/trunk/framework/cayenne-server/pom.xml Wed Jan 17 02:01:58 2007
@@ -86,6 +86,11 @@
<artifactId>cayenne-jpa</artifactId>
<version>${version}</version>
</artifactItem>
+ <artifactItem>
+ <groupId>org.apache.cayenne</groupId>
+ <artifactId>cayenne-legal</artifactId>
+ <version>${version}</version>
+ </artifactItem>
</artifactItems>
</configuration>
</execution>
Modified: incubator/cayenne/main/trunk/modeler/cayenne-modeler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/modeler/cayenne-modeler/pom.xml?view=diff&rev=496980&r1=496979&r2=496980
==============================================================================
--- incubator/cayenne/main/trunk/modeler/cayenne-modeler/pom.xml (original)
+++ incubator/cayenne/main/trunk/modeler/cayenne-modeler/pom.xml Wed Jan 17 02:01:58 2007
@@ -131,6 +131,28 @@
<build>
<plugins>
<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:cayenne-legal:${version}
+ </resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
Modified: incubator/cayenne/main/trunk/other/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/date/DateMojo.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/other/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/date/DateMojo.java?view=diff&rev=496980&r1=496979&r2=496980
==============================================================================
--- incubator/cayenne/main/trunk/other/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/date/DateMojo.java (original)
+++ incubator/cayenne/main/trunk/other/maven-cayenne-build-plugin/src/main/java/org/apache/cayenne/maven/plugin/date/DateMojo.java Wed Jan 17 02:01:58 2007
@@ -40,6 +40,7 @@
static final String BUILD_DATE_PROPERTY = "project.build.date";
static final String BUILD_TIME_PROPERTY = "project.build.time";
+ static final String BUILD_YEAR_PROPERTY = "project.build.year";
static final String BUILD_DATE_FORMAT = "MMM dd yyyy";
static final String BUILD_TIME_FORMAT = "HH:mm:ss";
@@ -56,5 +57,6 @@
System.setProperty(BUILD_DATE_PROPERTY, dateFormat.format(gmtTime));
System.setProperty(BUILD_TIME_PROPERTY, timeFormat.format(gmtTime));
+ System.setProperty(BUILD_YEAR_PROPERTY, String.valueOf(calendar.get(Calendar.YEAR)));
}
}