Author: fgiust
Date: Sun Jul 23 05:10:39 2006
New Revision: 424722
URL: http://svn.apache.org/viewvc?rev=424722&view=rev
Log:
MCHANGES-48 org.apache.commons.logging.impl.Log4JCategoryLog does not implement
Log
upgrading to httpclient 3 and commons-logging 1.1 seems to fix this problem
Modified:
maven/sandbox/plugins/maven-changes-plugin/ (props changed)
maven/sandbox/plugins/maven-changes-plugin/pom.xml
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/jira/JiraHelper.java
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/jira/JiraMojo.java
Propchange: maven/sandbox/plugins/maven-changes-plugin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Jul 23 05:10:39 2006
@@ -1 +1,2 @@
target
+*.ser
Modified: maven/sandbox/plugins/maven-changes-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-changes-plugin/pom.xml?rev=424722&r1=424721&r2=424722&view=diff
==============================================================================
--- maven/sandbox/plugins/maven-changes-plugin/pom.xml (original)
+++ maven/sandbox/plugins/maven-changes-plugin/pom.xml Sun Jul 23 05:10:39 2006
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
@@ -27,7 +28,7 @@
<id>aramirez</id>
<name>Allan Ramirez</name>
<email>[EMAIL PROTECTED]</email>
- </developer>
+ </developer>
<developer>
<id>dennisl</id>
<name>Dennis Lundberg</name>
@@ -37,7 +38,9 @@
<!-- Not inherited correctly because the plugin is in the sandbox -->
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/sandbox/plugins/maven-changes-plugin/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/sandbox/plugins/maven-changes-plugin/</developerConnection>
+ <developerConnection>
+
scm:svn:https://svn.apache.org/repos/asf/maven/sandbox/plugins/maven-changes-plugin/
+ </developerConnection>
<url>http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-changes-plugin/</url>
</scm>
<dependencies>
@@ -60,7 +63,14 @@
<groupId>plexus</groupId>
<artifactId>plexus-mail-sender-javamail</artifactId>
<version>1.0-alpha-2</version>
- </dependency>
+ </dependency>
+ <dependency>
+ <!-- forces use of javamail 1.4 since it's the only version available
in the repo. We should remove this as soon
+ as the dependency in plexus-mail-sender-javamail will be update -->
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4</version>
+ </dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
<artifactId>maven-reporting-api</artifactId>
@@ -69,7 +79,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
+ <version>1.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.reporting</groupId>
@@ -84,7 +94,7 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>2.0.2</version>
+ <version>3.0.1</version>
</dependency>
</dependencies>
<reporting>
Modified:
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/jira/JiraHelper.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/jira/JiraHelper.java?rev=424722&r1=424721&r2=424722&view=diff
==============================================================================
---
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/jira/JiraHelper.java
(original)
+++
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/jira/JiraHelper.java
Sun Jul 23 05:10:39 2006
@@ -27,7 +27,7 @@
* A helper class with common JIRA related functionality.
*
* @author Dennis Lundberg
- * @version $Id: JiraHelper.java 422265 2006-07-15 16:49:50 +0000 (lö, 15 jul
2006) dennisl $
+ * @version $Id: JiraHelper.java 422265 2006-07-15 16:49:50 +0000 (l�, 15
jul 2006) dennisl $
*/
public class JiraHelper
{
@@ -46,10 +46,13 @@
String jiraId = null;
GetMethod gm = new GetMethod( issueManagementUrl );
log.info( "JIRA URL " + issueManagementUrl + " doesn't include a pid,
trying to get it" );
+
+ String projectPage;
try
{
client.executeMethod( gm );
log.info( "Successfully reached JIRA." );
+ projectPage = gm.getResponseBodyAsString();
}
catch ( Exception e )
{
@@ -61,8 +64,9 @@
{
log.error( "Unable to reach JIRA project page. Cause is: " +
e.getLocalizedMessage() );
}
+ return null;
}
- String projectPage = gm.getResponseBodyAsString();
+
int pidIndex = projectPage.indexOf( PID );
if ( pidIndex == -1 )
Modified:
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/jira/JiraMojo.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/jira/JiraMojo.java?rev=424722&r1=424721&r2=424722&view=diff
==============================================================================
---
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/jira/JiraMojo.java
(original)
+++
maven/sandbox/plugins/maven-changes-plugin/src/main/java/org/apache/maven/jira/JiraMojo.java
Sun Jul 23 05:10:39 2006
@@ -263,21 +263,21 @@
private boolean validateIfIssueManagementComplete()
{
- if ( ( (MavenProject) project ).getIssueManagement() == null )
+ if ( project.getIssueManagement() == null )
{
getLog().error( "No Issue Management set. JIRA Report will not be
generated." );
return false;
}
- else if ( ( ( (MavenProject) project ).getIssueManagement().getUrl()
== null )
- || ( ( (MavenProject) project
).getIssueManagement().getUrl().trim().equals( "" ) ) )
+ else if ( ( project.getIssueManagement().getUrl() == null )
+ || ( project.getIssueManagement().getUrl().trim().equals( "" ) ) )
{
getLog().error( "No URL set in Issue Management. JIRA Report will
not be generated." );
return false;
}
- else if ( ( ( (MavenProject) project
).getIssueManagement().getSystem() != null )
- && !( ( (MavenProject) project
).getIssueManagement().getSystem().equalsIgnoreCase( "jira" ) ) )
+ else if ( ( project.getIssueManagement().getSystem() != null )
+ && !( project.getIssueManagement().getSystem().equalsIgnoreCase(
"jira" ) ) )
{
getLog().error( "JIRA Report only supports JIRA. JIRA Report will
not be generated." );
