Author: brett Date: Wed Jan 4 13:33:43 2012 New Revision: 1227152 URL: http://svn.apache.org/viewvc?rev=1227152&view=rev Log: merge further updates for release build
Removed: incubator/npanday/branches/npanday-1.4.x/src/assembly/ Modified: incubator/npanday/branches/npanday-1.4.x/ (props changed) incubator/npanday/branches/npanday-1.4.x/dist/dotnet-repository-builder/pom.xml incubator/npanday/branches/npanday-1.4.x/dist/npanday-repository-builder/pom.xml Propchange: incubator/npanday/branches/npanday-1.4.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 4 13:33:43 2012 @@ -1,4 +1,4 @@ /incubator/npanday/branches/NPANDAY-410:1210743-1210765 /incubator/npanday/branches/npanday-uac-removed:1002005-1024539 /incubator/npanday/branches/npanday-vs2010-support:1002029-1025477 -/incubator/npanday/trunk:1221087,1221092,1221101,1221116-1221117,1221159,1222098-1222180,1222459-1222547,1226035,1227061,1227127,1227131-1227136 +/incubator/npanday/trunk:1221087,1221092,1221101,1221116-1221117,1221159,1222098-1222180,1222459-1222547,1226035,1227061,1227127,1227131-1227150 Modified: incubator/npanday/branches/npanday-1.4.x/dist/dotnet-repository-builder/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-1.4.x/dist/dotnet-repository-builder/pom.xml?rev=1227152&r1=1227151&r2=1227152&view=diff ============================================================================== --- incubator/npanday/branches/npanday-1.4.x/dist/dotnet-repository-builder/pom.xml (original) +++ incubator/npanday/branches/npanday-1.4.x/dist/dotnet-repository-builder/pom.xml Wed Jan 4 13:33:43 2012 @@ -247,7 +247,7 @@ <phase>package</phase> <configuration> <tasks> - <copy file="${basedir}/../../LICENSE.txt" todir="${project.build.directory}/npanday-repository" /> + <copy file="${basedir}/../../LICENSE" todir="${project.build.directory}/npanday-repository" /> <tar destfile="${project.build.directory}/dotnet-repository-builder.tar"> <tarfileset dir="${project.build.directory}/npanday-repository" preserveLeadingSlashes="true"> <exclude name="**/junit/**" /> Modified: incubator/npanday/branches/npanday-1.4.x/dist/npanday-repository-builder/pom.xml URL: http://svn.apache.org/viewvc/incubator/npanday/branches/npanday-1.4.x/dist/npanday-repository-builder/pom.xml?rev=1227152&r1=1227151&r2=1227152&view=diff ============================================================================== --- incubator/npanday/branches/npanday-1.4.x/dist/npanday-repository-builder/pom.xml (original) +++ incubator/npanday/branches/npanday-1.4.x/dist/npanday-repository-builder/pom.xml Wed Jan 4 13:33:43 2012 @@ -221,7 +221,7 @@ <phase>package</phase> <configuration> <tasks> - <copy file="${basedir}/../../LICENSE.txt" todir="${project.build.directory}/repository-bin" /> + <copy file="${basedir}/../../LICENSE" todir="${project.build.directory}/repository-bin" /> <tar destfile="${project.build.directory}/repository-bin.tar"> <tarfileset dir="${project.build.directory}/repository-bin" preserveLeadingSlashes="true"> <exclude name="**/commons-*/**" />