You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ni...@apache.org on 2009/07/23 17:56:03 UTC

svn commit: r797120 - in /commons/proper/codec/trunk: build.xml maven.xml project.properties project.xml src/assembly/src.xml src/conf/

Author: niallp
Date: Thu Jul 23 15:56:03 2009
New Revision: 797120

URL: http://svn.apache.org/viewvc?rev=797120&view=rev
Log:
Remove Maven 1 build

Removed:
    commons/proper/codec/trunk/maven.xml
    commons/proper/codec/trunk/project.properties
    commons/proper/codec/trunk/project.xml
    commons/proper/codec/trunk/src/conf/
Modified:
    commons/proper/codec/trunk/build.xml
    commons/proper/codec/trunk/src/assembly/src.xml

Modified: commons/proper/codec/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/build.xml?rev=797120&r1=797119&r2=797120&view=diff
==============================================================================
--- commons/proper/codec/trunk/build.xml (original)
+++ commons/proper/codec/trunk/build.xml Thu Jul 23 15:56:03 2009
@@ -164,11 +164,8 @@
            <zipfileset dir="." includes="checkstyle.xml" prefix="${final.name}/"/>
            <zipfileset dir="." includes="default.properties" prefix="${final.name}/"/>
            <zipfileset dir="." includes="LICENSE*.txt" prefix="${final.name}/"/>
-           <zipfileset dir="." includes="maven.xml" prefix="${final.name}/"/>
            <zipfileset dir="." includes="NOTICE.txt" prefix="${final.name}/"/>
            <zipfileset dir="." includes="pom.xml" prefix="${final.name}/"/>
-           <zipfileset dir="." includes="project.properties" prefix="${final.name}/"/>
-           <zipfileset dir="." includes="project.xml" prefix="${final.name}/"/>
            <zipfileset dir="." includes="RELEASE-NOTES*.txt" prefix="${final.name}/"/>
         </zip>
         <checksum algorithm="md5" file="${zip-src.path}" fileext=".md5"/>

Modified: commons/proper/codec/trunk/src/assembly/src.xml
URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/assembly/src.xml?rev=797120&r1=797119&r2=797120&view=diff
==============================================================================
--- commons/proper/codec/trunk/src/assembly/src.xml (original)
+++ commons/proper/codec/trunk/src/assembly/src.xml Thu Jul 23 15:56:03 2009
@@ -30,11 +30,8 @@
                 <include>default.properties</include>
                 <include>LICENSE.txt</include>
                 <include>LICENSE-header.txt</include>
-                <include>maven.xml</include>
                 <include>NOTICE.txt</include>
                 <include>pom.xml</include>
-                <include>project.properties</include>
-                <include>project.xml</include>
                 <include>RELEASE-NOTES*.txt</include>
                 <include>RELEASE-PLAN</include>
                 <include>TODO</include>



Re: svn commit: r797120 - in /commons/proper/codec/trunk: build.xml maven.xml project.properties project.xml src/assembly/src.xml src/conf/

Posted by sebb <se...@gmail.com>.
On 24/07/2009, Niall Pemberton <ni...@gmail.com> wrote:
> On Fri, Jul 24, 2009 at 5:40 AM, Julius Davies<ju...@gmail.com> wrote:
>  > Hi, Niall,
>  >
>  > This removal breaks the ant build:
>  >
>  > commons/proper/codec/trunk/src/conf/
>  >
>  > But it's easy to fix.  Just remove these 3 lines from build.xml:
>  >
>  > 53         <copy todir="${build.home}/conf" filtering="on">
>  > 54             <fileset dir="${conf.home}" includes="*.MF"/>
>  > 55         </copy>
>
>
> Doh! Thanks for spotting this - fixed now.

Also spotted by Gump, by the way ;-)

