Skip to content

Commit 95c8e55

Browse files
committed
HBASE-22373 Moved maven-eclipse-plugin to eclipse profile
1 parent 67c937f commit 95c8e55

File tree

2 files changed

+52
-50
lines changed

2 files changed

+52
-50
lines changed

hbase-server/pom.xml

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -204,31 +204,6 @@
204204
</execution>
205205
</executions>
206206
</plugin>
207-
<!-- General plugins -->
208-
<plugin>
209-
<groupId>org.apache.maven.plugins</groupId>
210-
<artifactId>maven-eclipse-plugin</artifactId>
211-
<configuration>
212-
<additionalProjectnatures>
213-
<projectnature>org.jamon.project.jamonnature</projectnature>
214-
</additionalProjectnatures>
215-
<buildcommands>
216-
<buildcommand>org.jamon.project.templateBuilder</buildcommand>
217-
<buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
218-
<buildcommand>org.jamon.project.markerUpdater</buildcommand>
219-
</buildcommands>
220-
<additionalConfig>
221-
<file>
222-
<name>.settings/org.jamon.prefs</name>
223-
<content># now
224-
eclipse.preferences.version=1
225-
templateSourceDir=src/main/jamon
226-
templateOutputDir=target/generated-jamon
227-
</content>
228-
</file>
229-
</additionalConfig>
230-
</configuration>
231-
</plugin>
232207
<!-- Run findbugs -->
233208
<plugin>
234209
<groupId>org.codehaus.mojo</groupId>
@@ -813,6 +788,32 @@
813788
</property>
814789
</activation>
815790
<build>
791+
<plugins>
792+
<plugin>
793+
<groupId>org.apache.maven.plugins</groupId>
794+
<artifactId>maven-eclipse-plugin</artifactId>
795+
<configuration>
796+
<additionalProjectnatures>
797+
<projectnature>org.jamon.project.jamonnature</projectnature>
798+
</additionalProjectnatures>
799+
<buildcommands>
800+
<buildcommand>org.jamon.project.templateBuilder</buildcommand>
801+
<buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
802+
<buildcommand>org.jamon.project.markerUpdater</buildcommand>
803+
</buildcommands>
804+
<additionalConfig>
805+
<file>
806+
<name>.settings/org.jamon.prefs</name>
807+
<content># now
808+
eclipse.preferences.version=1
809+
templateSourceDir=src/main/jamon
810+
templateOutputDir=target/generated-jamon
811+
</content>
812+
</file>
813+
</additionalConfig>
814+
</configuration>
815+
</plugin>
816+
</plugins>
816817
<pluginManagement>
817818
<plugins>
818819
<!--This plugin's configuration is used to store Eclipse m2e settings

hbase-zookeeper/pom.xml

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -61,31 +61,6 @@
6161
<skipAssembly>true</skipAssembly>
6262
</configuration>
6363
</plugin>
64-
<!-- General plugins -->
65-
<plugin>
66-
<groupId>org.apache.maven.plugins</groupId>
67-
<artifactId>maven-eclipse-plugin</artifactId>
68-
<configuration>
69-
<additionalProjectnatures>
70-
<projectnature>org.jamon.project.jamonnature</projectnature>
71-
</additionalProjectnatures>
72-
<buildcommands>
73-
<buildcommand>org.jamon.project.templateBuilder</buildcommand>
74-
<buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
75-
<buildcommand>org.jamon.project.markerUpdater</buildcommand>
76-
</buildcommands>
77-
<additionalConfig>
78-
<file>
79-
<name>.settings/org.jamon.prefs</name>
80-
<content># now
81-
eclipse.preferences.version=1
82-
templateSourceDir=src/main/jamon
83-
templateOutputDir=target/generated-jamon
84-
</content>
85-
</file>
86-
</additionalConfig>
87-
</configuration>
88-
</plugin>
8964
<!-- Run findbugs -->
9065
<plugin>
9166
<groupId>org.codehaus.mojo</groupId>
@@ -337,6 +312,32 @@
337312
</property>
338313
</activation>
339314
<build>
315+
<plugins>
316+
<plugin>
317+
<groupId>org.apache.maven.plugins</groupId>
318+
<artifactId>maven-eclipse-plugin</artifactId>
319+
<configuration>
320+
<additionalProjectnatures>
321+
<projectnature>org.jamon.project.jamonnature</projectnature>
322+
</additionalProjectnatures>
323+
<buildcommands>
324+
<buildcommand>org.jamon.project.templateBuilder</buildcommand>
325+
<buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
326+
<buildcommand>org.jamon.project.markerUpdater</buildcommand>
327+
</buildcommands>
328+
<additionalConfig>
329+
<file>
330+
<name>.settings/org.jamon.prefs</name>
331+
<content># now
332+
eclipse.preferences.version=1
333+
templateSourceDir=src/main/jamon
334+
templateOutputDir=target/generated-jamon
335+
</content>
336+
</file>
337+
</additionalConfig>
338+
</configuration>
339+
</plugin>
340+
</plugins>
340341
<pluginManagement>
341342
<plugins>
342343
<!--This plugin's configuration is used to store Eclipse m2e settings

0 commit comments

Comments
 (0)