You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ie...@apache.org on 2012/03/11 22:22:28 UTC
svn commit: r1299452 - /james/server/trunk/pom.xml
Author: ieugen
Date: Sun Mar 11 21:22:28 2012
New Revision: 1299452
URL: http://svn.apache.org/viewvc?rev=1299452&view=rev
Log:
JAMES-1393
- bumped junit version to 4.10
Issue #JAMES-1393 - Upgrate all test suites to junit 4.10
Modified:
james/server/trunk/pom.xml
Modified: james/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1299452&r1=1299451&r2=1299452&view=diff
==============================================================================
--- james/server/trunk/pom.xml (original)
+++ james/server/trunk/pom.xml Sun Mar 11 21:22:28 2012
@@ -91,8 +91,8 @@
<activemq.version>5.4.2</activemq.version>
<camel.version>2.5.0</camel.version>
<derby.version>10.7.1.1</derby.version>
- <hadoop.version>0.20.205.0</hadoop.version>
- <hbase.version>0.90.4</hbase.version>
+ <hadoop.version>1.0.1</hadoop.version>
+ <hbase.version>0.92.0</hbase.version>
<imap.version>0.3</imap.version>
<jackrabbit.version>2.2.5</jackrabbit.version>
<javax.activation.groupId>javax.activation</javax.activation.groupId>
@@ -751,7 +751,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.10</version>
<scope>test</scope>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
Re: svn commit: r1299452 - /james/server/trunk/pom.xml
Posted by Ioan Eugen Stan <st...@gmail.com>.
Pe 15.03.2012 13:41, Norman Maurer a scris:
> A tab should be four spaces..
>
> bye,
> Norman
>
Hi Norman,
With 4 spaces, the alignment didn't look ok. Now everything looks fine
but I wish to double-check with someone else.
Please apply the patch and check if things are the way they should be.
If I get green I will commit, if not, I will use 4 spaces.
Cheers,
> Von meinem iPad gesendet
>
> Am 15.03.2012 um 12:38 schrieb Ioan Eugen Stan<st...@gmail.com>:
>
>> 2012/3/13 Ioan Eugen Stan<st...@gmail.com>:
>>> Pe 13.03.2012 16:30, Eric Charles a scris:
>>>
>>>> Hi Ioan,
>>>>
>>>> You could play with svn revert or merge, but just replace and commit the
>>>> new files.
>>>>
>>>> Eric
>>>>
>>>
>>> I was hoping for a recipe. Looks like I'm not in luck. I will fiddle around
>>> and hope to get things right.
>>>
>>> Wish me luck,
>>
>>
>> Ok, sorry it took this long, but I think I have a solution. I've
>> attached the diff. Eric, could you apply it and see if it makes things
>> good before I commit the changes?
>>
>> I ran commands like:
>>
>> $find queue-jms/src/test/ -name *.java -print | xargs sed -i 's/\t/ /g'
>>
>> To find all java test files and change all tabs from each file into 8
>> spaces (so alignment would turn out ok).
>> I've also attached it to
>> https://issues.apache.org/jira/browse/JAMES-1393 if it doesn't get on
>> the ml.
>>
>> I've also unchecked the NetBeans option that ignored white space in diffs.
>>
>> Cheers,
>>
>> --
>> Ioan Eugen Stan
>> http://ieugen.blogspot.com/
>> <tabs-fix.patch.gz>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
>> For additional commands, e-mail: server-dev-help@james.apache.org
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
> For additional commands, e-mail: server-dev-help@james.apache.org
>
--
Ioan Eugen Stan
http://ieugen.blogspot.com
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
Re: svn commit: r1299452 - /james/server/trunk/pom.xml
Posted by Norman Maurer <no...@googlemail.com>.
A tab should be four spaces..
bye,
Norman
Von meinem iPad gesendet
Am 15.03.2012 um 12:38 schrieb Ioan Eugen Stan <st...@gmail.com>:
> 2012/3/13 Ioan Eugen Stan <st...@gmail.com>:
>> Pe 13.03.2012 16:30, Eric Charles a scris:
>>
>>> Hi Ioan,
>>>
>>> You could play with svn revert or merge, but just replace and commit the
>>> new files.
>>>
>>> Eric
>>>
>>
>> I was hoping for a recipe. Looks like I'm not in luck. I will fiddle around
>> and hope to get things right.
>>
>> Wish me luck,
>
>
> Ok, sorry it took this long, but I think I have a solution. I've
> attached the diff. Eric, could you apply it and see if it makes things
> good before I commit the changes?
>
> I ran commands like:
>
> $find queue-jms/src/test/ -name *.java -print | xargs sed -i 's/\t/ /g'
>
> To find all java test files and change all tabs from each file into 8
> spaces (so alignment would turn out ok).
> I've also attached it to
> https://issues.apache.org/jira/browse/JAMES-1393 if it doesn't get on
> the ml.
>
> I've also unchecked the NetBeans option that ignored white space in diffs.
>
> Cheers,
>
> --
> Ioan Eugen Stan
> http://ieugen.blogspot.com/
> <tabs-fix.patch.gz>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
> For additional commands, e-mail: server-dev-help@james.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
Re: svn commit: r1299452 - /james/server/trunk/pom.xml
Posted by Ioan Eugen Stan <st...@gmail.com>.
2012/3/13 Ioan Eugen Stan <st...@gmail.com>:
> Pe 13.03.2012 16:30, Eric Charles a scris:
>
>> Hi Ioan,
>>
>> You could play with svn revert or merge, but just replace and commit the
>> new files.
>>
>> Eric
>>
>
> I was hoping for a recipe. Looks like I'm not in luck. I will fiddle around
> and hope to get things right.
>
> Wish me luck,
Ok, sorry it took this long, but I think I have a solution. I've
attached the diff. Eric, could you apply it and see if it makes things
good before I commit the changes?
I ran commands like:
$find queue-jms/src/test/ -name *.java -print | xargs sed -i 's/\t/ /g'
To find all java test files and change all tabs from each file into 8
spaces (so alignment would turn out ok).
I've also attached it to
https://issues.apache.org/jira/browse/JAMES-1393 if it doesn't get on
the ml.
I've also unchecked the NetBeans option that ignored white space in diffs.
Cheers,
--
Ioan Eugen Stan
http://ieugen.blogspot.com/
Re: svn commit: r1299452 - /james/server/trunk/pom.xml
Posted by Ioan Eugen Stan <st...@gmail.com>.
Pe 13.03.2012 16:30, Eric Charles a scris:
> Hi Ioan,
>
> You could play with svn revert or merge, but just replace and commit the
> new files.
>
> Eric
>
I was hoping for a recipe. Looks like I'm not in luck. I will fiddle
around and hope to get things right.
Wish me luck,
--
Ioan Eugen Stan
http://ieugen.blogspot.com
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
Re: svn commit: r1299452 - /james/server/trunk/pom.xml
Posted by Eric Charles <er...@apache.org>.
Hi Ioan,
You could play with svn revert or merge, but just replace and commit the
new files.
Eric
On 12/03/12 20:44, Ioan Eugen Stan wrote:
> 2012/3/12 Eric Charles<er...@apache.org>:
>> Hi Ioan,
>>
>> Sure, no problem.
>>
>> It's about xml and java.
>> If you look for example at
>> http://svn.apache.org/viewvc?view=revision&revision=1299509, you will see
>> many diff are about space replaced with tabs.
>>
>> So just list your Sunday 'svn commit', are find/replace '\t' with ' '.
>>
>> Thx again,
>>
>> Eric
>>
>
> I changed the formatting settings in NetBeans: expand tabs to spaces,
> use 4 spaces for tab.
> I made a lot of commits on sunday and I'm not that proficient in using
> svn. Could you please give me more details on how to do that?
> I will search the web in the mean time, but you could save me some effort.
>
> Thanks,
>
--
eric | http://about.echarles.net | @echarles
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
Re: svn commit: r1299452 - /james/server/trunk/pom.xml
Posted by Ioan Eugen Stan <st...@gmail.com>.
2012/3/12 Eric Charles <er...@apache.org>:
> Hi Ioan,
>
> Sure, no problem.
>
> It's about xml and java.
> If you look for example at
> http://svn.apache.org/viewvc?view=revision&revision=1299509, you will see
> many diff are about space replaced with tabs.
>
> So just list your Sunday 'svn commit', are find/replace '\t' with ' '.
>
> Thx again,
>
> Eric
>
I changed the formatting settings in NetBeans: expand tabs to spaces,
use 4 spaces for tab.
I made a lot of commits on sunday and I'm not that proficient in using
svn. Could you please give me more details on how to do that?
I will search the web in the mean time, but you could save me some effort.
Thanks,
--
Ioan Eugen Stan
http://ieugen.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
Re: svn commit: r1299452 - /james/server/trunk/pom.xml
Posted by Eric Charles <er...@apache.org>.
Hi Ioan,
Sure, no problem.
It's about xml and java.
If you look for example at
http://svn.apache.org/viewvc?view=revision&revision=1299509, you will
see many diff are about space replaced with tabs.
So just list your Sunday 'svn commit', are find/replace '\t' with ' '.
Thx again,
Eric
On 12/03/12 10:46, Ioan Eugen Stan wrote:
> 2012/3/12 Eric Charles<er...@apache.org>:
>> Hi Ioan,
>>
>> Seems like your editor is configured with tabs...
>> We use 4 spaces for tabs. Could you recommit your last changes with tabs
>> replaced by 4 spaces ?
>>
>> Thx :)
>> Eric
>>
>
> Sure, I will check my formatting settings later when I get home and
> re-commit then. Are the changes in the code or just xml?
>
> Thanks,
>
--
eric | http://about.echarles.net | @echarles
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
Re: svn commit: r1299452 - /james/server/trunk/pom.xml
Posted by Ioan Eugen Stan <st...@gmail.com>.
2012/3/12 Eric Charles <er...@apache.org>:
> Hi Ioan,
>
> Seems like your editor is configured with tabs...
> We use 4 spaces for tabs. Could you recommit your last changes with tabs
> replaced by 4 spaces ?
>
> Thx :)
> Eric
>
Sure, I will check my formatting settings later when I get home and
re-commit then. Are the changes in the code or just xml?
Thanks,
--
Ioan Eugen Stan
http://ieugen.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
Re: svn commit: r1299452 - /james/server/trunk/pom.xml
Posted by Eric Charles <er...@apache.org>.
Hi Ioan,
Seems like your editor is configured with tabs...
We use 4 spaces for tabs. Could you recommit your last changes with tabs
replaced by 4 spaces ?
Thx :)
Eric
On 11/03/12 22:22, ieugen@apache.org wrote:
> Author: ieugen
> Date: Sun Mar 11 21:22:28 2012
> New Revision: 1299452
>
> URL: http://svn.apache.org/viewvc?rev=1299452&view=rev
> Log:
> JAMES-1393
>
> - bumped junit version to 4.10
> Issue #JAMES-1393 - Upgrate all test suites to junit 4.10
>
> Modified:
> james/server/trunk/pom.xml
>
> Modified: james/server/trunk/pom.xml
> URL: http://svn.apache.org/viewvc/james/server/trunk/pom.xml?rev=1299452&r1=1299451&r2=1299452&view=diff
> ==============================================================================
> --- james/server/trunk/pom.xml (original)
> +++ james/server/trunk/pom.xml Sun Mar 11 21:22:28 2012
> @@ -91,8 +91,8 @@
> <activemq.version>5.4.2</activemq.version>
> <camel.version>2.5.0</camel.version>
> <derby.version>10.7.1.1</derby.version>
> -<hadoop.version>0.20.205.0</hadoop.version>
> -<hbase.version>0.90.4</hbase.version>
> +<hadoop.version>1.0.1</hadoop.version>
> +<hbase.version>0.92.0</hbase.version>
> <imap.version>0.3</imap.version>
> <jackrabbit.version>2.2.5</jackrabbit.version>
> <javax.activation.groupId>javax.activation</javax.activation.groupId>
> @@ -751,7 +751,7 @@
> <dependency>
> <groupId>junit</groupId>
> <artifactId>junit</artifactId>
> -<version>3.8.1</version>
> +<version>4.10</version>
> <scope>test</scope>
> </dependency>
> <dependency>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
> For additional commands, e-mail: server-dev-help@james.apache.org
>
--
eric | http://about.echarles.net | @echarles
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org