You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nutch.apache.org by le...@apache.org on 2012/07/02 19:11:03 UTC
svn commit: r1356359 - in /nutch/branches/branch-1.5.1: CHANGES.txt
build.xml conf/nutch-default.xml conf/schema.xml default.properties
Author: lewismc
Date: Mon Jul 2 17:11:02 2012
New Revision: 1356359
URL: http://svn.apache.org/viewvc?rev=1356359&view=rev
Log:
NUTCH-1415 release packages to contain top level folder apache-nutch-x.x + final commits to 1.5.1RC#2
Modified:
nutch/branches/branch-1.5.1/CHANGES.txt
nutch/branches/branch-1.5.1/build.xml
nutch/branches/branch-1.5.1/conf/nutch-default.xml
nutch/branches/branch-1.5.1/conf/schema.xml
nutch/branches/branch-1.5.1/default.properties
Modified: nutch/branches/branch-1.5.1/CHANGES.txt
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.5.1/CHANGES.txt?rev=1356359&r1=1356358&r2=1356359&view=diff
==============================================================================
--- nutch/branches/branch-1.5.1/CHANGES.txt (original)
+++ nutch/branches/branch-1.5.1/CHANGES.txt Mon Jul 2 17:11:02 2012
@@ -2,6 +2,8 @@ Nutch Change Log
Release 1.5.1 - 07/02/2012
+* NUTCH-1415 release packages to contain top level folder apache-nutch-x.x (snagel via lewismc)
+
* NUTCH-1400 Remove developer -core option for bin/nutch (jnioche)
* NUTCH-1384 Typo in ParseSegment's run-method (Matthias Agethle via markus)
Modified: nutch/branches/branch-1.5.1/build.xml
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.5.1/build.xml?rev=1356359&r1=1356358&r2=1356359&view=diff
==============================================================================
--- nutch/branches/branch-1.5.1/build.xml (original)
+++ nutch/branches/branch-1.5.1/build.xml Mon Jul 2 17:11:02 2012
@@ -686,14 +686,13 @@
<!-- ================================================================== -->
<target name="tar-src" depends="package-src">
<tar compression="gzip" longfile="gnu"
- destfile="${src.dist.version.dir}.tar.gz" basedir="${src.dist.version.dir}">
- <tarfileset dir="${dist.dir}" mode="664">
- <exclude name="${src.dist.version.dir}/bin/*" />
- <exclude name="${src.dist.version.dir}/runtime/*" />
- <include name="${src.dist.version.dir}/**" />
+ destfile="${src.dist.version.dir}.tar.gz">
+ <tarfileset dir="${src.dist.version.dir}" mode="664" prefix="${final.name}">
+ <exclude name="src/bin/*" />
+ <include name="**" />
</tarfileset>
- <tarfileset dir="${dist.dir}" mode="755">
- <include name="${src.dist.version.dir}/bin/*" />
+ <tarfileset dir="${src.dist.version.dir}" mode="755" prefix="${final.name}">
+ <include name="src/bin/*" />
</tarfileset>
</tar>
</target>
@@ -703,13 +702,13 @@
<!-- ================================================================== -->
<target name="tar-bin" depends="package-bin">
<tar compression="gzip" longfile="gnu"
- destfile="${bin.dist.version.dir}.tar.gz" basedir="${bin.dist.version.dir}">
- <tarfileset dir="${dist.dir}" mode="664">
- <exclude name="${bin.dist.version.dir}/bin/*" />
- <include name="${bin.dist.version.dir}/**" />
+ destfile="${bin.dist.version.dir}.tar.gz">
+ <tarfileset dir="${bin.dist.version.dir}" mode="664">
+ <exclude name="bin/*" />
+ <include name="**" />
</tarfileset>
- <tarfileset dir="${dist.dir}" mode="755">
- <include name="${bin.dist.version.dir}/bin/*" />
+ <tarfileset dir="${bin.dist.version.dir}" mode="755">
+ <include name="bin/*" />
</tarfileset>
</tar>
</target>
@@ -719,14 +718,13 @@
<!-- ================================================================== -->
<target name="zip-src" depends="package-src">
<zip compress="true" casesensitive="yes"
- destfile="${src.dist.version.dir}.zip" basedir="${src.dist.version.dir}">
- <zipfileset dir="${dist.dir}" filemode="664">
- <exclude name="${src.dist.version.dir}/bin/*" />
- <exclude name="${src.dist.version.dir}/runtime/*" />
- <include name="${src.dist.version.dir}/**" />
+ destfile="${src.dist.version.dir}.zip">
+ <zipfileset dir="${src.dist.version.dir}" filemode="664" prefix="${final.name}">
+ <exclude name="bin/*" />
+ <include name="**" />
</zipfileset>
- <zipfileset dir="${dist.dir}" filemode="755">
- <include name="${src.dist.version.dir}/bin/*" />
+ <zipfileset dir="${src.dist.version.dir}" filemode="755" prefix="${final.name}">
+ <include name="bin/*" />
</zipfileset>
</zip>
</target>
@@ -736,13 +734,13 @@
<!-- ================================================================== -->
<target name="zip-bin" depends="package-bin">
<zip compress="true" casesensitive="yes"
- destfile="${bin.dist.version.dir}.zip" basedir="${bin.dist.version.dir}">
- <zipfileset dir="${dist.dir}" filemode="664">
- <exclude name="${bin.dist.version.dir}/bin/*" />
- <include name="${bin.dist.version.dir}/**" />
+ destfile="${bin.dist.version.dir}.zip">
+ <zipfileset dir="${bin.dist.version.dir}" filemode="664">
+ <exclude name="bin/*" />
+ <include name="**" />
</zipfileset>
- <zipfileset dir="${dist.dir}" filemode="755">
- <include name="${bin.dist.version.dir}/bin/*" />
+ <zipfileset dir="${bin.dist.version.dir}" filemode="755">
+ <include name="bin/*" />
</zipfileset>
</zip>
</target>
Modified: nutch/branches/branch-1.5.1/conf/nutch-default.xml
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.5.1/conf/nutch-default.xml?rev=1356359&r1=1356358&r2=1356359&view=diff
==============================================================================
--- nutch/branches/branch-1.5.1/conf/nutch-default.xml (original)
+++ nutch/branches/branch-1.5.1/conf/nutch-default.xml Mon Jul 2 17:11:02 2012
@@ -123,7 +123,7 @@
<property>
<name>http.agent.version</name>
- <value>Nutch-1.5</value>
+ <value>Nutch-1.5.1</value>
<description>A version string to advertise in the User-Agent
header.</description>
</property>
Modified: nutch/branches/branch-1.5.1/conf/schema.xml
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.5.1/conf/schema.xml?rev=1356359&r1=1356358&r2=1356359&view=diff
==============================================================================
--- nutch/branches/branch-1.5.1/conf/schema.xml (original)
+++ nutch/branches/branch-1.5.1/conf/schema.xml Mon Jul 2 17:11:02 2012
@@ -28,7 +28,7 @@
example/solr/conf/schema.xml?view=markup
for more info.
-->
-<schema name="nutch" version="1.4">
+<schema name="nutch" version="1.5.1">
<types>
<fieldType name="string" class="solr.StrField" sortMissingLast="true"
omitNorms="true"/>
Modified: nutch/branches/branch-1.5.1/default.properties
URL: http://svn.apache.org/viewvc/nutch/branches/branch-1.5.1/default.properties?rev=1356359&r1=1356358&r2=1356359&view=diff
==============================================================================
--- nutch/branches/branch-1.5.1/default.properties (original)
+++ nutch/branches/branch-1.5.1/default.properties Mon Jul 2 17:11:02 2012
@@ -1,5 +1,5 @@
name=apache-nutch
-version=1.5
+version=1.5.1
final.name=${name}-${version}
year=2012