Return-Path: 
 <commits-return-179-apmail-turbine-commits-archive=turbine.apache.org@turbine.apache.org>
Delivered-To: apmail-turbine-commits-archive@locus.apache.org
Received: (qmail 36946 invoked from network); 7 Jun 2008 10:42:51 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 7 Jun 2008 10:42:51 -0000
Received: (qmail 48874 invoked by uid 500); 7 Jun 2008 10:42:54 -0000
Delivered-To: apmail-turbine-commits-archive@turbine.apache.org
Received: (qmail 48840 invoked by uid 500); 7 Jun 2008 10:42:54 -0000
Mailing-List: contact commits-help@turbine.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@turbine.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@turbine.apache.org>
List-Post: <mailto:commits@turbine.apache.org>
List-Id: <commits.turbine.apache.org>
Reply-To: dev@turbine.apache.org
Delivered-To: mailing list commits@turbine.apache.org
Received: (qmail 48831 invoked by uid 99); 7 Jun 2008 10:42:54 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 Jun 2008 03:42:54 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 07 Jun 2008 10:42:06 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 3A0742388A26; Sat,  7 Jun 2008 03:42:28 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r664314 - in /turbine/fulcrum/trunk: cache/NOTICE
 cache/maven.xml cache/project.xml project.properties project.xml
Date: Sat, 07 Jun 2008 10:42:27 -0000
To: commits@turbine.apache.org
From: tv@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080607104228.3A0742388A26@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: tv
Date: Sat Jun  7 03:42:27 2008
New Revision: 664314

URL: http://svn.apache.org/viewvc?rev=664314&view=rev
Log:
Some fixes to the build environment in preparation of release

Added:
    turbine/fulcrum/trunk/cache/NOTICE
Modified:
    turbine/fulcrum/trunk/cache/maven.xml
    turbine/fulcrum/trunk/cache/project.xml
    turbine/fulcrum/trunk/project.properties
    turbine/fulcrum/trunk/project.xml

Added: turbine/fulcrum/trunk/cache/NOTICE
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/cache/NOTICE?rev=664314&view=auto
==============================================================================
--- turbine/fulcrum/trunk/cache/NOTICE (added)
+++ turbine/fulcrum/trunk/cache/NOTICE Sat Jun  7 03:42:27 2008
@@ -0,0 +1,6 @@
+Apache Turbine Fulcrum
+Copyright 2001-2008 The Apache Software Foundation.
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/). 
+See the LICENSE.txt file.

Modified: turbine/fulcrum/trunk/cache/maven.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/cache/maven.xml?rev=664314&r1=664313&r2=664314&view=diff
==============================================================================
--- turbine/fulcrum/trunk/cache/maven.xml (original)
+++ turbine/fulcrum/trunk/cache/maven.xml Sat Jun  7 03:42:27 2008
@@ -31,4 +31,35 @@
     </ant:copy>
   </preGoal>
 
+  <!-- ================================================================== -->
+  <!-- D I S T : B U I L D _ B I N   P R E   G O A L                      -->
+  <!-- ================================================================== -->
+  <!-- copies NOTICE, LICENSE.txt                                         -->
+  <!-- ${maven.dist.bin.assembly.dir} to include them in the binary dists -->
+  <!-- ================================================================== -->
+  <preGoal name="dist:build-bin">
+    <copy todir="${maven.dist.bin.assembly.dir}" failonerror="false">
+      <fileset dir="${basedir}">
+        <include name="project.xml"/>
+        <include name="project.properties"/>
+        <include name="NOTICE"/>
+        <include name="LICENSE.txt"/>
+      </fileset>
+    </copy>
+  </preGoal>
+
+  <!-- ================================================================== -->
+  <!-- D I S T : B U I L D _ S R C   P R E   G O A L                      -->
+  <!-- ================================================================== -->
+  <preGoal name="dist:build-src">
+    <copy todir="${maven.dist.src.assembly.dir}">
+      <fileset dir="${basedir}">
+        <include name="project.xml"/>
+        <include name="project.properties"/>
+        <include name="NOTICE"/>
+        <include name="LICENSE.txt"/>
+      </fileset>
+    </copy>
+  </preGoal>
+
 </project>

Modified: turbine/fulcrum/trunk/cache/project.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/cache/project.xml?rev=664314&r1=664313&r2=664314&view=diff
==============================================================================
--- turbine/fulcrum/trunk/cache/project.xml (original)
+++ turbine/fulcrum/trunk/cache/project.xml Sat Jun  7 03:42:27 2008
@@ -28,6 +28,11 @@
       <name>1.0.5</name>
       <tag>FULCRUM_CACHE_1_0_5</tag>
     </version>
+    <version>
+      <id>1.1</id>
+      <name>1.1</name>
+      <tag>FULCRUM_CACHE_1_1</tag>
+    </version>
   </versions>
   <dependencies>
     <dependency>

Modified: turbine/fulcrum/trunk/project.properties
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/project.properties?rev=664314&r1=664313&r2=664314&view=diff
==============================================================================
--- turbine/fulcrum/trunk/project.properties (original)
+++ turbine/fulcrum/trunk/project.properties Sat Jun  7 03:42:27 2008
@@ -31,6 +31,16 @@
 maven.compile.optimize = off
 maven.compile.deprecation = off
 
+# Add information on compilation options to the Manifest
+maven.jar.manifest.attributes.list=X-Compile-Source-JDK,X-Compile-Target-JDK
+maven.jar.manifest.attribute.X-Compile-Source-JDK=${maven.compile.source}
+maven.jar.manifest.attribute.X-Compile-Target-JDK=${maven.compile.target}
+
+# -------------------------------------------------------------------
+# L I C E N S E  P R O P E R T I E S
+# -------------------------------------------------------------------
+maven.license.licenseFile = ${basedir}/LICENSE.txt
+
 # display the date on the site
 maven.xdoc.date = left
 maven.xdoc.distributionUrl=http://www.apache.org/dyn/closer.cgi/turbine/fulcrum/${pom.artifactId}/binaries
@@ -64,7 +74,7 @@
 maven.multiproject.aggregateDir=
 maven.multiproject.type=jar
 maven.multiproject.includes=**/project.xml
-maven.multiproject.excludes=proposals/**,target/**,project.xml
+maven.multiproject.excludes=proposals/**,target/**,parent/**,project.xml
 
 # -------------------------------------------------------------------
 #  D A S H B O A R D   S E T T I N G S

Modified: turbine/fulcrum/trunk/project.xml
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/project.xml?rev=664314&r1=664313&r2=664314&view=diff
==============================================================================
--- turbine/fulcrum/trunk/project.xml (original)
+++ turbine/fulcrum/trunk/project.xml Sat Jun  7 03:42:27 2008
@@ -353,6 +353,13 @@
             <include>incl_site_nav.xml</include>
           </includes>
         </resource>
+        <resource>
+            <directory>${basedir}</directory>
+            <targetPath>META-INF</targetPath>
+            <includes>
+              <include>NOTICE</include>
+            </includes>
+        </resource>
     </resources>
   </build>