Author: olamy
Date: Tue Oct 22 01:01:50 2013
New Revision: 1534438
URL: http://svn.apache.org/r1534438
Log:
upgrade some dependencies versions
Modified:
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
Modified: tomcat/maven-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1534438&r1=1534437&r2=1534438&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Tue Oct 22 01:01:50 2013
@@ -602,17 +602,17 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.2</version>
+ <version>1.7.5</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
- <version>1.7.2</version>
+ <version>1.7.5</version>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
- <version>2.0-beta3</version>
+ <version>2.0-beta9</version>
</dependency>
</dependencies>
</dependencyManagement>
Modified:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java?rev=1534438&r1=1534437&r2=1534438&view=diff
==============================================================================
---
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/java/org/apache/tomcat/maven/it/AbstractWarProjectIT.java
Tue Oct 22 01:01:50 2013
@@ -132,7 +132,7 @@ public abstract class AbstractWarProject
thread.start();
LOG.info( "Executing verify on " + webappHome.getAbsolutePath() );
- verifier.executeGoal( "verify" );
+ verifier.executeGoal( getGoal() );
verifier.displayStreamBuffers();
@@ -141,6 +141,11 @@ public abstract class AbstractWarProject
return responseBodies[0];
}
+ protected String getGoal()
+ {
+ return "verify";
+ }
+
private String getResponseBody( int timeout )
{
String responseBody = null;
Modified: tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml?rev=1534438&r1=1534437&r2=1534438&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat6-maven-plugin/pom.xml Tue Oct 22 01:01:50
2013
@@ -179,7 +179,7 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
Modified: tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml?rev=1534438&r1=1534437&r2=1534438&view=diff
==============================================================================
--- tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml (original)
+++ tomcat/maven-plugin/trunk/tomcat7-maven-plugin/pom.xml Tue Oct 22 01:01:50
2013
@@ -232,7 +232,7 @@
</dependency>
<dependency>
- <groupId>org.apache.logging.log4j.adapters</groupId>
+ <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
