You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by bi...@apache.org on 2011/06/04 22:42:36 UTC

svn commit: r1131491 - /maven/pom/trunk/maven/pom.xml

Author: bimargulies
Date: Sat Jun  4 20:42:36 2011
New Revision: 1131491

URL: http://svn.apache.org/viewvc?rev=1131491&view=rev
Log:
Update the Maven shared pom to Java 1.5, cobertura 2.5.

Modified:
    maven/pom/trunk/maven/pom.xml

Modified: maven/pom/trunk/maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1131491&r1=1131490&r2=1131491&view=diff
==============================================================================
--- maven/pom/trunk/maven/pom.xml (original)
+++ maven/pom/trunk/maven/pom.xml Sat Jun  4 20:42:36 2011
@@ -622,8 +622,22 @@ under the License.
         </property>
       </activation>
       <build>
+	<pluginManagement>
+	  <plugins>
+	    <!-- The Maven universe targets Java 1.5 -->
+	    <plugin>
+	      <groupId>org.apache.maven.plugins</groupId>
+	      <artifactId>maven-compiler-plugin</artifactId>
+	      <version>2.3.2</version>
+	      <configuration>
+		<source>1.5</source>
+		<target>1.5</target>
+		<encoding>${project.build.sourceEncoding}</encoding>
+	      </configuration>
+	    </plugin>
+	  </plugins>
+	</pluginManagement>
         <plugins>
-
           <!--<plugin>
           Clirr needs to be more flexble before we can force this everywhere. New releases that don't have previous artifacts to compare cause Clirr to blow up. And Clirr needs to be smart enough to only look at the previous release artifact so we can make this work during snapshot builds, otherwise it just blows up when you try to do a release.
             <groupId>org.codehaus.mojo</groupId>
@@ -668,7 +682,7 @@ under the License.
           <plugin>
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>cobertura-maven-plugin</artifactId>
-            <version>2.2</version>
+            <version>2.5</version>
             <executions>
               <execution>
                 <phase>clean</phase>
@@ -717,10 +731,9 @@ under the License.
             </configuration>
           </plugin>
           <plugin>
-            <!-- NOTE: 2.3 or more requires java 1.5 -->
             <groupId>org.codehaus.mojo</groupId>
             <artifactId>cobertura-maven-plugin</artifactId>
-            <version>2.2</version>
+            <version>2.5</version>
           </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>



Re: svn commit: r1131491 - /maven/pom/trunk/maven/pom.xml

Posted by Benson Margulies <bi...@gmail.com>.
I was editing the POM in aquamacs, where I thought I had banished all tabs.

