From 95c8e55edbd069368f629779075532d5d5a5780b Mon Sep 17 00:00:00 2001
From: Jan Hentschel <jan.hentschel@ultratendency.com>
Date: Mon, 6 May 2019 21:30:33 +0200
Subject: [PATCH] HBASE-22373 Moved maven-eclipse-plugin to eclipse profile

---
 hbase-server/pom.xml    | 51 +++++++++++++++++++++--------------------
 hbase-zookeeper/pom.xml | 51 +++++++++++++++++++++--------------------
 2 files changed, 52 insertions(+), 50 deletions(-)

diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 3422ab760125..c4785f155783 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -204,31 +204,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- General plugins -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <configuration>
-          <additionalProjectnatures>
-            <projectnature>org.jamon.project.jamonnature</projectnature>
-          </additionalProjectnatures>
-          <buildcommands>
-            <buildcommand>org.jamon.project.templateBuilder</buildcommand>
-            <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
-            <buildcommand>org.jamon.project.markerUpdater</buildcommand>
-          </buildcommands>
-          <additionalConfig>
-            <file>
-              <name>.settings/org.jamon.prefs</name>
-              <content># now
-                eclipse.preferences.version=1
-                templateSourceDir=src/main/jamon
-                templateOutputDir=target/generated-jamon
-              </content>
-            </file>
-          </additionalConfig>
-        </configuration>
-      </plugin>
       <!-- Run findbugs -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -813,6 +788,32 @@
         </property>
       </activation>
       <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-eclipse-plugin</artifactId>
+            <configuration>
+              <additionalProjectnatures>
+                <projectnature>org.jamon.project.jamonnature</projectnature>
+              </additionalProjectnatures>
+              <buildcommands>
+                <buildcommand>org.jamon.project.templateBuilder</buildcommand>
+                <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
+                <buildcommand>org.jamon.project.markerUpdater</buildcommand>
+              </buildcommands>
+              <additionalConfig>
+                <file>
+                  <name>.settings/org.jamon.prefs</name>
+                  <content># now
+                    eclipse.preferences.version=1
+                    templateSourceDir=src/main/jamon
+                    templateOutputDir=target/generated-jamon
+                  </content>
+                </file>
+              </additionalConfig>
+            </configuration>
+          </plugin>
+        </plugins>
         <pluginManagement>
            <plugins>
              <!--This plugin's configuration is used to store Eclipse m2e settings
diff --git a/hbase-zookeeper/pom.xml b/hbase-zookeeper/pom.xml
index 51ada6d61816..db697810f0c1 100644
--- a/hbase-zookeeper/pom.xml
+++ b/hbase-zookeeper/pom.xml
@@ -61,31 +61,6 @@
           <skipAssembly>true</skipAssembly>
         </configuration>
       </plugin>
-      <!-- General plugins -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-eclipse-plugin</artifactId>
-        <configuration>
-          <additionalProjectnatures>
-            <projectnature>org.jamon.project.jamonnature</projectnature>
-          </additionalProjectnatures>
-          <buildcommands>
-            <buildcommand>org.jamon.project.templateBuilder</buildcommand>
-            <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
-            <buildcommand>org.jamon.project.markerUpdater</buildcommand>
-          </buildcommands>
-          <additionalConfig>
-            <file>
-              <name>.settings/org.jamon.prefs</name>
-              <content># now
-                eclipse.preferences.version=1
-                templateSourceDir=src/main/jamon
-                templateOutputDir=target/generated-jamon
-              </content>
-            </file>
-          </additionalConfig>
-        </configuration>
-      </plugin>
       <!-- Run findbugs -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -337,6 +312,32 @@
         </property>
       </activation>
       <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-eclipse-plugin</artifactId>
+            <configuration>
+              <additionalProjectnatures>
+                <projectnature>org.jamon.project.jamonnature</projectnature>
+              </additionalProjectnatures>
+              <buildcommands>
+                <buildcommand>org.jamon.project.templateBuilder</buildcommand>
+                <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
+                <buildcommand>org.jamon.project.markerUpdater</buildcommand>
+              </buildcommands>
+              <additionalConfig>
+                <file>
+                  <name>.settings/org.jamon.prefs</name>
+                  <content># now
+                    eclipse.preferences.version=1
+                    templateSourceDir=src/main/jamon
+                    templateOutputDir=target/generated-jamon
+                  </content>
+                </file>
+              </additionalConfig>
+            </configuration>
+          </plugin>
+        </plugins>
         <pluginManagement>
            <plugins>
              <!--This plugin's configuration is used to store Eclipse m2e settings