You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2011/11/21 15:14:05 UTC
svn commit: r1204507 - in
/maven/sandbox/trunk/plugins/maven-patch-tracker-plugin: pom.xml
src/main/java/org/apache/maven/plugins/patchtracker/CreatePatchMojo.java
src/main/java/org/apache/maven/plugins/patchtracker/MyMojo.java
Author: olamy
Date: Mon Nov 21 14:14:04 2011
New Revision: 1204507
URL: http://svn.apache.org/viewvc?rev=1204507&view=rev
Log:
get the patch content with the project scm, a parameter can override the scm to use if the working directory use git svn with -Dscm.providerType=git
Added:
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/CreatePatchMojo.java (with props)
Removed:
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/MyMojo.java
Modified:
maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/pom.xml
Modified: maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/pom.xml?rev=1204507&r1=1204506&r2=1204507&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/pom.xml (original)
+++ maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/pom.xml Mon Nov 21 14:14:04 2011
@@ -1,51 +1,108 @@
-<?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
<parent>
+ <artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugins-sandbox</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>21</version>
</parent>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-patch-tracker-plugin</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>maven-patch-tracker-plugin Maven Plugin</name>
- <url>http://maven.apache.org</url>
+
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <mavenVersion>2.0.6</mavenVersion>
+ <mavenScmVersion>1.6-SNAPSHOT</mavenScmVersion>
</properties>
<dependencies>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>${mavenVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-api</artifactId>
+ <version>${mavenScmVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-manager-plexus</artifactId>
+ <version>${mavenScmVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-gitexe</artifactId>
+ <version>${mavenScmVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-svnexe</artifactId>
+ <version>${mavenScmVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-starteam</artifactId>
+ <version>${mavenScmVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-bazaar</artifactId>
+ <version>${mavenScmVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-cvsjava</artifactId>
+ <version>${mavenScmVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-hg</artifactId>
+ <version>${mavenScmVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.scm</groupId>
+ <artifactId>maven-scm-provider-integrity</artifactId>
+ <version>${mavenScmVersion}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>3.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.10</version>
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <version>2.5.1</version>
- <executions>
- <execution>
- <id>generated-helpmojo</id>
- <goals>
- <goal>helpmojo</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <goalPrefix>maven-patch-tracker-plugin</goalPrefix>
- </configuration>
- </plugin>
- </plugins>
- </build>
+
</project>
Added: maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/CreatePatchMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/CreatePatchMojo.java?rev=1204507&view=auto
==============================================================================
--- maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/CreatePatchMojo.java (added)
+++ maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/CreatePatchMojo.java Mon Nov 21 14:14:04 2011
@@ -0,0 +1,116 @@
+package org.apache.maven.plugins.patchtracker;
+
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.scm.ScmException;
+import org.apache.maven.scm.ScmFileSet;
+import org.apache.maven.scm.command.diff.DiffScmResult;
+import org.apache.maven.scm.manager.NoSuchScmProviderException;
+import org.apache.maven.scm.manager.ScmManager;
+import org.apache.maven.scm.provider.ScmProvider;
+import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.scm.repository.ScmRepositoryException;
+
+import java.io.File;
+
+/**
+ * Goal which create a diff/patch file from the current project and create an issue in the project
+ * with attaching the created patch file
+ *
+ * @goal create
+ * @aggregator
+ */
+public class CreatePatchMojo
+ extends AbstractMojo
+{
+ /**
+ * The Maven Project Object.
+ *
+ * @parameter default-value="${project}"
+ * @required
+ * @readonly
+ */
+ protected MavenProject project;
+
+ /**
+ * @parameter default-value="${basedir}"
+ * @required
+ * @readonly
+ */
+ protected File baseDir;
+
+ /**
+ * @component
+ */
+ protected ScmManager scmManager;
+
+ /**
+ * @parameter expression="${scm.providerType}" default-value=""
+ */
+ protected String providerType = "";
+
+ public void execute()
+ throws MojoExecutionException
+ {
+ // TODO do a status before and complains if some files in to be added status ?
+
+ String patchContent = getPatchContent();
+
+
+
+ }
+
+
+ protected String getPatchContent()
+ throws MojoExecutionException
+ {
+ try
+ {
+ ScmRepository scmRepository = scmManager.makeScmRepository( project.getScm().getConnection() );
+
+ ScmProvider provider = scmManager.getProviderByType( scmRepository.getProvider() );
+
+ getLog().debug( "scm.providerType:" + providerType );
+ if ( StringUtils.isNotEmpty( providerType ) )
+ {
+ provider = scmManager.getProviderByType( providerType );
+ }
+
+ DiffScmResult diffScmResult = provider.diff( scmRepository, new ScmFileSet( baseDir ), "", "" );
+ getLog().debug( diffScmResult.getPatch() );
+
+ return diffScmResult.getPatch();
+
+ }
+ catch ( ScmRepositoryException e )
+ {
+ throw new MojoExecutionException( e.getMessage(), e );
+ }
+ catch ( NoSuchScmProviderException e )
+ {
+ throw new MojoExecutionException( e.getMessage(), e );
+ }
+ catch ( ScmException e )
+ {
+ throw new MojoExecutionException( e.getMessage(), e );
+ }
+ }
+}
Propchange: maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/CreatePatchMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/sandbox/trunk/plugins/maven-patch-tracker-plugin/src/main/java/org/apache/maven/plugins/patchtracker/CreatePatchMojo.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision