From 2a7ff3fb756e5d9ba7ccb22e8f0d8db47a03b13f Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Wed, 02 Nov 2011 16:08:45 +0000
Subject: [PATCH] Fix OPENDJ-343: Fix compilation errors and warnings when using Eclipse Indigo due to m2e plugin
---
opendj-sdk/opendj3/opendj-ldap-toolkit/pom.xml | 1 -
opendj-sdk/opendj3/pom.xml | 42 ++++++++++++++++++++++++++++++++++++++++++
opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml | 1 -
3 files changed, 42 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml b/opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml
index b0d84f8..189ef94 100644
--- a/opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml
+++ b/opendj-sdk/opendj3/opendj-ldap-sdk-examples/pom.xml
@@ -72,7 +72,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <version>1.4</version>
<executions>
<execution>
<phase>package</phase>
diff --git a/opendj-sdk/opendj3/opendj-ldap-toolkit/pom.xml b/opendj-sdk/opendj3/opendj-ldap-toolkit/pom.xml
index 905ffce..a9046d1 100644
--- a/opendj-sdk/opendj3/opendj-ldap-toolkit/pom.xml
+++ b/opendj-sdk/opendj3/opendj-ldap-toolkit/pom.xml
@@ -84,7 +84,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2</version>
<executions>
<execution>
<id>make-assembly</id>
diff --git a/opendj-sdk/opendj3/pom.xml b/opendj-sdk/opendj3/pom.xml
index d492e3e..db6aca4 100644
--- a/opendj-sdk/opendj3/pom.xml
+++ b/opendj-sdk/opendj3/pom.xml
@@ -661,6 +661,48 @@
<locales>en</locales>
</configuration>
</plugin>
+ <!--This plugin's configuration is used to store Eclipse m2e settings
+ only. It has no influence on the Maven build itself.-->
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.forgerock.commons</groupId>
+ <artifactId>i18n-maven-plugin</artifactId>
+ <versionRange>[1.2.0,)</versionRange>
+ <goals>
+ <goal>generate-messages</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute>
+ <runOnIncremental>see below</runOnIncremental>
+ <runOnConfiguration>see below</runOnConfiguration>
+ </execute>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <versionRange>[1.0,)</versionRange>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore></ignore>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
</plugins>
</pluginManagement>
</build>
--
Gitblit v1.10.0