From 18ec8e814724c0a38596784bc4cfe6225527c1ee Mon Sep 17 00:00:00 2001 From: "sandro.labruzzo" Date: Thu, 31 Oct 2019 11:31:37 +0100 Subject: [PATCH 01/11] moved protoutils function to dhp-schemas --- .../dhp/schema/util}/ProtoConverter.java | 4 +- .../dnetlib/dhp/schema/util}/ProtoUtils.java | 2 +- dhp-workflows/dhp-graph-mapper/pom.xml | 5 ++ .../dhp/graph/SparkGraphImporterJob.java | 17 +++--- .../dnetlib/dhp/graph/ProtoConverterTest.java | 1 + .../dhp/graph/SparkGraphImporterJobTest.java | 3 +- pom.xml | 57 +++---------------- 7 files changed, 28 insertions(+), 61 deletions(-) rename {dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph => dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/util}/ProtoConverter.java (99%) rename {dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph => dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/util}/ProtoUtils.java (99%) diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/ProtoConverter.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/util/ProtoConverter.java similarity index 99% rename from dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/ProtoConverter.java rename to dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/util/ProtoConverter.java index 6cf64923e..69b201248 100644 --- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/ProtoConverter.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/util/ProtoConverter.java @@ -1,4 +1,4 @@ -package eu.dnetlib.dhp.graph; +package eu.dnetlib.dhp.schema.util; import eu.dnetlib.data.proto.*; import eu.dnetlib.dhp.schema.oaf.*; @@ -6,7 +6,7 @@ import eu.dnetlib.dhp.schema.oaf.*; import java.io.Serializable; import java.util.stream.Collectors; -import static eu.dnetlib.dhp.graph.ProtoUtils.*; +import static eu.dnetlib.dhp.schema.util.ProtoUtils.*; public class ProtoConverter implements Serializable { diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/ProtoUtils.java b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/util/ProtoUtils.java similarity index 99% rename from dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/ProtoUtils.java rename to dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/util/ProtoUtils.java index 41e0baa57..6834e217c 100644 --- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/ProtoUtils.java +++ b/dhp-schemas/src/main/java/eu/dnetlib/dhp/schema/util/ProtoUtils.java @@ -1,4 +1,4 @@ -package eu.dnetlib.dhp.graph; +package eu.dnetlib.dhp.schema.util; import com.googlecode.protobuf.format.JsonFormat; import eu.dnetlib.data.proto.FieldTypeProtos; diff --git a/dhp-workflows/dhp-graph-mapper/pom.xml b/dhp-workflows/dhp-graph-mapper/pom.xml index 4a4492cee..b70058f8f 100644 --- a/dhp-workflows/dhp-graph-mapper/pom.xml +++ b/dhp-workflows/dhp-graph-mapper/pom.xml @@ -44,6 +44,11 @@ 1.0.0-SNAPSHOT + + de.javakaffee + kryo-serializers + + diff --git a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/SparkGraphImporterJob.java b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/SparkGraphImporterJob.java index 625b34223..573495795 100644 --- a/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/SparkGraphImporterJob.java +++ b/dhp-workflows/dhp-graph-mapper/src/main/java/eu/dnetlib/dhp/graph/SparkGraphImporterJob.java @@ -2,6 +2,7 @@ package eu.dnetlib.dhp.graph; import eu.dnetlib.dhp.application.ArgumentApplicationParser; import eu.dnetlib.dhp.schema.oaf.*; +import eu.dnetlib.dhp.schema.util.ProtoConverter; import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.hadoop.io.Text; @@ -49,22 +50,22 @@ public class SparkGraphImporterJob { final Encoder relationEncoder = Encoders.bean(Relation.class); - if (filter == null|| filter.toLowerCase().contains("organization")) + if (StringUtils.isBlank(filter)|| filter.toLowerCase().contains("organization")) spark.createDataset(oafRdd.filter(s -> s instanceof Organization).map(s -> (Organization) s).rdd(), organizationEncoder).write().save(outputPath + "/organizations"); - if (filter == null|| filter.toLowerCase().contains("project")) + if (StringUtils.isBlank(filter)|| filter.toLowerCase().contains("project")) spark.createDataset(oafRdd.filter(s -> s instanceof Project).map(s -> (Project) s).rdd(), projectEncoder).write().save(outputPath + "/projects"); - if (filter == null|| filter.toLowerCase().contains("datasource")) + if (StringUtils.isBlank(filter)|| filter.toLowerCase().contains("datasource")) spark.createDataset(oafRdd.filter(s -> s instanceof Datasource).map(s -> (Datasource) s).rdd(), datasourceEncoder).write().save(outputPath + "/datasources"); - if (filter == null|| filter.toLowerCase().contains("dataset")) + if (StringUtils.isBlank(filter)|| filter.toLowerCase().contains("dataset")) spark.createDataset(oafRdd.filter(s -> s instanceof eu.dnetlib.dhp.schema.oaf.Dataset).map(s -> (eu.dnetlib.dhp.schema.oaf.Dataset) s).rdd(), datasetEncoder).write().save(outputPath + "/datasets"); - if (filter == null|| filter.toLowerCase().contains("publication")) + if (StringUtils.isBlank(filter)|| filter.toLowerCase().contains("publication")) spark.createDataset(oafRdd.filter(s -> s instanceof Publication).map(s -> (Publication) s).rdd(), publicationEncoder).write().save(outputPath + "/publications"); - if (filter == null|| filter.toLowerCase().contains("software")) + if (StringUtils.isBlank(filter)|| filter.toLowerCase().contains("software")) spark.createDataset(oafRdd.filter(s -> s instanceof Software).map(s -> (Software) s).rdd(), softwareEncoder).write().save(outputPath + "/software"); - if (filter == null|| filter.toLowerCase().contains("otherresearchproduct")) + if (StringUtils.isBlank(filter)|| filter.toLowerCase().contains("otherresearchproduct")) spark.createDataset(oafRdd.filter(s -> s instanceof OtherResearchProducts).map(s -> (OtherResearchProducts) s).rdd(), otherResearchProductsEncoder).write().save(outputPath + "/otherResearchProducts"); - if (filter == null|| filter.toLowerCase().contains("relation")) + if (StringUtils.isBlank(filter)|| filter.toLowerCase().contains("relation")) spark.createDataset(oafRdd.filter(s -> s instanceof Relation).map(s -> (Relation) s).rdd(), relationEncoder).write().save(outputPath + "/relations"); } } diff --git a/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/graph/ProtoConverterTest.java b/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/graph/ProtoConverterTest.java index 8afd0cda6..b8a062f91 100644 --- a/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/graph/ProtoConverterTest.java +++ b/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/graph/ProtoConverterTest.java @@ -2,6 +2,7 @@ package eu.dnetlib.dhp.graph; import com.fasterxml.jackson.databind.ObjectMapper; import eu.dnetlib.dhp.schema.oaf.*; +import eu.dnetlib.dhp.schema.util.ProtoConverter; import org.apache.commons.io.IOUtils; import org.junit.Test; diff --git a/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/graph/SparkGraphImporterJobTest.java b/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/graph/SparkGraphImporterJobTest.java index ce5185b61..dd5468de4 100644 --- a/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/graph/SparkGraphImporterJobTest.java +++ b/dhp-workflows/dhp-graph-mapper/src/test/java/eu/dnetlib/dhp/graph/SparkGraphImporterJobTest.java @@ -8,7 +8,8 @@ public class SparkGraphImporterJobTest { @Test @Ignore public void testImport() throws Exception { - SparkGraphImporterJob.main(new String[]{"-mt", "local[*]","-i", "/home/sandro/part-m-02236", "-o", "/tmp/dataframes", "-f", "software,relation"}); + SparkGraphImporterJob.main(new String[]{"-mt", "local[*]","-i", "/home/sandro/part-m-02236", "-o", "/tmp/dataframes", "-f", "publication"}); + } } diff --git a/pom.xml b/pom.xml index 31a408923..1727e1c1c 100644 --- a/pom.xml +++ b/pom.xml @@ -47,7 +47,6 @@ - dnet45-releases D-Net 45 releases @@ -60,22 +59,6 @@ true - - - cloudera Cloudera Repository @@ -183,6 +166,12 @@ 1.1.6 + + de.javakaffee + kryo-serializers + 0.45 + + net.schmizz sshj @@ -252,7 +241,7 @@ eu.dnetlib dnet-openaire-data-protos - 3.9.5-proto250 + 3.9.5 @@ -326,30 +315,6 @@ true - - - org.apache.maven.plugins maven-javadoc-plugin @@ -369,10 +334,8 @@ build-helper-maven-plugin 1.12 - - org.apache.maven.plugins @@ -415,10 +378,7 @@ 2.10 - - - dnet45-snapshots @@ -431,7 +391,6 @@ http://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-releases - @@ -456,7 +415,7 @@ 2.9.6 3.5 2.11.8 - 2.5.0 + 2.4.1 From fe2bd4df72bfdfe0e08f40f941ab608896420928 Mon Sep 17 00:00:00 2001 From: "sandro.labruzzo" Date: Thu, 31 Oct 2019 11:46:07 +0100 Subject: [PATCH 02/11] changed info about git --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 1727e1c1c..15706922f 100644 --- a/pom.xml +++ b/pom.xml @@ -37,9 +37,9 @@ - scm:git:ssh://git@github.com/dnet-team/dnet-hadoop.git - scm:git:ssh://git@github.com:dnet-team/dnet-hadoop.git - https://github.com/dnet-team/dnet-hadoop + scm:git:gitea@code-repo.d4science.org:D-Net/dnet-hadoop.git + scm:git:gitea@code-repo.d4science.org:D-Net/dnet-hadoop.git + https://code-repo.d4science.org/D-Net/dnet-hadoop/ HEAD From 3150c7ce6d7607bbd302f0a4967aa165fddaef84 Mon Sep 17 00:00:00 2001 From: "sandro.labruzzo" Date: Thu, 31 Oct 2019 11:47:40 +0100 Subject: [PATCH 03/11] [maven-release-plugin] prepare release 1.0.1 --- dhp-build/dhp-build-assembly-resources/pom.xml | 5 ++--- dhp-build/dhp-build-properties-maven-plugin/pom.xml | 5 ++--- dhp-build/pom.xml | 2 +- dhp-common/pom.xml | 6 ++---- dhp-schemas/pom.xml | 6 ++---- dhp-workflows/dhp-aggregation/pom.xml | 8 +++----- dhp-workflows/dhp-distcp/pom.xml | 6 ++---- dhp-workflows/dhp-graph-mapper/pom.xml | 10 ++++------ dhp-workflows/pom.xml | 11 +++++------ pom.xml | 8 +++----- 10 files changed, 26 insertions(+), 41 deletions(-) diff --git a/dhp-build/dhp-build-assembly-resources/pom.xml b/dhp-build/dhp-build-assembly-resources/pom.xml index 4273bc9db..312ae5a60 100644 --- a/dhp-build/dhp-build-assembly-resources/pom.xml +++ b/dhp-build/dhp-build-assembly-resources/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 eu.dnetlib.dhp dhp-build - 1.0.0-SNAPSHOT + 1.0.1 dhp-build-assembly-resources diff --git a/dhp-build/dhp-build-properties-maven-plugin/pom.xml b/dhp-build/dhp-build-properties-maven-plugin/pom.xml index eba085785..008a7ad0d 100644 --- a/dhp-build/dhp-build-properties-maven-plugin/pom.xml +++ b/dhp-build/dhp-build-properties-maven-plugin/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 eu.dnetlib.dhp dhp-build - 1.0.0-SNAPSHOT + 1.0.1 dhp-build-properties-maven-plugin diff --git a/dhp-build/pom.xml b/dhp-build/pom.xml index a930af4ea..770c3f3eb 100644 --- a/dhp-build/pom.xml +++ b/dhp-build/pom.xml @@ -4,7 +4,7 @@ eu.dnetlib.dhp dhp - 1.0.0-SNAPSHOT + 1.0.1 dhp-build pom diff --git a/dhp-common/pom.xml b/dhp-common/pom.xml index d2aa03926..785cff710 100644 --- a/dhp-common/pom.xml +++ b/dhp-common/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.0-SNAPSHOT + 1.0.1 ../ diff --git a/dhp-schemas/pom.xml b/dhp-schemas/pom.xml index a8535fc93..fa48b4f9b 100644 --- a/dhp-schemas/pom.xml +++ b/dhp-schemas/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.0-SNAPSHOT + 1.0.1 ../ diff --git a/dhp-workflows/dhp-aggregation/pom.xml b/dhp-workflows/dhp-aggregation/pom.xml index c327262ae..0d93809ef 100644 --- a/dhp-workflows/dhp-aggregation/pom.xml +++ b/dhp-workflows/dhp-aggregation/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 eu.dnetlib.dhp dhp-workflows - 1.0.0-SNAPSHOT + 1.0.1 dhp-aggregation @@ -24,7 +22,7 @@ eu.dnetlib.dhp dhp-common - 1.0.0-SNAPSHOT + 1.0.1 diff --git a/dhp-workflows/dhp-distcp/pom.xml b/dhp-workflows/dhp-distcp/pom.xml index 5964c2976..450826138 100644 --- a/dhp-workflows/dhp-distcp/pom.xml +++ b/dhp-workflows/dhp-distcp/pom.xml @@ -1,11 +1,9 @@ - + dhp-workflows eu.dnetlib.dhp - 1.0.0-SNAPSHOT + 1.0.1 4.0.0 diff --git a/dhp-workflows/dhp-graph-mapper/pom.xml b/dhp-workflows/dhp-graph-mapper/pom.xml index b70058f8f..6bf53e30a 100644 --- a/dhp-workflows/dhp-graph-mapper/pom.xml +++ b/dhp-workflows/dhp-graph-mapper/pom.xml @@ -1,11 +1,9 @@ - + dhp-workflows eu.dnetlib.dhp - 1.0.0-SNAPSHOT + 1.0.1 4.0.0 @@ -36,12 +34,12 @@ eu.dnetlib.dhp dhp-common - 1.0.0-SNAPSHOT + 1.0.1 eu.dnetlib.dhp dhp-schemas - 1.0.0-SNAPSHOT + 1.0.1 diff --git a/dhp-workflows/pom.xml b/dhp-workflows/pom.xml index df6119d3c..58f0f17d6 100644 --- a/dhp-workflows/pom.xml +++ b/dhp-workflows/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.0-SNAPSHOT + 1.0.1 ../ @@ -42,7 +41,7 @@ primed runtime - + true ${user.home}/.dhp/application.properties @@ -74,7 +73,7 @@ attach-test-resources - + provided false @@ -355,7 +354,7 @@ - + diff --git a/pom.xml b/pom.xml index 15706922f..2b42c3d8b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.0-SNAPSHOT + 1.0.1 pom http://www.d-net.research-infrastructures.eu @@ -40,7 +38,7 @@ scm:git:gitea@code-repo.d4science.org:D-Net/dnet-hadoop.git scm:git:gitea@code-repo.d4science.org:D-Net/dnet-hadoop.git https://code-repo.d4science.org/D-Net/dnet-hadoop/ - HEAD + 1.0.1 From fc800521738c1711e09dfccffcba61701f8522ee Mon Sep 17 00:00:00 2001 From: "sandro.labruzzo" Date: Thu, 31 Oct 2019 11:47:42 +0100 Subject: [PATCH 04/11] [maven-release-plugin] prepare for next development iteration --- dhp-build/dhp-build-assembly-resources/pom.xml | 2 +- dhp-build/dhp-build-properties-maven-plugin/pom.xml | 2 +- dhp-build/pom.xml | 2 +- dhp-common/pom.xml | 2 +- dhp-schemas/pom.xml | 2 +- dhp-workflows/dhp-aggregation/pom.xml | 4 ++-- dhp-workflows/dhp-distcp/pom.xml | 2 +- dhp-workflows/dhp-graph-mapper/pom.xml | 6 +++--- dhp-workflows/pom.xml | 2 +- pom.xml | 4 ++-- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dhp-build/dhp-build-assembly-resources/pom.xml b/dhp-build/dhp-build-assembly-resources/pom.xml index 312ae5a60..9dfdde8e4 100644 --- a/dhp-build/dhp-build-assembly-resources/pom.xml +++ b/dhp-build/dhp-build-assembly-resources/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib.dhp dhp-build - 1.0.1 + 1.0.2-SNAPSHOT dhp-build-assembly-resources diff --git a/dhp-build/dhp-build-properties-maven-plugin/pom.xml b/dhp-build/dhp-build-properties-maven-plugin/pom.xml index 008a7ad0d..4a96674c9 100644 --- a/dhp-build/dhp-build-properties-maven-plugin/pom.xml +++ b/dhp-build/dhp-build-properties-maven-plugin/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib.dhp dhp-build - 1.0.1 + 1.0.2-SNAPSHOT dhp-build-properties-maven-plugin diff --git a/dhp-build/pom.xml b/dhp-build/pom.xml index 770c3f3eb..358e78844 100644 --- a/dhp-build/pom.xml +++ b/dhp-build/pom.xml @@ -4,7 +4,7 @@ eu.dnetlib.dhp dhp - 1.0.1 + 1.0.2-SNAPSHOT dhp-build pom diff --git a/dhp-common/pom.xml b/dhp-common/pom.xml index 785cff710..b868cff9f 100644 --- a/dhp-common/pom.xml +++ b/dhp-common/pom.xml @@ -5,7 +5,7 @@ eu.dnetlib.dhp dhp - 1.0.1 + 1.0.2-SNAPSHOT ../ diff --git a/dhp-schemas/pom.xml b/dhp-schemas/pom.xml index fa48b4f9b..b789a9a50 100644 --- a/dhp-schemas/pom.xml +++ b/dhp-schemas/pom.xml @@ -5,7 +5,7 @@ eu.dnetlib.dhp dhp - 1.0.1 + 1.0.2-SNAPSHOT ../ diff --git a/dhp-workflows/dhp-aggregation/pom.xml b/dhp-workflows/dhp-aggregation/pom.xml index 0d93809ef..e053952aa 100644 --- a/dhp-workflows/dhp-aggregation/pom.xml +++ b/dhp-workflows/dhp-aggregation/pom.xml @@ -4,7 +4,7 @@ eu.dnetlib.dhp dhp-workflows - 1.0.1 + 1.0.2-SNAPSHOT dhp-aggregation @@ -22,7 +22,7 @@ eu.dnetlib.dhp dhp-common - 1.0.1 + 1.0.2-SNAPSHOT diff --git a/dhp-workflows/dhp-distcp/pom.xml b/dhp-workflows/dhp-distcp/pom.xml index 450826138..88bef051c 100644 --- a/dhp-workflows/dhp-distcp/pom.xml +++ b/dhp-workflows/dhp-distcp/pom.xml @@ -3,7 +3,7 @@ dhp-workflows eu.dnetlib.dhp - 1.0.1 + 1.0.2-SNAPSHOT 4.0.0 diff --git a/dhp-workflows/dhp-graph-mapper/pom.xml b/dhp-workflows/dhp-graph-mapper/pom.xml index 6bf53e30a..b6e50b02b 100644 --- a/dhp-workflows/dhp-graph-mapper/pom.xml +++ b/dhp-workflows/dhp-graph-mapper/pom.xml @@ -3,7 +3,7 @@ dhp-workflows eu.dnetlib.dhp - 1.0.1 + 1.0.2-SNAPSHOT 4.0.0 @@ -34,12 +34,12 @@ eu.dnetlib.dhp dhp-common - 1.0.1 + 1.0.2-SNAPSHOT eu.dnetlib.dhp dhp-schemas - 1.0.1 + 1.0.2-SNAPSHOT diff --git a/dhp-workflows/pom.xml b/dhp-workflows/pom.xml index 58f0f17d6..5502de0f5 100644 --- a/dhp-workflows/pom.xml +++ b/dhp-workflows/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib.dhp dhp - 1.0.1 + 1.0.2-SNAPSHOT ../ diff --git a/pom.xml b/pom.xml index 2b42c3d8b..0d2955116 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 eu.dnetlib.dhp dhp - 1.0.1 + 1.0.2-SNAPSHOT pom http://www.d-net.research-infrastructures.eu @@ -38,7 +38,7 @@ scm:git:gitea@code-repo.d4science.org:D-Net/dnet-hadoop.git scm:git:gitea@code-repo.d4science.org:D-Net/dnet-hadoop.git https://code-repo.d4science.org/D-Net/dnet-hadoop/ - 1.0.1 + HEAD From db8b346eddce4b95547808008a1ae609b6c8f2af Mon Sep 17 00:00:00 2001 From: "sandro.labruzzo" Date: Thu, 31 Oct 2019 11:49:05 +0100 Subject: [PATCH 05/11] [maven-release-plugin] rollback the release of 1.0.1 --- dhp-build/dhp-build-assembly-resources/pom.xml | 5 +++-- dhp-build/dhp-build-properties-maven-plugin/pom.xml | 5 +++-- dhp-build/pom.xml | 2 +- dhp-common/pom.xml | 6 ++++-- dhp-schemas/pom.xml | 6 ++++-- dhp-workflows/dhp-aggregation/pom.xml | 8 +++++--- dhp-workflows/dhp-distcp/pom.xml | 6 ++++-- dhp-workflows/dhp-graph-mapper/pom.xml | 10 ++++++---- dhp-workflows/pom.xml | 11 ++++++----- pom.xml | 6 ++++-- 10 files changed, 40 insertions(+), 25 deletions(-) diff --git a/dhp-build/dhp-build-assembly-resources/pom.xml b/dhp-build/dhp-build-assembly-resources/pom.xml index 9dfdde8e4..4273bc9db 100644 --- a/dhp-build/dhp-build-assembly-resources/pom.xml +++ b/dhp-build/dhp-build-assembly-resources/pom.xml @@ -1,12 +1,13 @@ - + 4.0.0 eu.dnetlib.dhp dhp-build - 1.0.2-SNAPSHOT + 1.0.0-SNAPSHOT dhp-build-assembly-resources diff --git a/dhp-build/dhp-build-properties-maven-plugin/pom.xml b/dhp-build/dhp-build-properties-maven-plugin/pom.xml index 4a96674c9..eba085785 100644 --- a/dhp-build/dhp-build-properties-maven-plugin/pom.xml +++ b/dhp-build/dhp-build-properties-maven-plugin/pom.xml @@ -1,12 +1,13 @@ - + 4.0.0 eu.dnetlib.dhp dhp-build - 1.0.2-SNAPSHOT + 1.0.0-SNAPSHOT dhp-build-properties-maven-plugin diff --git a/dhp-build/pom.xml b/dhp-build/pom.xml index 358e78844..a930af4ea 100644 --- a/dhp-build/pom.xml +++ b/dhp-build/pom.xml @@ -4,7 +4,7 @@ eu.dnetlib.dhp dhp - 1.0.2-SNAPSHOT + 1.0.0-SNAPSHOT dhp-build pom diff --git a/dhp-common/pom.xml b/dhp-common/pom.xml index b868cff9f..d2aa03926 100644 --- a/dhp-common/pom.xml +++ b/dhp-common/pom.xml @@ -1,11 +1,13 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.2-SNAPSHOT + 1.0.0-SNAPSHOT ../ diff --git a/dhp-schemas/pom.xml b/dhp-schemas/pom.xml index b789a9a50..a8535fc93 100644 --- a/dhp-schemas/pom.xml +++ b/dhp-schemas/pom.xml @@ -1,11 +1,13 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.2-SNAPSHOT + 1.0.0-SNAPSHOT ../ diff --git a/dhp-workflows/dhp-aggregation/pom.xml b/dhp-workflows/dhp-aggregation/pom.xml index e053952aa..c327262ae 100644 --- a/dhp-workflows/dhp-aggregation/pom.xml +++ b/dhp-workflows/dhp-aggregation/pom.xml @@ -1,10 +1,12 @@ - + 4.0.0 eu.dnetlib.dhp dhp-workflows - 1.0.2-SNAPSHOT + 1.0.0-SNAPSHOT dhp-aggregation @@ -22,7 +24,7 @@ eu.dnetlib.dhp dhp-common - 1.0.2-SNAPSHOT + 1.0.0-SNAPSHOT diff --git a/dhp-workflows/dhp-distcp/pom.xml b/dhp-workflows/dhp-distcp/pom.xml index 88bef051c..5964c2976 100644 --- a/dhp-workflows/dhp-distcp/pom.xml +++ b/dhp-workflows/dhp-distcp/pom.xml @@ -1,9 +1,11 @@ - + dhp-workflows eu.dnetlib.dhp - 1.0.2-SNAPSHOT + 1.0.0-SNAPSHOT 4.0.0 diff --git a/dhp-workflows/dhp-graph-mapper/pom.xml b/dhp-workflows/dhp-graph-mapper/pom.xml index b6e50b02b..b70058f8f 100644 --- a/dhp-workflows/dhp-graph-mapper/pom.xml +++ b/dhp-workflows/dhp-graph-mapper/pom.xml @@ -1,9 +1,11 @@ - + dhp-workflows eu.dnetlib.dhp - 1.0.2-SNAPSHOT + 1.0.0-SNAPSHOT 4.0.0 @@ -34,12 +36,12 @@ eu.dnetlib.dhp dhp-common - 1.0.2-SNAPSHOT + 1.0.0-SNAPSHOT eu.dnetlib.dhp dhp-schemas - 1.0.2-SNAPSHOT + 1.0.0-SNAPSHOT diff --git a/dhp-workflows/pom.xml b/dhp-workflows/pom.xml index 5502de0f5..df6119d3c 100644 --- a/dhp-workflows/pom.xml +++ b/dhp-workflows/pom.xml @@ -1,12 +1,13 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.2-SNAPSHOT + 1.0.0-SNAPSHOT ../ @@ -41,7 +42,7 @@ primed runtime - + true ${user.home}/.dhp/application.properties @@ -73,7 +74,7 @@ attach-test-resources - + provided false @@ -354,7 +355,7 @@ - + diff --git a/pom.xml b/pom.xml index 0d2955116..15706922f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,11 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.2-SNAPSHOT + 1.0.0-SNAPSHOT pom http://www.d-net.research-infrastructures.eu From 97b59ade296fadd0e4311620e071d0fd8b440228 Mon Sep 17 00:00:00 2001 From: "sandro.labruzzo" Date: Thu, 31 Oct 2019 11:59:39 +0100 Subject: [PATCH 06/11] [maven-release-plugin] prepare release 1.0.1 --- dhp-build/dhp-build-assembly-resources/pom.xml | 5 ++--- dhp-build/dhp-build-properties-maven-plugin/pom.xml | 5 ++--- dhp-build/pom.xml | 2 +- dhp-common/pom.xml | 6 ++---- dhp-schemas/pom.xml | 6 ++---- dhp-workflows/dhp-aggregation/pom.xml | 8 +++----- dhp-workflows/dhp-distcp/pom.xml | 6 ++---- dhp-workflows/dhp-graph-mapper/pom.xml | 10 ++++------ dhp-workflows/pom.xml | 11 +++++------ pom.xml | 8 +++----- 10 files changed, 26 insertions(+), 41 deletions(-) diff --git a/dhp-build/dhp-build-assembly-resources/pom.xml b/dhp-build/dhp-build-assembly-resources/pom.xml index 4273bc9db..312ae5a60 100644 --- a/dhp-build/dhp-build-assembly-resources/pom.xml +++ b/dhp-build/dhp-build-assembly-resources/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 eu.dnetlib.dhp dhp-build - 1.0.0-SNAPSHOT + 1.0.1 dhp-build-assembly-resources diff --git a/dhp-build/dhp-build-properties-maven-plugin/pom.xml b/dhp-build/dhp-build-properties-maven-plugin/pom.xml index eba085785..008a7ad0d 100644 --- a/dhp-build/dhp-build-properties-maven-plugin/pom.xml +++ b/dhp-build/dhp-build-properties-maven-plugin/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 eu.dnetlib.dhp dhp-build - 1.0.0-SNAPSHOT + 1.0.1 dhp-build-properties-maven-plugin diff --git a/dhp-build/pom.xml b/dhp-build/pom.xml index a930af4ea..770c3f3eb 100644 --- a/dhp-build/pom.xml +++ b/dhp-build/pom.xml @@ -4,7 +4,7 @@ eu.dnetlib.dhp dhp - 1.0.0-SNAPSHOT + 1.0.1 dhp-build pom diff --git a/dhp-common/pom.xml b/dhp-common/pom.xml index d2aa03926..785cff710 100644 --- a/dhp-common/pom.xml +++ b/dhp-common/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.0-SNAPSHOT + 1.0.1 ../ diff --git a/dhp-schemas/pom.xml b/dhp-schemas/pom.xml index a8535fc93..fa48b4f9b 100644 --- a/dhp-schemas/pom.xml +++ b/dhp-schemas/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.0-SNAPSHOT + 1.0.1 ../ diff --git a/dhp-workflows/dhp-aggregation/pom.xml b/dhp-workflows/dhp-aggregation/pom.xml index c327262ae..0d93809ef 100644 --- a/dhp-workflows/dhp-aggregation/pom.xml +++ b/dhp-workflows/dhp-aggregation/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 eu.dnetlib.dhp dhp-workflows - 1.0.0-SNAPSHOT + 1.0.1 dhp-aggregation @@ -24,7 +22,7 @@ eu.dnetlib.dhp dhp-common - 1.0.0-SNAPSHOT + 1.0.1 diff --git a/dhp-workflows/dhp-distcp/pom.xml b/dhp-workflows/dhp-distcp/pom.xml index 5964c2976..450826138 100644 --- a/dhp-workflows/dhp-distcp/pom.xml +++ b/dhp-workflows/dhp-distcp/pom.xml @@ -1,11 +1,9 @@ - + dhp-workflows eu.dnetlib.dhp - 1.0.0-SNAPSHOT + 1.0.1 4.0.0 diff --git a/dhp-workflows/dhp-graph-mapper/pom.xml b/dhp-workflows/dhp-graph-mapper/pom.xml index b70058f8f..6bf53e30a 100644 --- a/dhp-workflows/dhp-graph-mapper/pom.xml +++ b/dhp-workflows/dhp-graph-mapper/pom.xml @@ -1,11 +1,9 @@ - + dhp-workflows eu.dnetlib.dhp - 1.0.0-SNAPSHOT + 1.0.1 4.0.0 @@ -36,12 +34,12 @@ eu.dnetlib.dhp dhp-common - 1.0.0-SNAPSHOT + 1.0.1 eu.dnetlib.dhp dhp-schemas - 1.0.0-SNAPSHOT + 1.0.1 diff --git a/dhp-workflows/pom.xml b/dhp-workflows/pom.xml index df6119d3c..58f0f17d6 100644 --- a/dhp-workflows/pom.xml +++ b/dhp-workflows/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.0-SNAPSHOT + 1.0.1 ../ @@ -42,7 +41,7 @@ primed runtime - + true ${user.home}/.dhp/application.properties @@ -74,7 +73,7 @@ attach-test-resources - + provided false @@ -355,7 +354,7 @@ - + diff --git a/pom.xml b/pom.xml index 15706922f..2b42c3d8b 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.0-SNAPSHOT + 1.0.1 pom http://www.d-net.research-infrastructures.eu @@ -40,7 +38,7 @@ scm:git:gitea@code-repo.d4science.org:D-Net/dnet-hadoop.git scm:git:gitea@code-repo.d4science.org:D-Net/dnet-hadoop.git https://code-repo.d4science.org/D-Net/dnet-hadoop/ - HEAD + 1.0.1 From c8824f6ad08b671902708bcb2753e2b50b8a9dfc Mon Sep 17 00:00:00 2001 From: "sandro.labruzzo" Date: Thu, 31 Oct 2019 12:01:01 +0100 Subject: [PATCH 07/11] [maven-release-plugin] rollback the release of 1.0.1 --- dhp-build/dhp-build-assembly-resources/pom.xml | 5 +++-- dhp-build/dhp-build-properties-maven-plugin/pom.xml | 5 +++-- dhp-build/pom.xml | 2 +- dhp-common/pom.xml | 6 ++++-- dhp-schemas/pom.xml | 6 ++++-- dhp-workflows/dhp-aggregation/pom.xml | 8 +++++--- dhp-workflows/dhp-distcp/pom.xml | 6 ++++-- dhp-workflows/dhp-graph-mapper/pom.xml | 10 ++++++---- dhp-workflows/pom.xml | 11 ++++++----- pom.xml | 8 +++++--- 10 files changed, 41 insertions(+), 26 deletions(-) diff --git a/dhp-build/dhp-build-assembly-resources/pom.xml b/dhp-build/dhp-build-assembly-resources/pom.xml index 312ae5a60..4273bc9db 100644 --- a/dhp-build/dhp-build-assembly-resources/pom.xml +++ b/dhp-build/dhp-build-assembly-resources/pom.xml @@ -1,12 +1,13 @@ - + 4.0.0 eu.dnetlib.dhp dhp-build - 1.0.1 + 1.0.0-SNAPSHOT dhp-build-assembly-resources diff --git a/dhp-build/dhp-build-properties-maven-plugin/pom.xml b/dhp-build/dhp-build-properties-maven-plugin/pom.xml index 008a7ad0d..eba085785 100644 --- a/dhp-build/dhp-build-properties-maven-plugin/pom.xml +++ b/dhp-build/dhp-build-properties-maven-plugin/pom.xml @@ -1,12 +1,13 @@ - + 4.0.0 eu.dnetlib.dhp dhp-build - 1.0.1 + 1.0.0-SNAPSHOT dhp-build-properties-maven-plugin diff --git a/dhp-build/pom.xml b/dhp-build/pom.xml index 770c3f3eb..a930af4ea 100644 --- a/dhp-build/pom.xml +++ b/dhp-build/pom.xml @@ -4,7 +4,7 @@ eu.dnetlib.dhp dhp - 1.0.1 + 1.0.0-SNAPSHOT dhp-build pom diff --git a/dhp-common/pom.xml b/dhp-common/pom.xml index 785cff710..d2aa03926 100644 --- a/dhp-common/pom.xml +++ b/dhp-common/pom.xml @@ -1,11 +1,13 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.1 + 1.0.0-SNAPSHOT ../ diff --git a/dhp-schemas/pom.xml b/dhp-schemas/pom.xml index fa48b4f9b..a8535fc93 100644 --- a/dhp-schemas/pom.xml +++ b/dhp-schemas/pom.xml @@ -1,11 +1,13 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.1 + 1.0.0-SNAPSHOT ../ diff --git a/dhp-workflows/dhp-aggregation/pom.xml b/dhp-workflows/dhp-aggregation/pom.xml index 0d93809ef..c327262ae 100644 --- a/dhp-workflows/dhp-aggregation/pom.xml +++ b/dhp-workflows/dhp-aggregation/pom.xml @@ -1,10 +1,12 @@ - + 4.0.0 eu.dnetlib.dhp dhp-workflows - 1.0.1 + 1.0.0-SNAPSHOT dhp-aggregation @@ -22,7 +24,7 @@ eu.dnetlib.dhp dhp-common - 1.0.1 + 1.0.0-SNAPSHOT diff --git a/dhp-workflows/dhp-distcp/pom.xml b/dhp-workflows/dhp-distcp/pom.xml index 450826138..5964c2976 100644 --- a/dhp-workflows/dhp-distcp/pom.xml +++ b/dhp-workflows/dhp-distcp/pom.xml @@ -1,9 +1,11 @@ - + dhp-workflows eu.dnetlib.dhp - 1.0.1 + 1.0.0-SNAPSHOT 4.0.0 diff --git a/dhp-workflows/dhp-graph-mapper/pom.xml b/dhp-workflows/dhp-graph-mapper/pom.xml index 6bf53e30a..b70058f8f 100644 --- a/dhp-workflows/dhp-graph-mapper/pom.xml +++ b/dhp-workflows/dhp-graph-mapper/pom.xml @@ -1,9 +1,11 @@ - + dhp-workflows eu.dnetlib.dhp - 1.0.1 + 1.0.0-SNAPSHOT 4.0.0 @@ -34,12 +36,12 @@ eu.dnetlib.dhp dhp-common - 1.0.1 + 1.0.0-SNAPSHOT eu.dnetlib.dhp dhp-schemas - 1.0.1 + 1.0.0-SNAPSHOT diff --git a/dhp-workflows/pom.xml b/dhp-workflows/pom.xml index 58f0f17d6..df6119d3c 100644 --- a/dhp-workflows/pom.xml +++ b/dhp-workflows/pom.xml @@ -1,12 +1,13 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.1 + 1.0.0-SNAPSHOT ../ @@ -41,7 +42,7 @@ primed runtime - + true ${user.home}/.dhp/application.properties @@ -73,7 +74,7 @@ attach-test-resources - + provided false @@ -354,7 +355,7 @@ - + diff --git a/pom.xml b/pom.xml index 2b42c3d8b..15706922f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,11 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.1 + 1.0.0-SNAPSHOT pom http://www.d-net.research-infrastructures.eu @@ -38,7 +40,7 @@ scm:git:gitea@code-repo.d4science.org:D-Net/dnet-hadoop.git scm:git:gitea@code-repo.d4science.org:D-Net/dnet-hadoop.git https://code-repo.d4science.org/D-Net/dnet-hadoop/ - 1.0.1 + HEAD From 4da5239203a7e5afb71204d2e7a0740c818ac44e Mon Sep 17 00:00:00 2001 From: "sandro.labruzzo" Date: Thu, 31 Oct 2019 12:06:14 +0100 Subject: [PATCH 08/11] [maven-release-plugin] prepare release dhp-1.0.2 --- dhp-build/dhp-build-assembly-resources/pom.xml | 5 ++--- dhp-build/dhp-build-properties-maven-plugin/pom.xml | 5 ++--- dhp-build/pom.xml | 2 +- dhp-common/pom.xml | 6 ++---- dhp-schemas/pom.xml | 6 ++---- dhp-workflows/dhp-aggregation/pom.xml | 8 +++----- dhp-workflows/dhp-distcp/pom.xml | 6 ++---- dhp-workflows/dhp-graph-mapper/pom.xml | 10 ++++------ dhp-workflows/pom.xml | 11 +++++------ pom.xml | 8 +++----- 10 files changed, 26 insertions(+), 41 deletions(-) diff --git a/dhp-build/dhp-build-assembly-resources/pom.xml b/dhp-build/dhp-build-assembly-resources/pom.xml index 4273bc9db..8d08459df 100644 --- a/dhp-build/dhp-build-assembly-resources/pom.xml +++ b/dhp-build/dhp-build-assembly-resources/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 eu.dnetlib.dhp dhp-build - 1.0.0-SNAPSHOT + 1.0.2 dhp-build-assembly-resources diff --git a/dhp-build/dhp-build-properties-maven-plugin/pom.xml b/dhp-build/dhp-build-properties-maven-plugin/pom.xml index eba085785..572d58bd8 100644 --- a/dhp-build/dhp-build-properties-maven-plugin/pom.xml +++ b/dhp-build/dhp-build-properties-maven-plugin/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 eu.dnetlib.dhp dhp-build - 1.0.0-SNAPSHOT + 1.0.2 dhp-build-properties-maven-plugin diff --git a/dhp-build/pom.xml b/dhp-build/pom.xml index a930af4ea..4dddd74da 100644 --- a/dhp-build/pom.xml +++ b/dhp-build/pom.xml @@ -4,7 +4,7 @@ eu.dnetlib.dhp dhp - 1.0.0-SNAPSHOT + 1.0.2 dhp-build pom diff --git a/dhp-common/pom.xml b/dhp-common/pom.xml index d2aa03926..6982e7e14 100644 --- a/dhp-common/pom.xml +++ b/dhp-common/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.0-SNAPSHOT + 1.0.2 ../ diff --git a/dhp-schemas/pom.xml b/dhp-schemas/pom.xml index a8535fc93..d4f61932a 100644 --- a/dhp-schemas/pom.xml +++ b/dhp-schemas/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.0-SNAPSHOT + 1.0.2 ../ diff --git a/dhp-workflows/dhp-aggregation/pom.xml b/dhp-workflows/dhp-aggregation/pom.xml index c327262ae..32d622568 100644 --- a/dhp-workflows/dhp-aggregation/pom.xml +++ b/dhp-workflows/dhp-aggregation/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 eu.dnetlib.dhp dhp-workflows - 1.0.0-SNAPSHOT + 1.0.2 dhp-aggregation @@ -24,7 +22,7 @@ eu.dnetlib.dhp dhp-common - 1.0.0-SNAPSHOT + 1.0.2 diff --git a/dhp-workflows/dhp-distcp/pom.xml b/dhp-workflows/dhp-distcp/pom.xml index 5964c2976..7bdbaabea 100644 --- a/dhp-workflows/dhp-distcp/pom.xml +++ b/dhp-workflows/dhp-distcp/pom.xml @@ -1,11 +1,9 @@ - + dhp-workflows eu.dnetlib.dhp - 1.0.0-SNAPSHOT + 1.0.2 4.0.0 diff --git a/dhp-workflows/dhp-graph-mapper/pom.xml b/dhp-workflows/dhp-graph-mapper/pom.xml index b70058f8f..20c105436 100644 --- a/dhp-workflows/dhp-graph-mapper/pom.xml +++ b/dhp-workflows/dhp-graph-mapper/pom.xml @@ -1,11 +1,9 @@ - + dhp-workflows eu.dnetlib.dhp - 1.0.0-SNAPSHOT + 1.0.2 4.0.0 @@ -36,12 +34,12 @@ eu.dnetlib.dhp dhp-common - 1.0.0-SNAPSHOT + 1.0.2 eu.dnetlib.dhp dhp-schemas - 1.0.0-SNAPSHOT + 1.0.2 diff --git a/dhp-workflows/pom.xml b/dhp-workflows/pom.xml index df6119d3c..5d8a89f10 100644 --- a/dhp-workflows/pom.xml +++ b/dhp-workflows/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.0-SNAPSHOT + 1.0.2 ../ @@ -42,7 +41,7 @@ primed runtime - + true ${user.home}/.dhp/application.properties @@ -74,7 +73,7 @@ attach-test-resources - + provided false @@ -355,7 +354,7 @@ - + diff --git a/pom.xml b/pom.xml index 15706922f..8c4145e0a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.0-SNAPSHOT + 1.0.2 pom http://www.d-net.research-infrastructures.eu @@ -40,7 +38,7 @@ scm:git:gitea@code-repo.d4science.org:D-Net/dnet-hadoop.git scm:git:gitea@code-repo.d4science.org:D-Net/dnet-hadoop.git https://code-repo.d4science.org/D-Net/dnet-hadoop/ - HEAD + dhp-1.0.2 From e13c30cc9689d2468a885e8229d895279350ab5c Mon Sep 17 00:00:00 2001 From: "sandro.labruzzo" Date: Thu, 31 Oct 2019 12:07:04 +0100 Subject: [PATCH 09/11] [maven-release-plugin] rollback the release of dhp-1.0.2 --- dhp-build/dhp-build-assembly-resources/pom.xml | 5 +++-- dhp-build/dhp-build-properties-maven-plugin/pom.xml | 5 +++-- dhp-build/pom.xml | 2 +- dhp-common/pom.xml | 6 ++++-- dhp-schemas/pom.xml | 6 ++++-- dhp-workflows/dhp-aggregation/pom.xml | 8 +++++--- dhp-workflows/dhp-distcp/pom.xml | 6 ++++-- dhp-workflows/dhp-graph-mapper/pom.xml | 10 ++++++---- dhp-workflows/pom.xml | 11 ++++++----- pom.xml | 8 +++++--- 10 files changed, 41 insertions(+), 26 deletions(-) diff --git a/dhp-build/dhp-build-assembly-resources/pom.xml b/dhp-build/dhp-build-assembly-resources/pom.xml index 8d08459df..4273bc9db 100644 --- a/dhp-build/dhp-build-assembly-resources/pom.xml +++ b/dhp-build/dhp-build-assembly-resources/pom.xml @@ -1,12 +1,13 @@ - + 4.0.0 eu.dnetlib.dhp dhp-build - 1.0.2 + 1.0.0-SNAPSHOT dhp-build-assembly-resources diff --git a/dhp-build/dhp-build-properties-maven-plugin/pom.xml b/dhp-build/dhp-build-properties-maven-plugin/pom.xml index 572d58bd8..eba085785 100644 --- a/dhp-build/dhp-build-properties-maven-plugin/pom.xml +++ b/dhp-build/dhp-build-properties-maven-plugin/pom.xml @@ -1,12 +1,13 @@ - + 4.0.0 eu.dnetlib.dhp dhp-build - 1.0.2 + 1.0.0-SNAPSHOT dhp-build-properties-maven-plugin diff --git a/dhp-build/pom.xml b/dhp-build/pom.xml index 4dddd74da..a930af4ea 100644 --- a/dhp-build/pom.xml +++ b/dhp-build/pom.xml @@ -4,7 +4,7 @@ eu.dnetlib.dhp dhp - 1.0.2 + 1.0.0-SNAPSHOT dhp-build pom diff --git a/dhp-common/pom.xml b/dhp-common/pom.xml index 6982e7e14..d2aa03926 100644 --- a/dhp-common/pom.xml +++ b/dhp-common/pom.xml @@ -1,11 +1,13 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.2 + 1.0.0-SNAPSHOT ../ diff --git a/dhp-schemas/pom.xml b/dhp-schemas/pom.xml index d4f61932a..a8535fc93 100644 --- a/dhp-schemas/pom.xml +++ b/dhp-schemas/pom.xml @@ -1,11 +1,13 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.2 + 1.0.0-SNAPSHOT ../ diff --git a/dhp-workflows/dhp-aggregation/pom.xml b/dhp-workflows/dhp-aggregation/pom.xml index 32d622568..c327262ae 100644 --- a/dhp-workflows/dhp-aggregation/pom.xml +++ b/dhp-workflows/dhp-aggregation/pom.xml @@ -1,10 +1,12 @@ - + 4.0.0 eu.dnetlib.dhp dhp-workflows - 1.0.2 + 1.0.0-SNAPSHOT dhp-aggregation @@ -22,7 +24,7 @@ eu.dnetlib.dhp dhp-common - 1.0.2 + 1.0.0-SNAPSHOT diff --git a/dhp-workflows/dhp-distcp/pom.xml b/dhp-workflows/dhp-distcp/pom.xml index 7bdbaabea..5964c2976 100644 --- a/dhp-workflows/dhp-distcp/pom.xml +++ b/dhp-workflows/dhp-distcp/pom.xml @@ -1,9 +1,11 @@ - + dhp-workflows eu.dnetlib.dhp - 1.0.2 + 1.0.0-SNAPSHOT 4.0.0 diff --git a/dhp-workflows/dhp-graph-mapper/pom.xml b/dhp-workflows/dhp-graph-mapper/pom.xml index 20c105436..b70058f8f 100644 --- a/dhp-workflows/dhp-graph-mapper/pom.xml +++ b/dhp-workflows/dhp-graph-mapper/pom.xml @@ -1,9 +1,11 @@ - + dhp-workflows eu.dnetlib.dhp - 1.0.2 + 1.0.0-SNAPSHOT 4.0.0 @@ -34,12 +36,12 @@ eu.dnetlib.dhp dhp-common - 1.0.2 + 1.0.0-SNAPSHOT eu.dnetlib.dhp dhp-schemas - 1.0.2 + 1.0.0-SNAPSHOT diff --git a/dhp-workflows/pom.xml b/dhp-workflows/pom.xml index 5d8a89f10..df6119d3c 100644 --- a/dhp-workflows/pom.xml +++ b/dhp-workflows/pom.xml @@ -1,12 +1,13 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.2 + 1.0.0-SNAPSHOT ../ @@ -41,7 +42,7 @@ primed runtime - + true ${user.home}/.dhp/application.properties @@ -73,7 +74,7 @@ attach-test-resources - + provided false @@ -354,7 +355,7 @@ - + diff --git a/pom.xml b/pom.xml index 8c4145e0a..15706922f 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,11 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.2 + 1.0.0-SNAPSHOT pom http://www.d-net.research-infrastructures.eu @@ -38,7 +40,7 @@ scm:git:gitea@code-repo.d4science.org:D-Net/dnet-hadoop.git scm:git:gitea@code-repo.d4science.org:D-Net/dnet-hadoop.git https://code-repo.d4science.org/D-Net/dnet-hadoop/ - dhp-1.0.2 + HEAD From f224613b402ede31257601bdf7d81f30e081c4d3 Mon Sep 17 00:00:00 2001 From: "sandro.labruzzo" Date: Thu, 31 Oct 2019 12:08:49 +0100 Subject: [PATCH 10/11] [maven-release-plugin] prepare release dhp-1.0.2 --- dhp-build/dhp-build-assembly-resources/pom.xml | 5 ++--- dhp-build/dhp-build-properties-maven-plugin/pom.xml | 5 ++--- dhp-build/pom.xml | 2 +- dhp-common/pom.xml | 6 ++---- dhp-schemas/pom.xml | 6 ++---- dhp-workflows/dhp-aggregation/pom.xml | 8 +++----- dhp-workflows/dhp-distcp/pom.xml | 6 ++---- dhp-workflows/dhp-graph-mapper/pom.xml | 10 ++++------ dhp-workflows/pom.xml | 11 +++++------ pom.xml | 8 +++----- 10 files changed, 26 insertions(+), 41 deletions(-) diff --git a/dhp-build/dhp-build-assembly-resources/pom.xml b/dhp-build/dhp-build-assembly-resources/pom.xml index 4273bc9db..8d08459df 100644 --- a/dhp-build/dhp-build-assembly-resources/pom.xml +++ b/dhp-build/dhp-build-assembly-resources/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 eu.dnetlib.dhp dhp-build - 1.0.0-SNAPSHOT + 1.0.2 dhp-build-assembly-resources diff --git a/dhp-build/dhp-build-properties-maven-plugin/pom.xml b/dhp-build/dhp-build-properties-maven-plugin/pom.xml index eba085785..572d58bd8 100644 --- a/dhp-build/dhp-build-properties-maven-plugin/pom.xml +++ b/dhp-build/dhp-build-properties-maven-plugin/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 eu.dnetlib.dhp dhp-build - 1.0.0-SNAPSHOT + 1.0.2 dhp-build-properties-maven-plugin diff --git a/dhp-build/pom.xml b/dhp-build/pom.xml index a930af4ea..4dddd74da 100644 --- a/dhp-build/pom.xml +++ b/dhp-build/pom.xml @@ -4,7 +4,7 @@ eu.dnetlib.dhp dhp - 1.0.0-SNAPSHOT + 1.0.2 dhp-build pom diff --git a/dhp-common/pom.xml b/dhp-common/pom.xml index d2aa03926..6982e7e14 100644 --- a/dhp-common/pom.xml +++ b/dhp-common/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.0-SNAPSHOT + 1.0.2 ../ diff --git a/dhp-schemas/pom.xml b/dhp-schemas/pom.xml index a8535fc93..d4f61932a 100644 --- a/dhp-schemas/pom.xml +++ b/dhp-schemas/pom.xml @@ -1,13 +1,11 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.0-SNAPSHOT + 1.0.2 ../ diff --git a/dhp-workflows/dhp-aggregation/pom.xml b/dhp-workflows/dhp-aggregation/pom.xml index c327262ae..32d622568 100644 --- a/dhp-workflows/dhp-aggregation/pom.xml +++ b/dhp-workflows/dhp-aggregation/pom.xml @@ -1,12 +1,10 @@ - + 4.0.0 eu.dnetlib.dhp dhp-workflows - 1.0.0-SNAPSHOT + 1.0.2 dhp-aggregation @@ -24,7 +22,7 @@ eu.dnetlib.dhp dhp-common - 1.0.0-SNAPSHOT + 1.0.2 diff --git a/dhp-workflows/dhp-distcp/pom.xml b/dhp-workflows/dhp-distcp/pom.xml index 5964c2976..7bdbaabea 100644 --- a/dhp-workflows/dhp-distcp/pom.xml +++ b/dhp-workflows/dhp-distcp/pom.xml @@ -1,11 +1,9 @@ - + dhp-workflows eu.dnetlib.dhp - 1.0.0-SNAPSHOT + 1.0.2 4.0.0 diff --git a/dhp-workflows/dhp-graph-mapper/pom.xml b/dhp-workflows/dhp-graph-mapper/pom.xml index b70058f8f..20c105436 100644 --- a/dhp-workflows/dhp-graph-mapper/pom.xml +++ b/dhp-workflows/dhp-graph-mapper/pom.xml @@ -1,11 +1,9 @@ - + dhp-workflows eu.dnetlib.dhp - 1.0.0-SNAPSHOT + 1.0.2 4.0.0 @@ -36,12 +34,12 @@ eu.dnetlib.dhp dhp-common - 1.0.0-SNAPSHOT + 1.0.2 eu.dnetlib.dhp dhp-schemas - 1.0.0-SNAPSHOT + 1.0.2 diff --git a/dhp-workflows/pom.xml b/dhp-workflows/pom.xml index df6119d3c..5d8a89f10 100644 --- a/dhp-workflows/pom.xml +++ b/dhp-workflows/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.0-SNAPSHOT + 1.0.2 ../ @@ -42,7 +41,7 @@ primed runtime - + true ${user.home}/.dhp/application.properties @@ -74,7 +73,7 @@ attach-test-resources - + provided false @@ -355,7 +354,7 @@ - + diff --git a/pom.xml b/pom.xml index 15706922f..8c4145e0a 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,9 @@ - + 4.0.0 eu.dnetlib.dhp dhp - 1.0.0-SNAPSHOT + 1.0.2 pom http://www.d-net.research-infrastructures.eu @@ -40,7 +38,7 @@ scm:git:gitea@code-repo.d4science.org:D-Net/dnet-hadoop.git scm:git:gitea@code-repo.d4science.org:D-Net/dnet-hadoop.git https://code-repo.d4science.org/D-Net/dnet-hadoop/ - HEAD + dhp-1.0.2 From fd0ad8211191b9afe697c6c2f89dc710646b9b35 Mon Sep 17 00:00:00 2001 From: "sandro.labruzzo" Date: Thu, 31 Oct 2019 12:08:51 +0100 Subject: [PATCH 11/11] [maven-release-plugin] prepare for next development iteration --- dhp-build/dhp-build-assembly-resources/pom.xml | 2 +- dhp-build/dhp-build-properties-maven-plugin/pom.xml | 2 +- dhp-build/pom.xml | 2 +- dhp-common/pom.xml | 2 +- dhp-schemas/pom.xml | 2 +- dhp-workflows/dhp-aggregation/pom.xml | 4 ++-- dhp-workflows/dhp-distcp/pom.xml | 2 +- dhp-workflows/dhp-graph-mapper/pom.xml | 6 +++--- dhp-workflows/pom.xml | 2 +- pom.xml | 4 ++-- 10 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dhp-build/dhp-build-assembly-resources/pom.xml b/dhp-build/dhp-build-assembly-resources/pom.xml index 8d08459df..68fb393f7 100644 --- a/dhp-build/dhp-build-assembly-resources/pom.xml +++ b/dhp-build/dhp-build-assembly-resources/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib.dhp dhp-build - 1.0.2 + 1.0.3-SNAPSHOT dhp-build-assembly-resources diff --git a/dhp-build/dhp-build-properties-maven-plugin/pom.xml b/dhp-build/dhp-build-properties-maven-plugin/pom.xml index 572d58bd8..7b7213710 100644 --- a/dhp-build/dhp-build-properties-maven-plugin/pom.xml +++ b/dhp-build/dhp-build-properties-maven-plugin/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib.dhp dhp-build - 1.0.2 + 1.0.3-SNAPSHOT dhp-build-properties-maven-plugin diff --git a/dhp-build/pom.xml b/dhp-build/pom.xml index 4dddd74da..1ac8b734b 100644 --- a/dhp-build/pom.xml +++ b/dhp-build/pom.xml @@ -4,7 +4,7 @@ eu.dnetlib.dhp dhp - 1.0.2 + 1.0.3-SNAPSHOT dhp-build pom diff --git a/dhp-common/pom.xml b/dhp-common/pom.xml index 6982e7e14..93e259b63 100644 --- a/dhp-common/pom.xml +++ b/dhp-common/pom.xml @@ -5,7 +5,7 @@ eu.dnetlib.dhp dhp - 1.0.2 + 1.0.3-SNAPSHOT ../ diff --git a/dhp-schemas/pom.xml b/dhp-schemas/pom.xml index d4f61932a..49ba1ba5f 100644 --- a/dhp-schemas/pom.xml +++ b/dhp-schemas/pom.xml @@ -5,7 +5,7 @@ eu.dnetlib.dhp dhp - 1.0.2 + 1.0.3-SNAPSHOT ../ diff --git a/dhp-workflows/dhp-aggregation/pom.xml b/dhp-workflows/dhp-aggregation/pom.xml index 32d622568..53da4be3d 100644 --- a/dhp-workflows/dhp-aggregation/pom.xml +++ b/dhp-workflows/dhp-aggregation/pom.xml @@ -4,7 +4,7 @@ eu.dnetlib.dhp dhp-workflows - 1.0.2 + 1.0.3-SNAPSHOT dhp-aggregation @@ -22,7 +22,7 @@ eu.dnetlib.dhp dhp-common - 1.0.2 + 1.0.3-SNAPSHOT diff --git a/dhp-workflows/dhp-distcp/pom.xml b/dhp-workflows/dhp-distcp/pom.xml index 7bdbaabea..9f712e142 100644 --- a/dhp-workflows/dhp-distcp/pom.xml +++ b/dhp-workflows/dhp-distcp/pom.xml @@ -3,7 +3,7 @@ dhp-workflows eu.dnetlib.dhp - 1.0.2 + 1.0.3-SNAPSHOT 4.0.0 diff --git a/dhp-workflows/dhp-graph-mapper/pom.xml b/dhp-workflows/dhp-graph-mapper/pom.xml index 20c105436..6b6122307 100644 --- a/dhp-workflows/dhp-graph-mapper/pom.xml +++ b/dhp-workflows/dhp-graph-mapper/pom.xml @@ -3,7 +3,7 @@ dhp-workflows eu.dnetlib.dhp - 1.0.2 + 1.0.3-SNAPSHOT 4.0.0 @@ -34,12 +34,12 @@ eu.dnetlib.dhp dhp-common - 1.0.2 + 1.0.3-SNAPSHOT eu.dnetlib.dhp dhp-schemas - 1.0.2 + 1.0.3-SNAPSHOT diff --git a/dhp-workflows/pom.xml b/dhp-workflows/pom.xml index 5d8a89f10..8418c6e4d 100644 --- a/dhp-workflows/pom.xml +++ b/dhp-workflows/pom.xml @@ -6,7 +6,7 @@ eu.dnetlib.dhp dhp - 1.0.2 + 1.0.3-SNAPSHOT ../ diff --git a/pom.xml b/pom.xml index 8c4145e0a..b48c1bf97 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 eu.dnetlib.dhp dhp - 1.0.2 + 1.0.3-SNAPSHOT pom http://www.d-net.research-infrastructures.eu @@ -38,7 +38,7 @@ scm:git:gitea@code-repo.d4science.org:D-Net/dnet-hadoop.git scm:git:gitea@code-repo.d4science.org:D-Net/dnet-hadoop.git https://code-repo.d4science.org/D-Net/dnet-hadoop/ - dhp-1.0.2 + HEAD