On Sat, Jun 4, 2011 at 5:30 PM, Robert Scholte <rf...@codehaus.org> wrote:
>
> IIRC, Eclipse Helios has splitted the way of indentation for javacode and XML. I had to set it by hand for XML in the past.
>
> -Robert
>
>> From: bimargulies@gmail.com
>> Date: Sat, 4 Jun 2011 17:10:23 -0400
>> Subject: Re: svn commit: r1131491 - /maven/pom/trunk/maven/pom.xml
>> To: dev@maven.apache.org
>>
>> I personally gave a no-tab policy, I will have to figure out how I got
>> a tab into there.
>>
>> On Jun 4, 2011, at 5:01 PM, Dennis Lundberg <de...@apache.org> wrote:
>>
>> > Yes, let's move to Java 5 across the board!
>> >
>> >
>> > Benson, we have a no-tab code style here at the Maven project. You can
>> > find code style guidelines here:
>> >
>> > http://maven.apache.org/developers/conventions/code.html
>> >
>> > and Maven code style templates for Eclipse and IDEA here:
>> >
>> > http://maven.apache.org/developers/committer-environment.html
>> >
>> > and general info for Maven developers here:
>> >
>> > http://maven.apache.org/developers/index.html
>> >
>> >
>> > On 2011-06-04 22:42, bimargulies@apache.org wrote:
>> >> Author: bimargulies
>> >> Date: Sat Jun 4 20:42:36 2011
>> >> New Revision: 1131491
>> >>
>> >> URL: http://svn.apache.org/viewvc?rev=1131491&view=rev
>> >> Log:
>> >> Update the Maven shared pom to Java 1.5, cobertura 2.5.
>> >>
>> >> Modified:
>> >> maven/pom/trunk/maven/pom.xml
>> >>
>> >> Modified: maven/pom/trunk/maven/pom.xml
>> >> URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1131491&r1=1131490&r2=1131491&view=diff
>> >> ==============================================================================
>> >> --- maven/pom/trunk/maven/pom.xml (original)
>> >> +++ maven/pom/trunk/maven/pom.xml Sat Jun 4 20:42:36 2011
>> >> @@ -622,8 +622,22 @@ under the License.
>> >> </property>
>> >> </activation>
>> >> <build>
>> >> + <pluginManagement>
>> >> + <plugins>
>> >> + <!-- The Maven universe targets Java 1.5 -->
>> >> + <plugin>
>> >> + <groupId>org.apache.maven.plugins</groupId>
>> >> + <artifactId>maven-compiler-plugin</artifactId>
>> >> + <version>2.3.2</version>
>> >> + <configuration>
>> >> + <source>1.5</source>
>> >> + <target>1.5</target>
>> >> + <encoding>${project.build.sourceEncoding}</encoding>
>> >> + </configuration>
>> >> + </plugin>
>> >> + </plugins>
>> >> + </pluginManagement>
>> >> <plugins>
>> >> -
>> >> <!--<plugin>
>> >> Clirr needs to be more flexble before we can force this everywhere. New releases that don't have previous artifacts to compare cause Clirr to blow up. And Clirr needs to be smart enough to only look at the previous release artifact so we can make this work during snapshot builds, otherwise it just blows up when you try to do a release.
>> >> <groupId>org.codehaus.mojo</groupId>
>> >> @@ -668,7 +682,7 @@ under the License.
>> >> <plugin>
>> >> <groupId>org.codehaus.mojo</groupId>
>> >> <artifactId>cobertura-maven-plugin</artifactId>
>> >> - <version>2.2</version>
>> >> + <version>2.5</version>
>> >> <executions>
>> >> <execution>
>> >> <phase>clean</phase>
>> >> @@ -717,10 +731,9 @@ under the License.
>> >> </configuration>
>> >> </plugin>
>> >> <plugin>
>> >> - <!-- NOTE: 2.3 or more requires java 1.5 -->
>> >> <groupId>org.codehaus.mojo</groupId>
>> >> <artifactId>cobertura-maven-plugin</artifactId>
>> >> - <version>2.2</version>
>> >> + <version>2.5</version>
>> >> </plugin>
>> >> <plugin>
>> >> <groupId>org.apache.maven.plugins</groupId>
>> >>
>> >>
>> >>
>> >
>> >
>> > --
>> > Dennis Lundberg
>> >
>> > ---------------------------------------------------------------------
>> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> > For additional commands, e-mail: dev-help@maven.apache.org
>> >
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> For additional commands, e-mail: dev-help@maven.apache.org
>>
>

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


RE: svn commit: r1131491 - /maven/pom/trunk/maven/pom.xml

Posted by Robert Scholte <rf...@codehaus.org>.
IIRC, Eclipse Helios has splitted the way of indentation for javacode and XML. I had to set it by hand for XML in the past.
 
-Robert
 
