From 27ab8a704d75f08d2b488d709d2539e335d718b4 Mon Sep 17 00:00:00 2001 From: Claudio Atzori Date: Tue, 27 Apr 2021 10:12:27 +0200 Subject: [PATCH] adjusted poms to align with the external dhp-schema module --- dhp-common/pom.xml | 1 + dhp-workflows/dhp-actionmanager/pom.xml | 5 --- dhp-workflows/dhp-aggregation/pom.xml | 6 ---- dhp-workflows/dhp-blacklist/pom.xml | 5 --- dhp-workflows/dhp-broker-events/pom.xml | 5 +-- dhp-workflows/dhp-dedup-openaire/pom.xml | 5 +-- dhp-workflows/dhp-dedup-scholexplorer/pom.xml | 4 --- dhp-workflows/dhp-doiboost/pom.xml | 4 --- dhp-workflows/dhp-enrichment/pom.xml | 5 +-- dhp-workflows/dhp-graph-mapper/pom.xml | 5 +-- .../dhp-graph-provision-scholexplorer/pom.xml | 6 +--- dhp-workflows/dhp-graph-provision/pom.xml | 5 --- pom.xml | 36 ++++++++----------- 13 files changed, 20 insertions(+), 72 deletions(-) diff --git a/dhp-common/pom.xml b/dhp-common/pom.xml index acac3594f..9f6bf78d5 100644 --- a/dhp-common/pom.xml +++ b/dhp-common/pom.xml @@ -107,6 +107,7 @@ eu.dnetlib.dhp dhp-schemas + stable_ids diff --git a/dhp-workflows/dhp-actionmanager/pom.xml b/dhp-workflows/dhp-actionmanager/pom.xml index 6dc33e76b..a1173ad75 100644 --- a/dhp-workflows/dhp-actionmanager/pom.xml +++ b/dhp-workflows/dhp-actionmanager/pom.xml @@ -56,11 +56,6 @@ dnet-openaire-data-protos - - eu.dnetlib.dhp - dhp-schemas - - eu.dnetlib dnet-actionmanager-api diff --git a/dhp-workflows/dhp-aggregation/pom.xml b/dhp-workflows/dhp-aggregation/pom.xml index fcea2b19e..294287008 100644 --- a/dhp-workflows/dhp-aggregation/pom.xml +++ b/dhp-workflows/dhp-aggregation/pom.xml @@ -60,12 +60,6 @@ ${project.version} - - eu.dnetlib.dhp - dhp-schemas - - - net.sf.saxon Saxon-HE diff --git a/dhp-workflows/dhp-blacklist/pom.xml b/dhp-workflows/dhp-blacklist/pom.xml index 185c53ab7..047767d33 100644 --- a/dhp-workflows/dhp-blacklist/pom.xml +++ b/dhp-workflows/dhp-blacklist/pom.xml @@ -14,11 +14,6 @@ dhp-common ${project.version} - - eu.dnetlib.dhp - dhp-schemas - - org.apache.spark spark-core_2.11 diff --git a/dhp-workflows/dhp-broker-events/pom.xml b/dhp-workflows/dhp-broker-events/pom.xml index 4ae818e3c..afbd93dcb 100644 --- a/dhp-workflows/dhp-broker-events/pom.xml +++ b/dhp-workflows/dhp-broker-events/pom.xml @@ -41,10 +41,7 @@ dhp-common ${project.version} - - eu.dnetlib.dhp - dhp-schemas - + eu.dnetlib dnet-pace-core diff --git a/dhp-workflows/dhp-dedup-openaire/pom.xml b/dhp-workflows/dhp-dedup-openaire/pom.xml index f51726ac5..f47f8ba6e 100644 --- a/dhp-workflows/dhp-dedup-openaire/pom.xml +++ b/dhp-workflows/dhp-dedup-openaire/pom.xml @@ -55,10 +55,7 @@ dhp-common ${project.version} - - eu.dnetlib.dhp - dhp-schemas - + com.arakelian java-jq diff --git a/dhp-workflows/dhp-dedup-scholexplorer/pom.xml b/dhp-workflows/dhp-dedup-scholexplorer/pom.xml index 7e8c7bf60..14959d630 100644 --- a/dhp-workflows/dhp-dedup-scholexplorer/pom.xml +++ b/dhp-workflows/dhp-dedup-scholexplorer/pom.xml @@ -56,10 +56,6 @@ dhp-common ${project.version} - - eu.dnetlib.dhp - dhp-schemas - eu.dnetlib diff --git a/dhp-workflows/dhp-doiboost/pom.xml b/dhp-workflows/dhp-doiboost/pom.xml index f9f932909..f496ea9a2 100644 --- a/dhp-workflows/dhp-doiboost/pom.xml +++ b/dhp-workflows/dhp-doiboost/pom.xml @@ -63,10 +63,6 @@ - - eu.dnetlib.dhp - dhp-schemas - com.jayway.jsonpath json-path diff --git a/dhp-workflows/dhp-enrichment/pom.xml b/dhp-workflows/dhp-enrichment/pom.xml index 4bac77c5d..6f638b188 100644 --- a/dhp-workflows/dhp-enrichment/pom.xml +++ b/dhp-workflows/dhp-enrichment/pom.xml @@ -24,10 +24,7 @@ dhp-common ${project.version} - - eu.dnetlib.dhp - dhp-schemas - + org.apache.spark spark-hive_2.11 diff --git a/dhp-workflows/dhp-graph-mapper/pom.xml b/dhp-workflows/dhp-graph-mapper/pom.xml index b773e6123..5e1c670c3 100644 --- a/dhp-workflows/dhp-graph-mapper/pom.xml +++ b/dhp-workflows/dhp-graph-mapper/pom.xml @@ -82,10 +82,7 @@ dhp-common ${project.version} - - eu.dnetlib.dhp - dhp-schemas - + com.jayway.jsonpath json-path diff --git a/dhp-workflows/dhp-graph-provision-scholexplorer/pom.xml b/dhp-workflows/dhp-graph-provision-scholexplorer/pom.xml index 3420f6607..188e0debc 100644 --- a/dhp-workflows/dhp-graph-provision-scholexplorer/pom.xml +++ b/dhp-workflows/dhp-graph-provision-scholexplorer/pom.xml @@ -55,12 +55,8 @@ eu.dnetlib.dhp dhp-common ${project.version} + - - - eu.dnetlib.dhp - dhp-schemas - org.apache.httpcomponents httpmime diff --git a/dhp-workflows/dhp-graph-provision/pom.xml b/dhp-workflows/dhp-graph-provision/pom.xml index 6446a542e..e9bbf63c4 100644 --- a/dhp-workflows/dhp-graph-provision/pom.xml +++ b/dhp-workflows/dhp-graph-provision/pom.xml @@ -155,16 +155,11 @@ - eu.dnetlib.dhp dhp-common ${project.version} - - eu.dnetlib.dhp - dhp-schemas - diff --git a/pom.xml b/pom.xml index 4761fd31f..12be8e5ab 100644 --- a/pom.xml +++ b/pom.xml @@ -58,6 +58,18 @@ true + + dnet45-snapshots + D-Net 45 snapshots + https://maven.d4science.org/nexus/content/repositories/dnet45-snapshots + default + + false + + + false + + cloudera Cloudera Repository @@ -69,26 +81,6 @@ false - - dnet45-releases-old - http://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-releases - - false - - - false - - - - dnet45-snapshots-old - http://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-snapshots - - false - - - false - - @@ -120,7 +112,8 @@ eu.dnetlib.dhp dhp-schemas - ${dhp.schemas.version} + 2.2.5-SNAPSHOT + stable_ids org.apache.hadoop @@ -696,7 +689,6 @@ 1.8 2.22.2 2.0.1 - 2.2.4 cdh5.9.2 2.6.0-${dhp.cdh.version} 4.1.0-${dhp.cdh.version}