merged for gitflow plugin

diff --git a/pom.xml b/pom.xml
index fe14b1771183c15d86bb651b8f33f7b2947f5f90..1913b28881967453f57b96a9b5a0cab5421bf219 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -327,18 +327,6 @@
           <tagBase>http://dev.e-taxonomy.eu/svn/tags/taxeditor</tagBase>
         </configuration>
       </plugin>
           <tagBase>http://dev.e-taxonomy.eu/svn/tags/taxeditor</tagBase>
         </configuration>
       </plugin>

-      <plugin>
-        <groupId>external.atlassian.jgitflow</groupId>
-        <artifactId>jgitflow-maven-plugin</artifactId>
-        <version>1.0-m4.3</version>
-        <configuration>
-          <pushHotfixes>true</pushHotfixes>
-          <pushReleases>true</pushReleases>
-          <enableSshAgent>true</enableSshAgent>
-          <allowSnapshots>true</allowSnapshots>
-          <allowUntracked>true</allowUntracked>
-        </configuration>
-      </plugin>

     </plugins>
     <extensions>
       <extension>
     </plugins>
     <extensions>
       <extension>