From 53aef139a37b1c99d3be782a9b17f8ab2f4b7041 Mon Sep 17 00:00:00 2001 From: Antonin Delpeuch Date: Mon, 5 Nov 2018 17:27:17 +0000 Subject: [PATCH 1/3] 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"> 4.0.0 - org.openrefine database jar - 3.1-SNAPSHOT OpenRefine - Database extension Connections to SQL databases for import and export 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"> 4.0.0 - org.openrefine gdata jar - 3.1-SNAPSHOT OpenRefine - Gdata extension Connects with Google services for data import and export 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"> 4.0.0 - org.openrefine pc-axis jar - 3.1-SNAPSHOT OpenRefine - PC-axis extension OpenRefine integration of PC-axis 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"> 4.0.0 - org.openrefine wikidata jar - 3.1-SNAPSHOT OpenRefine - Wikidata extension Schema alignment and data upload for Wikidata 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"> 4.0.0 - org.openrefine main jar - 3.1-SNAPSHOT OpenRefine - main OpenRefine is a free, open source power tool for working with messy data and improving it 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 @@ 4.0.0 - org.openrefine packaging - 3.1-SNAPSHOT - OpenRefine - packaging Creates packages for all supported operating systems http://openrefine.org/ @@ -218,6 +215,39 @@ + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-antrun-plugin + + [1.4,) + + run + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 083e40630..0fc5e3c6f 100644 --- a/pom.xml +++ b/pom.xml @@ -150,9 +150,68 @@ + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-install-plugin + + [2.5.2,) + + install-file + + + + + + + + + + + + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-install-plugin + + [2.5.2,) + + install-file + + + + + + + + + + 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"> 4.0.0 - org.openrefine server jar - 3.1-SNAPSHOT OpenRefine - server OpenRefine is a free, open source power tool for working with messy data and improving it @@ -126,6 +124,35 @@ + + + org.eclipse.m2e + lifecycle-mapping + 1.0.0 + + + + + + + org.apache.maven.plugins + + + maven-install-plugin + + [2.5.2,) + + install-file + + + + + + + + + + From 320fd6e1d4ae0c99b9d468d742f2a106545ce4bc Mon Sep 17 00:00:00 2001 From: Antonin Delpeuch Date: Mon, 5 Nov 2018 17:46:27 +0000 Subject: [PATCH 2/3] Add maven run configuration --- server/pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/server/pom.xml b/server/pom.xml index e7f48f346..3410c2c7b 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -71,6 +71,16 @@ UTF-8 + + org.codehaus.mojo + exec-maven-plugin + 1.3 + + com.google.refine.Refine + -Drefine.headless=true -Drefine.autoreload=true -Dbutterfly.autoreload=true -Drefine.memory=1400M -Drefine.port=3333 -Drefine.host=127.0.0.1 + false + + org.apache.maven.plugins maven-surefire-plugin From e470c3befb3694b66501697a3790ebbf0d968a4c Mon Sep 17 00:00:00 2001 From: Antonin Delpeuch Date: Mon, 5 Nov 2018 17:54:11 +0000 Subject: [PATCH 3/3] Update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c4771bde1..8723fef50 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you have cloned this repository to your computer, you can run OpenRefine with * `./refine` on Mac OS and Linux * `refine.bat` on Windows -This requires JDK 8 and Apache Ant. +This requires JDK 8 and Apache Maven. Documentation and Videos -------------------------