From 53aef139a37b1c99d3be782a9b17f8ab2f4b7041 Mon Sep 17 00:00:00 2001
From: Antonin Delpeuch <antonin@delpeuch.eu>
Date: Mon, 5 Nov 2018 17:27:17 +0000
Subject: [PATCH] Apply fixes to pom.xml files suggested by Eclipse

---
 extensions/database/pom.xml |  2 --
 extensions/gdata/pom.xml    |  2 --
 extensions/pc-axis/pom.xml  |  2 --
 extensions/wikidata/pom.xml |  2 --
 main/pom.xml                |  2 --
 packaging/pom.xml           | 36 ++++++++++++++++++++--
 pom.xml                     | 59 +++++++++++++++++++++++++++++++++++++
 server/pom.xml              | 31 +++++++++++++++++--
 8 files changed, 121 insertions(+), 15 deletions(-)

diff --git a/extensions/database/pom.xml b/extensions/database/pom.xml
index 141383614..b4d6ea0d3 100644
--- a/extensions/database/pom.xml
+++ b/extensions/database/pom.xml
@@ -2,10 +2,8 @@
 	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.openrefine</groupId>
   <artifactId>database</artifactId>
   <packaging>jar</packaging>
-  <version>3.1-SNAPSHOT</version>
 
   <name>OpenRefine - Database extension</name>
   <description>Connections to SQL databases for import and export</description>
diff --git a/extensions/gdata/pom.xml b/extensions/gdata/pom.xml
index 5ba1f1e79..fa89a2737 100644
--- a/extensions/gdata/pom.xml
+++ b/extensions/gdata/pom.xml
@@ -2,10 +2,8 @@
 	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.openrefine</groupId>
   <artifactId>gdata</artifactId>
   <packaging>jar</packaging>
-  <version>3.1-SNAPSHOT</version>
 
   <name>OpenRefine - Gdata extension</name>
   <description>Connects with Google services for data import and export</description>
diff --git a/extensions/pc-axis/pom.xml b/extensions/pc-axis/pom.xml
index 09077e8af..31e04695e 100644
--- a/extensions/pc-axis/pom.xml
+++ b/extensions/pc-axis/pom.xml
@@ -2,10 +2,8 @@
 	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.openrefine</groupId>
   <artifactId>pc-axis</artifactId>
   <packaging>jar</packaging>
-  <version>3.1-SNAPSHOT</version>
 
   <name>OpenRefine - PC-axis extension</name>
   <description>OpenRefine integration of PC-axis</description>
diff --git a/extensions/wikidata/pom.xml b/extensions/wikidata/pom.xml
index fef9dd644..250fffe4b 100644
--- a/extensions/wikidata/pom.xml
+++ b/extensions/wikidata/pom.xml
@@ -2,10 +2,8 @@
 	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.openrefine</groupId>
   <artifactId>wikidata</artifactId>
   <packaging>jar</packaging>
-  <version>3.1-SNAPSHOT</version>
 
   <name>OpenRefine - Wikidata extension</name>
   <description>Schema alignment and data upload for Wikidata</description>
diff --git a/main/pom.xml b/main/pom.xml
index cc57a5af9..720b0f64b 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -2,10 +2,8 @@
 	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.openrefine</groupId>
   <artifactId>main</artifactId>
   <packaging>jar</packaging>
-  <version>3.1-SNAPSHOT</version>
 
   <name>OpenRefine - main</name>
   <description>OpenRefine is a free, open source power tool for working with messy data and improving it</description>
diff --git a/packaging/pom.xml b/packaging/pom.xml
index 23d97ca58..33c2d7348 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -1,10 +1,7 @@
 <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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.openrefine</groupId>
   <artifactId>packaging</artifactId>
-  <version>3.1-SNAPSHOT</version>
-
   <name>OpenRefine - packaging</name>
   <description>Creates packages for all supported operating systems</description>
   <url>http://openrefine.org/</url>
@@ -218,6 +215,39 @@
       </plugin>
 
     </plugins>
+    <pluginManagement>
+    	<plugins>
+    		<!--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.apache.maven.plugins
+    								</groupId>
+    								<artifactId>
+    									maven-antrun-plugin
+    								</artifactId>
+    								<versionRange>[1.4,)</versionRange>
+    								<goals>
+    									<goal>run</goal>
+    								</goals>
+    							</pluginExecutionFilter>
+    							<action>
+    								<ignore></ignore>
+    							</action>
+    						</pluginExecution>
+    					</pluginExecutions>
+    				</lifecycleMappingMetadata>
+    			</configuration>
+    		</plugin>
+    	</plugins>
+    </pluginManagement>
   </build>
   <dependencies>
     <dependency>
diff --git a/pom.xml b/pom.xml
index 083e40630..0fc5e3c6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -150,9 +150,68 @@
                 </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.apache.maven.plugins
+        						</groupId>
+        						<artifactId>
+        							maven-install-plugin
+        						</artifactId>
+        						<versionRange>[2.5.2,)</versionRange>
+        						<goals>
+        							<goal>install-file</goal>
+        						</goals>
+        					</pluginExecutionFilter>
+        					<action>
+        						<ignore></ignore>
+        					</action>
+        				</pluginExecution>
+        			</pluginExecutions>
+        		</lifecycleMappingMetadata>
+        	</configuration>
+        </plugin>
+
     </plugins>
     <pluginManagement>
       <plugins>
+      <!--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.apache.maven.plugins
+      						</groupId>
+      						<artifactId>
+      							maven-install-plugin
+      						</artifactId>
+      						<versionRange>[2.5.2,)</versionRange>
+      						<goals>
+      							<goal>install-file</goal>
+      						</goals>
+      					</pluginExecutionFilter>
+      					<action>
+      						<ignore></ignore>
+      					</action>
+      				</pluginExecution>
+      			</pluginExecutions>
+      		</lifecycleMappingMetadata>
+      	</configuration>
+      	</plugin>
       </plugins>
     </pluginManagement>
   </build>
diff --git a/server/pom.xml b/server/pom.xml
index 5c4c85c2f..e7f48f346 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -2,10 +2,8 @@
 	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>org.openrefine</groupId>
   <artifactId>server</artifactId>
   <packaging>jar</packaging>
-  <version>3.1-SNAPSHOT</version>
 
   <name>OpenRefine - server</name>
   <description>OpenRefine is a free, open source power tool for working with messy data and improving it</description>
@@ -126,6 +124,35 @@
                 </execution>
             </executions>
         </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.apache.maven.plugins
+        						</groupId>
+        						<artifactId>
+        							maven-install-plugin
+        						</artifactId>
+        						<versionRange>[2.5.2,)</versionRange>
+        						<goals>
+        							<goal>install-file</goal>
+        						</goals>
+        					</pluginExecutionFilter>
+        					<action>
+        						<ignore></ignore>
+        					</action>
+        				</pluginExecution>
+        			</pluginExecutions>
+        		</lifecycleMappingMetadata>
+        	</configuration>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>