You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ol...@apache.org on 2011/12/09 21:42:06 UTC
svn commit: r1212618 - in /tomcat/maven-plugin/trunk:
common-tomcat-maven-plugin/pom.xml pom.xml
Author: olamy
Date: Fri Dec 9 20:42:05 2011
New Revision: 1212618
URL: http://svn.apache.org/viewvc?rev=1212618&view=rev
Log:
upgrade some dependencies version
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/pom.xml
Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml?rev=1212618&r1=1212617&r2=1212618&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml Fri Dec 9 20:42:05 2011
@@ -61,6 +61,11 @@
</dependency>
<dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>fluent-hc</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
<version>7.0.22</version>
Modified: tomcat/maven-plugin/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1212618&r1=1212617&r2=1212618&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Fri Dec 9 20:42:05 2011
@@ -46,8 +46,8 @@
<mavenVersion>2.0.8</mavenVersion>
<!-- Test settings -->
<maven.test.redirectTestOutputToFile>false</maven.test.redirectTestOutputToFile>
- <failsafe.version>2.10</failsafe.version>
- <junit.version>4.9</junit.version>
+ <failsafe.version>2.11</failsafe.version>
+ <junit.version>4.10</junit.version>
<it.sleep.time>2000</it.sleep.time>
<verifier.maven.debug>false</verifier.maven.debug>
<verifier.debugJvm>false</verifier.debugJvm>
@@ -471,22 +471,27 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.1.2</version>
+ <version>4.2-alpha1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>fluent-hc</artifactId>
+ <version>4.2-alpha1</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.6.1</version>
+ <version>1.6.4</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
- <version>0.9.30</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>0.9.30</version>
+ <version>1.0.0</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -507,7 +512,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.10</version>
+ <version>2.11</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1212618 - in /tomcat/maven-plugin/trunk:
common-tomcat-maven-plugin/pom.xml pom.xml
Posted by Olivier Lamy <ol...@apache.org>.
2011/12/9 Konstantin Kolinko <kn...@gmail.com>:
> 2011/12/10 <ol...@apache.org>:
>> Author: olamy
>> Date: Fri Dec 9 20:42:05 2011
>> New Revision: 1212618
>>
>> URL: http://svn.apache.org/viewvc?rev=1212618&view=rev
>> Log:
>> upgrade some dependencies version
>>
>> Modified:
>> tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml
>> tomcat/maven-plugin/trunk/pom.xml
>>
>> Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml
>> URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml?rev=1212618&r1=1212617&r2=1212618&view=diff
>> ==============================================================================
>> --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml (original)
>> +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml Fri Dec 9 20:42:05 2011
>> @@ -61,6 +61,11 @@
>> </dependency>
>>
>> <dependency>
>> + <groupId>org.apache.httpcomponents</groupId>
>> + <artifactId>fluent-hc</artifactId>
>> + </dependency>
>> +
>> + <dependency>
>> <groupId>org.apache.tomcat</groupId>
>> <artifactId>tomcat-catalina</artifactId>
>> <version>7.0.22</version>
>
> 7.0.23?
Done in the top level pom (see the property
<tomcat7Version>7.0.23</tomcat7Version> )
in fact the version it's not really important here as the real version
used by the tomcat7 plugin is defined on his own pom.
See the scope which is provided to ensure we don't have it by
transitivity in the tomcat6 plugin.
In this common module the goal is only to have o.a.c.l.WebappLoader
for compilation purpose.
Btw I see an issue as there are two properties to define the tomcat7
version used. I will fix that.
>
> Best regards,
> Konstantin Kolinko
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
--
Olivier Lamy
Talend: http://coders.talend.com
http://twitter.com/olamy | http://linkedin.com/in/olamy
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1212618 - in /tomcat/maven-plugin/trunk:
common-tomcat-maven-plugin/pom.xml pom.xml
Posted by Konstantin Kolinko <kn...@gmail.com>.
2011/12/10 <ol...@apache.org>:
> Author: olamy
> Date: Fri Dec 9 20:42:05 2011
> New Revision: 1212618
>
> URL: http://svn.apache.org/viewvc?rev=1212618&view=rev
> Log:
> upgrade some dependencies version
>
> Modified:
> tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml
> tomcat/maven-plugin/trunk/pom.xml
>
> Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml
> URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml?rev=1212618&r1=1212617&r2=1212618&view=diff
> ==============================================================================
> --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml (original)
> +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml Fri Dec 9 20:42:05 2011
> @@ -61,6 +61,11 @@
> </dependency>
>
> <dependency>
> + <groupId>org.apache.httpcomponents</groupId>
> + <artifactId>fluent-hc</artifactId>
> + </dependency>
> +
> + <dependency>
> <groupId>org.apache.tomcat</groupId>
> <artifactId>tomcat-catalina</artifactId>
> <version>7.0.22</version>
7.0.23?
Best regards,
Konstantin Kolinko
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org