> From: bimargulies@gmail.com
> Date: Sat, 4 Jun 2011 17:10:23 -0400
> Subject: Re: svn commit: r1131491 - /maven/pom/trunk/maven/pom.xml
> To: dev@maven.apache.org
> 
> I personally gave a no-tab policy, I will have to figure out how I got
> a tab into there.
> 
> On Jun 4, 2011, at 5:01 PM, Dennis Lundberg <de...@apache.org> wrote:
> 
> > Yes, let's move to Java 5 across the board!
> >
> >
> > Benson, we have a no-tab code style here at the Maven project. You can
> > find code style guidelines here:
> >
> > http://maven.apache.org/developers/conventions/code.html
> >
> > and Maven code style templates for Eclipse and IDEA here:
> >
> > http://maven.apache.org/developers/committer-environment.html
> >
> > and general info for Maven developers here:
> >
> > http://maven.apache.org/developers/index.html
> >
> >
> > On 2011-06-04 22:42, bimargulies@apache.org wrote:
> >> Author: bimargulies
> >> Date: Sat Jun 4 20:42:36 2011
> >> New Revision: 1131491
> >>
> >> URL: http://svn.apache.org/viewvc?rev=1131491&view=rev
> >> Log:
> >> Update the Maven shared pom to Java 1.5, cobertura 2.5.
> >>
> >> Modified:
> >> maven/pom/trunk/maven/pom.xml
> >>
> >> Modified: maven/pom/trunk/maven/pom.xml
> >> URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1131491&r1=1131490&r2=1131491&view=diff
> >> ==============================================================================
> >> --- maven/pom/trunk/maven/pom.xml (original)
> >> +++ maven/pom/trunk/maven/pom.xml Sat Jun 4 20:42:36 2011
> >> @@ -622,8 +622,22 @@ under the License.
> >> </property>
> >> </activation>
> >> <build>
> >> + <pluginManagement>
> >> + <plugins>
> >> + <!-- The Maven universe targets Java 1.5 -->
> >> + <plugin>
> >> + <groupId>org.apache.maven.plugins</groupId>
> >> + <artifactId>maven-compiler-plugin</artifactId>
> >> + <version>2.3.2</version>
> >> + <configuration>
> >> + <source>1.5</source>
> >> + <target>1.5</target>
> >> + <encoding>${project.build.sourceEncoding}</encoding>
> >> + </configuration>
> >> + </plugin>
> >> + </plugins>
> >> + </pluginManagement>
> >> <plugins>
> >> -
> >> <!--<plugin>
> >> Clirr needs to be more flexble before we can force this everywhere. New releases that don't have previous artifacts to compare cause Clirr to blow up. And Clirr needs to be smart enough to only look at the previous release artifact so we can make this work during snapshot builds, otherwise it just blows up when you try to do a release.
> >> <groupId>org.codehaus.mojo</groupId>
> >> @@ -668,7 +682,7 @@ under the License.
> >> <plugin>
> >> <groupId>org.codehaus.mojo</groupId>
> >> <artifactId>cobertura-maven-plugin</artifactId>
> >> - <version>2.2</version>
> >> + <version>2.5</version>
> >> <executions>
> >> <execution>
> >> <phase>clean</phase>
> >> @@ -717,10 +731,9 @@ under the License.
> >> </configuration>
> >> </plugin>
> >> <plugin>
> >> - <!-- NOTE: 2.3 or more requires java 1.5 -->
> >> <groupId>org.codehaus.mojo</groupId>
> >> <artifactId>cobertura-maven-plugin</artifactId>
> >> - <version>2.2</version>
> >> + <version>2.5</version>
> >> </plugin>
> >> <plugin>
> >> <groupId>org.apache.maven.plugins</groupId>
> >>
> >>
> >>
> >
> >
> > --
> > Dennis Lundberg
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> > For additional commands, e-mail: dev-help@maven.apache.org
> >
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
> 
 		 	   		  

Re: svn commit: r1131491 - /maven/pom/trunk/maven/pom.xml

Posted by Benson Margulies <bi...@gmail.com>.
I personally gave a no-tab policy, I will have to figure out how I got
a tab into there.

On Jun 4, 2011, at 5:01 PM, Dennis Lundberg <de...@apache.org> wrote:

> Yes, let's move to Java 5 across the board!
>
>
> Benson, we have a no-tab code style here at the Maven project. You can
> find code style guidelines here:
>
> http://maven.apache.org/developers/conventions/code.html
>
> and Maven code style templates for Eclipse and IDEA here:
>
> http://maven.apache.org/developers/committer-environment.html
>
> and general info for Maven developers here:
>
> http://maven.apache.org/developers/index.html
>
>
> On 2011-06-04 22:42, bimargulies@apache.org wrote:
>> Author: bimargulies
>> Date: Sat Jun  4 20:42:36 2011
>> New Revision: 1131491
>>
>> URL: http://svn.apache.org/viewvc?rev=1131491&view=rev
>> Log:
>> Update the Maven shared pom to Java 1.5, cobertura 2.5.
>>
>> Modified:
>>    maven/pom/trunk/maven/pom.xml
>>
>> Modified: maven/pom/trunk/maven/pom.xml
>> URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1131491&r1=1131490&r2=1131491&view=diff
>> ==============================================================================
>> --- maven/pom/trunk/maven/pom.xml (original)
>> +++ maven/pom/trunk/maven/pom.xml Sat Jun  4 20:42:36 2011
>> @@ -622,8 +622,22 @@ under the License.
>>         </property>
>>       </activation>
>>       <build>
>> +    <pluginManagement>
>> +      <plugins>
>> +        <!-- The Maven universe targets Java 1.5 -->
>> +        <plugin>
>> +          <groupId>org.apache.maven.plugins</groupId>
>> +          <artifactId>maven-compiler-plugin</artifactId>
>> +          <version>2.3.2</version>
>> +          <configuration>
>> +        <source>1.5</source>
>> +        <target>1.5</target>
>> +        <encoding>${project.build.sourceEncoding}</encoding>
>> +          </configuration>
>> +        </plugin>
>> +      </plugins>
>> +    </pluginManagement>
>>         <plugins>
>> -
>>           <!--<plugin>
>>           Clirr needs to be more flexble before we can force this everywhere. New releases that don't have previous artifacts to compare cause Clirr to blow up. And Clirr needs to be smart enough to only look at the previous release artifact so we can make this work during snapshot builds, otherwise it just blows up when you try to do a release.
>>             <groupId>org.codehaus.mojo</groupId>
>> @@ -668,7 +682,7 @@ under the License.
>>           <plugin>
>>             <groupId>org.codehaus.mojo</groupId>
>>             <artifactId>cobertura-maven-plugin</artifactId>
>> -            <version>2.2</version>
>> +            <version>2.5</version>
>>             <executions>
>>               <execution>
>>                 <phase>clean</phase>
>> @@ -717,10 +731,9 @@ under the License.
>>             </configuration>
>>           </plugin>
>>           <plugin>
>> -            <!-- NOTE: 2.3 or more requires java 1.5 -->
>>             <groupId>org.codehaus.mojo</groupId>
>>             <artifactId>cobertura-maven-plugin</artifactId>
>> -            <version>2.2</version>
>> +            <version>2.5</version>
>>           </plugin>
>>           <plugin>
>>             <groupId>org.apache.maven.plugins</groupId>
>>
>>
>>
>
>
> --
> Dennis Lundberg
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>

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