>
>  Niall
>
>
>  > yours,
>  >
>  > Julius
>  >
>  >
>  > On Thu, Jul 23, 2009 at 8:56 AM, <ni...@apache.org> wrote:
>  >> Author: niallp
>  >> Date: Thu Jul 23 15:56:03 2009
>  >> New Revision: 797120
>  >>
>  >> URL: http://svn.apache.org/viewvc?rev=797120&view=rev
>  >> Log:
>  >> Remove Maven 1 build
>  >>
>  >> Removed:
>  >>    commons/proper/codec/trunk/maven.xml
>  >>    commons/proper/codec/trunk/project.properties
>  >>    commons/proper/codec/trunk/project.xml
>  >>    commons/proper/codec/trunk/src/conf/
>  >> Modified:
>  >>    commons/proper/codec/trunk/build.xml
>  >>    commons/proper/codec/trunk/src/assembly/src.xml
>  >>
>  >> Modified: commons/proper/codec/trunk/build.xml
>  >> URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/build.xml?rev=797120&r1=797119&r2=797120&view=diff
>  >> ==============================================================================
>  >> --- commons/proper/codec/trunk/build.xml (original)
>  >> +++ commons/proper/codec/trunk/build.xml Thu Jul 23 15:56:03 2009
>  >> @@ -164,11 +164,8 @@
>  >>            <zipfileset dir="." includes="checkstyle.xml" prefix="${final.name}/"/>
>  >>            <zipfileset dir="." includes="default.properties" prefix="${final.name}/"/>
>  >>            <zipfileset dir="." includes="LICENSE*.txt" prefix="${final.name}/"/>
>  >> -           <zipfileset dir="." includes="maven.xml" prefix="${final.name}/"/>
>  >>            <zipfileset dir="." includes="NOTICE.txt" prefix="${final.name}/"/>
>  >>            <zipfileset dir="." includes="pom.xml" prefix="${final.name}/"/>
>  >> -           <zipfileset dir="." includes="project.properties" prefix="${final.name}/"/>
>  >> -           <zipfileset dir="." includes="project.xml" prefix="${final.name}/"/>
>  >>            <zipfileset dir="." includes="RELEASE-NOTES*.txt" prefix="${final.name}/"/>
>  >>         </zip>
>  >>         <checksum algorithm="md5" file="${zip-src.path}" fileext=".md5"/>
>  >>
>  >> Modified: commons/proper/codec/trunk/src/assembly/src.xml
>  >> URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/assembly/src.xml?rev=797120&r1=797119&r2=797120&view=diff
>  >> ==============================================================================
>  >> --- commons/proper/codec/trunk/src/assembly/src.xml (original)
>  >> +++ commons/proper/codec/trunk/src/assembly/src.xml Thu Jul 23 15:56:03 2009
>  >> @@ -30,11 +30,8 @@
>  >>                 <include>default.properties</include>
>  >>                 <include>LICENSE.txt</include>
>  >>                 <include>LICENSE-header.txt</include>
>  >> -                <include>maven.xml</include>
>  >>                 <include>NOTICE.txt</include>
>  >>                 <include>pom.xml</include>
>  >> -                <include>project.properties</include>
>  >> -                <include>project.xml</include>
>  >>                 <include>RELEASE-NOTES*.txt</include>
>  >>                 <include>RELEASE-PLAN</include>
>  >>                 <include>TODO</include>
>  >>
>  >>
>  >>
>  >
>  >
>  >
>  > --
>  > yours,
>  >
>  > Julius Davies
>  > 250-592-2284 (Home)
>  > 250-893-4579 (Mobile)
>  > http://juliusdavies.ca/logging.html
>  >
>  > ---------------------------------------------------------------------
>  > To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
>  > For additional commands, e-mail: dev-help@commons.apache.org
>  >
>  >
>
>  ---------------------------------------------------------------------
>  To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
>  For additional commands, e-mail: dev-help@commons.apache.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org


