From e846df0b9d6ee384aca9e4c83849e28fe2298f04 Mon Sep 17 00:00:00 2001 From: Antonin Delpeuch Date: Sun, 9 Sep 2018 17:26:08 +0100 Subject: [PATCH] Migrate custom jars to install-plugin --- extensions/wikidata/pom.xml | 40 +++++++++++++ main/pom.xml | 115 ++++++++++++++++++++++++++++++++---- pom.xml | 49 --------------- server/pom.xml | 23 ++++++++ 4 files changed, 167 insertions(+), 60 deletions(-) diff --git a/extensions/wikidata/pom.xml b/extensions/wikidata/pom.xml index cd28eb391..ecd2920ef 100644 --- a/extensions/wikidata/pom.xml +++ b/extensions/wikidata/pom.xml @@ -84,6 +84,46 @@ true + + org.apache.maven.plugins + maven-install-plugin + 2.5.2 + + + install-wdtk-datamodel + process-resources + + ${basedir}/module/MOD-INF/lib/wdtk-datamodel-0.9.0-SNAPSHOT-jar-with-dependencies.jar + default + org.wikidata.wdtk + wdtk-datamodel + 0.9.0-SNAPSHOT + jar + true + + + install-file + + + + install-wdtk-wikibaseapi + process-resources + + ${basedir}/module/MOD-INF/lib/wdtk-wikibaseapi-0.9.0-SNAPSHOT.jar + default + org.wikidata.wdtk + wdtk-wikibaseapi + 0.9.0-SNAPSHOT + jar + true + + + install-file + + + + + diff --git a/main/pom.xml b/main/pom.xml index c7573ac1a..24c69648a 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -89,16 +89,6 @@ - - org.codehaus.mojo - exec-maven-plugin - 1.3 - - com.google.refine.Refine - true - java - - org.apache.maven.plugins maven-dependency-plugin @@ -107,6 +97,109 @@ true + + org.apache.maven.plugins + maven-install-plugin + 2.5.2 + + + install-marc4j + process-resources + + ${basedir}/webapp/WEB-INF/lib/marc4j-2.4.jar + default + marc4j + marc4j + 2.4 + jar + true + + + install-file + + + + install-tableschema + process-resources + + ${basedir}/webapp/WEB-INF/lib/tableschema-java-1.0-SNAPSHOT.jar + default + io.frictionlessdata + tableschema-java + 1.0-SNAPSHOT + jar + true + + + install-file + + + + install-datapackage + process-resources + + ${basedir}/webapp/WEB-INF/lib/datapackage-java-1.0-SNAPSHOT.jar + default + io.frictionlessdata + datapackage-java + 1.0-SNAPSHOT + jar + true + + + install-file + + + + install-opencsv + process-resources + + ${basedir}/webapp/WEB-INF/lib/opencsv-2.4-SNAPSHOT.jar + default + net.sf.opencsv + opencsv + 2.4-SNAPSHOT + jar + true + + + install-file + + + + install-butterfly + process-resources + + ${basedir}/webapp/WEB-INF/lib/butterfly-1.0.1.jar + default + edu.mit.simile + butterfly + 1.0.1 + jar + true + + + install-file + + + + install-vicino + process-resources + + ${basedir}/webapp/WEB-INF/lib/vicino-1.1.jar + default + edu.mit.simile + vicino + 1.1 + jar + true + + + install-file + + + + @@ -200,7 +293,7 @@ net.sf.opencsv opencsv - 2.4-refine-20130712 + 2.4-SNAPSHOT org.apache.poi diff --git a/pom.xml b/pom.xml index 78f046eb8..7b4ec9f5d 100644 --- a/pom.xml +++ b/pom.xml @@ -94,46 +94,6 @@ - - org.apache.maven.plugins - maven-install-plugin - 2.5.2 - - - install-marc4j - process-resources - - ${basedir}/libs/marc4j/marc4j/2.4/marc4j-2.4.jar - default - marc4j.marc4j - marc4j - 2.4 - jar - true - - - install-file - - - - install-butterfly - process-resources - - ${basedir}/libs/edu/mit/simile/butterfly/1.0.1/butterfly-1.0.1.jar - default - edu.mit.simile - butterfly - 1.0.1 - jar - true - - - install-file - - - - - @@ -146,14 +106,5 @@ see main/pom.xml, server/pom.xml and each extension. --> - - - - local-jars - Local JARs - file://${project.basedir}${file.separator}libs - - - diff --git a/server/pom.xml b/server/pom.xml index a75c3f861..e6ece66f6 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -81,6 +81,29 @@ true + + org.apache.maven.plugins + maven-install-plugin + 2.5.2 + + + install-jdapath + process-resources + + ${basedir}/libs/jdatapath-alpha2.jar + default + com.codeberry.jdatapath + jdatapath + alpha2 + jar + true + + + install-file + + + +