Re: svn commit: r1131491 - /maven/pom/trunk/maven/pom.xml

Posted by Dennis Lundberg <de...@apache.org>.
Yes, let's move to Java 5 across the board!


Benson, we have a no-tab code style here at the Maven project. You can
find code style guidelines here:

http://maven.apache.org/developers/conventions/code.html

and Maven code style templates for Eclipse and IDEA here:

http://maven.apache.org/developers/committer-environment.html

and general info for Maven developers here:

http://maven.apache.org/developers/index.html


On 2011-06-04 22:42, bimargulies@apache.org wrote:
> Author: bimargulies
> Date: Sat Jun  4 20:42:36 2011
> New Revision: 1131491
> 
> URL: http://svn.apache.org/viewvc?rev=1131491&view=rev
> Log:
> Update the Maven shared pom to Java 1.5, cobertura 2.5.
> 
> Modified:
>     maven/pom/trunk/maven/pom.xml
> 
> Modified: maven/pom/trunk/maven/pom.xml
> URL: http://svn.apache.org/viewvc/maven/pom/trunk/maven/pom.xml?rev=1131491&r1=1131490&r2=1131491&view=diff
> ==============================================================================
> --- maven/pom/trunk/maven/pom.xml (original)
> +++ maven/pom/trunk/maven/pom.xml Sat Jun  4 20:42:36 2011
> @@ -622,8 +622,22 @@ under the License.
>          </property>
>        </activation>
>        <build>
> +	<pluginManagement>
> +	  <plugins>
> +	    <!-- The Maven universe targets Java 1.5 -->
> +	    <plugin>
> +	      <groupId>org.apache.maven.plugins</groupId>
> +	      <artifactId>maven-compiler-plugin</artifactId>
> +	      <version>2.3.2</version>
> +	      <configuration>
> +		<source>1.5</source>
> +		<target>1.5</target>
> +		<encoding>${project.build.sourceEncoding}</encoding>
> +	      </configuration>
> +	    </plugin>
> +	  </plugins>
> +	</pluginManagement>
>          <plugins>
> -
>            <!--<plugin>
>            Clirr needs to be more flexble before we can force this everywhere. New releases that don't have previous artifacts to compare cause Clirr to blow up. And Clirr needs to be smart enough to only look at the previous release artifact so we can make this work during snapshot builds, otherwise it just blows up when you try to do a release.
>              <groupId>org.codehaus.mojo</groupId>
> @@ -668,7 +682,7 @@ under the License.
>            <plugin>
>              <groupId>org.codehaus.mojo</groupId>
>              <artifactId>cobertura-maven-plugin</artifactId>
> -            <version>2.2</version>
> +            <version>2.5</version>
>              <executions>
>                <execution>
>                  <phase>clean</phase>
> @@ -717,10 +731,9 @@ under the License.
>              </configuration>
>            </plugin>
>            <plugin>
> -            <!-- NOTE: 2.3 or more requires java 1.5 -->
>              <groupId>org.codehaus.mojo</groupId>
>              <artifactId>cobertura-maven-plugin</artifactId>
> -            <version>2.2</version>
> +            <version>2.5</version>
>            </plugin>
>            <plugin>
>              <groupId>org.apache.maven.plugins</groupId>
> 
> 
> 


-- 
Dennis Lundberg

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