Re: svn commit: r797120 - in /commons/proper/codec/trunk: build.xml maven.xml project.properties project.xml src/assembly/src.xml src/conf/

Posted by Niall Pemberton <ni...@gmail.com>.
On Fri, Jul 24, 2009 at 5:40 AM, Julius Davies<ju...@gmail.com> wrote:
> Hi, Niall,
>
> This removal breaks the ant build:
>
> commons/proper/codec/trunk/src/conf/
>
> But it's easy to fix.  Just remove these 3 lines from build.xml:
>
> 53         <copy todir="${build.home}/conf" filtering="on">
> 54             <fileset dir="${conf.home}" includes="*.MF"/>
> 55         </copy>

Doh! Thanks for spotting this - fixed now.

Niall

> yours,
>
> Julius
>
>
> On Thu, Jul 23, 2009 at 8:56 AM, <ni...@apache.org> wrote:
>> Author: niallp
>> Date: Thu Jul 23 15:56:03 2009
>> New Revision: 797120
>>
>> URL: http://svn.apache.org/viewvc?rev=797120&view=rev
>> Log:
>> Remove Maven 1 build
>>
>> Removed:
>>    commons/proper/codec/trunk/maven.xml
>>    commons/proper/codec/trunk/project.properties
>>    commons/proper/codec/trunk/project.xml
>>    commons/proper/codec/trunk/src/conf/
>> Modified:
>>    commons/proper/codec/trunk/build.xml
>>    commons/proper/codec/trunk/src/assembly/src.xml
>>
>> Modified: commons/proper/codec/trunk/build.xml
>> URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/build.xml?rev=797120&r1=797119&r2=797120&view=diff
>> ==============================================================================
>> --- commons/proper/codec/trunk/build.xml (original)
>> +++ commons/proper/codec/trunk/build.xml Thu Jul 23 15:56:03 2009
>> @@ -164,11 +164,8 @@
>>            <zipfileset dir="." includes="checkstyle.xml" prefix="${final.name}/"/>
>>            <zipfileset dir="." includes="default.properties" prefix="${final.name}/"/>
>>            <zipfileset dir="." includes="LICENSE*.txt" prefix="${final.name}/"/>
>> -           <zipfileset dir="." includes="maven.xml" prefix="${final.name}/"/>
>>            <zipfileset dir="." includes="NOTICE.txt" prefix="${final.name}/"/>
>>            <zipfileset dir="." includes="pom.xml" prefix="${final.name}/"/>
>> -           <zipfileset dir="." includes="project.properties" prefix="${final.name}/"/>
>> -           <zipfileset dir="." includes="project.xml" prefix="${final.name}/"/>
>>            <zipfileset dir="." includes="RELEASE-NOTES*.txt" prefix="${final.name}/"/>
>>         </zip>
>>         <checksum algorithm="md5" file="${zip-src.path}" fileext=".md5"/>
>>
>> Modified: commons/proper/codec/trunk/src/assembly/src.xml
>> URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/assembly/src.xml?rev=797120&r1=797119&r2=797120&view=diff
>> ==============================================================================
>> --- commons/proper/codec/trunk/src/assembly/src.xml (original)
>> +++ commons/proper/codec/trunk/src/assembly/src.xml Thu Jul 23 15:56:03 2009
>> @@ -30,11 +30,8 @@
>>                 <include>default.properties</include>
>>                 <include>LICENSE.txt</include>
>>                 <include>LICENSE-header.txt</include>
>> -                <include>maven.xml</include>
>>                 <include>NOTICE.txt</include>
>>                 <include>pom.xml</include>
>> -                <include>project.properties</include>
>> -                <include>project.xml</include>
>>                 <include>RELEASE-NOTES*.txt</include>
>>                 <include>RELEASE-PLAN</include>
>>                 <include>TODO</include>
>>
>>
>>
>
>
>
> --
> yours,
>
> Julius Davies
> 250-592-2284 (Home)
> 250-893-4579 (Mobile)
> http://juliusdavies.ca/logging.html
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
> For additional commands, e-mail: dev-help@commons.apache.org
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org


Re: svn commit: r797120 - in /commons/proper/codec/trunk: build.xml maven.xml project.properties project.xml src/assembly/src.xml src/conf/

Posted by Julius Davies <ju...@gmail.com>.
Hi, Niall,

This removal breaks the ant build:

commons/proper/codec/trunk/src/conf/

But it's easy to fix.  Just remove these 3 lines from build.xml:

53         <copy todir="${build.home}/conf" filtering="on">
54             <fileset dir="${conf.home}" includes="*.MF"/>
55         </copy>


yours,

Julius


On Thu, Jul 23, 2009 at 8:56 AM, <ni...@apache.org> wrote:
> Author: niallp
> Date: Thu Jul 23 15:56:03 2009
> New Revision: 797120
>
> URL: http://svn.apache.org/viewvc?rev=797120&view=rev
> Log:
> Remove Maven 1 build
>
> Removed:
>    commons/proper/codec/trunk/maven.xml
>    commons/proper/codec/trunk/project.properties
>    commons/proper/codec/trunk/project.xml
>    commons/proper/codec/trunk/src/conf/
> Modified:
>    commons/proper/codec/trunk/build.xml
>    commons/proper/codec/trunk/src/assembly/src.xml
>
> Modified: commons/proper/codec/trunk/build.xml
> URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/build.xml?rev=797120&r1=797119&r2=797120&view=diff
> ==============================================================================
> --- commons/proper/codec/trunk/build.xml (original)
> +++ commons/proper/codec/trunk/build.xml Thu Jul 23 15:56:03 2009
> @@ -164,11 +164,8 @@
>            <zipfileset dir="." includes="checkstyle.xml" prefix="${final.name}/"/>
>            <zipfileset dir="." includes="default.properties" prefix="${final.name}/"/>
>            <zipfileset dir="." includes="LICENSE*.txt" prefix="${final.name}/"/>
> -           <zipfileset dir="." includes="maven.xml" prefix="${final.name}/"/>
>            <zipfileset dir="." includes="NOTICE.txt" prefix="${final.name}/"/>
>            <zipfileset dir="." includes="pom.xml" prefix="${final.name}/"/>
> -           <zipfileset dir="." includes="project.properties" prefix="${final.name}/"/>
> -           <zipfileset dir="." includes="project.xml" prefix="${final.name}/"/>
>            <zipfileset dir="." includes="RELEASE-NOTES*.txt" prefix="${final.name}/"/>
>         </zip>
>         <checksum algorithm="md5" file="${zip-src.path}" fileext=".md5"/>
>
> Modified: commons/proper/codec/trunk/src/assembly/src.xml
> URL: http://svn.apache.org/viewvc/commons/proper/codec/trunk/src/assembly/src.xml?rev=797120&r1=797119&r2=797120&view=diff
> ==============================================================================
> --- commons/proper/codec/trunk/src/assembly/src.xml (original)
> +++ commons/proper/codec/trunk/src/assembly/src.xml Thu Jul 23 15:56:03 2009
> @@ -30,11 +30,8 @@
>                 <include>default.properties</include>
>                 <include>LICENSE.txt</include>
>                 <include>LICENSE-header.txt</include>
> -                <include>maven.xml</include>
>                 <include>NOTICE.txt</include>
>                 <include>pom.xml</include>
> -                <include>project.properties</include>
> -                <include>project.xml</include>
>                 <include>RELEASE-NOTES*.txt</include>
>                 <include>RELEASE-PLAN</include>
>                 <include>TODO</include>
>
>
>



-- 
yours,

Julius Davies
250-592-2284 (Home)
250-893-4579 (Mobile)
http://juliusdavies.ca/logging.html

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
For additional commands, e-mail: dev-help@commons.apache.org