D-Net
/
dnet-hadoop
14
5
Fork 11
Code Issues 14 Pull Requests 12 Projects 2 Releases 2 Wiki Activity

Revised build: shade only dedup for an incremental approach 

Use dhp-rmi-api in pace of cnr-rmi-api
disable build of dhp-doiboost (logging to be reviewed)
This commit is contained in:
Giambattista Bloisi 2024-10-21 09:13:39 +02:00
parent f3746b73fa
commit 4e97c96252
5 changed files with 91 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dhp-common/pom.xml
View File

@ -62,6 +62,12 @@
</build> </build>
<dependencies> <dependencies>
<dependency>
<groupId>eu.dnetlib</groupId>
<artifactId>dhp-rmi-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency> <dependency>
<groupId>edu.cmu</groupId> <groupId>edu.cmu</groupId>
<artifactId>secondstring</artifactId> <artifactId>secondstring</artifactId>
@ -125,10 +131,6 @@
<groupId>org.apache.cxf</groupId> <groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId> <artifactId>cxf-rt-transports-http</artifactId>
</dependency> </dependency>
<dependency>
<groupId>eu.dnetlib</groupId>
<artifactId>cnr-rmi-api</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.ximpleware</groupId> <groupId>com.ximpleware</groupId>
@ -168,24 +170,4 @@
<artifactId>opencsv</artifactId> <artifactId>opencsv</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<!-- dependencies required on JDK9+ because J2EE has been removed -->
<profiles>
<profile>
<id>spark-34</id>
<dependencies>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.2.11</version>
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-ri</artifactId>
<version>2.3.3</version>
<type>pom</type>
</dependency>
</dependencies>
</profile>
</profiles>
</project> </project>

10
dhp-shade-package/dependency-reduced-pom.xml
View File

@ -95,6 +95,10 @@
<artifactId>byte-buddy-agent</artifactId> <artifactId>byte-buddy-agent</artifactId>
<groupId>net.bytebuddy</groupId> <groupId>net.bytebuddy</groupId>
</exclusion> </exclusion>
<exclusion>
<artifactId>objenesis</artifactId>
<groupId>org.objenesis</groupId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
@ -102,6 +106,12 @@
<artifactId>mockito-junit-jupiter</artifactId> <artifactId>mockito-junit-jupiter</artifactId>
<version>3.3.3</version> <version>3.3.3</version>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<artifactId>junit-jupiter-api</artifactId>
<groupId>org.junit.jupiter</groupId>
</exclusion>
</exclusions>
</dependency> </dependency>
</dependencies> </dependencies>
<distributionManagement> <distributionManagement>

130
dhp-shade-package/pom.xml
View File

@ -26,11 +26,11 @@
<dependencies> <dependencies>
<dependency> <!-- <dependency>-->
<groupId>eu.dnetlib.dhp</groupId> <!-- <groupId>eu.dnetlib.dhp</groupId>-->
<artifactId>dhp-actionmanager</artifactId> <!-- <artifactId>dhp-actionmanager</artifactId>-->
<version>${project.version}</version> <!-- <version>${project.version}</version>-->
</dependency> <!-- </dependency>-->
<!-- <dependency>--> <!-- <dependency>-->
<!-- <groupId>eu.dnetlib.dhp</groupId>--> <!-- <groupId>eu.dnetlib.dhp</groupId>-->
<!-- <artifactId>dhp-aggregation</artifactId>--> <!-- <artifactId>dhp-aggregation</artifactId>-->
@ -46,71 +46,71 @@
<!-- <artifactId>dhp-broker-events</artifactId>--> <!-- <artifactId>dhp-broker-events</artifactId>-->
<!-- <version>${project.version}</version>--> <!-- <version>${project.version}</version>-->
<!-- </dependency>--> <!-- </dependency>-->
<!-- <dependency>--> <dependency>
<!-- <groupId>eu.dnetlib.dhp</groupId>--> <groupId>eu.dnetlib.dhp</groupId>
<!-- <artifactId>dhp-dedup-openaire</artifactId>--> <artifactId>dhp-dedup-openaire</artifactId>
<!-- <version>${project.version}</version>--> <version>${project.version}</version>
<!-- </dependency>--> </dependency>
<!-- <dependency>--> <!-- <dependency>-->
<!-- <groupId>eu.dnetlib.dhp</groupId>--> <!-- <groupId>eu.dnetlib.dhp</groupId>-->
<!-- <artifactId>dhp-enrichment</artifactId>--> <!-- <artifactId>dhp-enrichment</artifactId>-->
<!-- <version>${project.version}</version>--> <!-- <version>${project.version}</version>-->
<!-- </dependency>--> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>eu.dnetlib.dhp</groupId> <!-- <groupId>eu.dnetlib.dhp</groupId>-->
<artifactId>dhp-graph-mapper</artifactId> <!-- <artifactId>dhp-graph-mapper</artifactId>-->
<version>${project.version}</version> <!-- <version>${project.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>eu.dnetlib.dhp</groupId> <!-- <groupId>eu.dnetlib.dhp</groupId>-->
<artifactId>dhp-graph-provision</artifactId> <!-- <artifactId>dhp-graph-provision</artifactId>-->
<version>${project.version}</version> <!-- <version>${project.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>eu.dnetlib.dhp</groupId> <!-- <groupId>eu.dnetlib.dhp</groupId>-->
<artifactId>dhp-impact-indicators</artifactId> <!-- <artifactId>dhp-impact-indicators</artifactId>-->
<version>${project.version}</version> <!-- <version>${project.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>eu.dnetlib.dhp</groupId> <!-- <groupId>eu.dnetlib.dhp</groupId>-->
<artifactId>dhp-stats-actionsets</artifactId> <!-- <artifactId>dhp-stats-actionsets</artifactId>-->
<version>${project.version}</version> <!-- <version>${project.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>eu.dnetlib.dhp</groupId> <!-- <groupId>eu.dnetlib.dhp</groupId>-->
<artifactId>dhp-stats-hist-snaps</artifactId> <!-- <artifactId>dhp-stats-hist-snaps</artifactId>-->
<version>${project.version}</version> <!-- <version>${project.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>eu.dnetlib.dhp</groupId> <!-- <groupId>eu.dnetlib.dhp</groupId>-->
<artifactId>dhp-stats-monitor-irish</artifactId> <!-- <artifactId>dhp-stats-monitor-irish</artifactId>-->
<version>${project.version}</version> <!-- <version>${project.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>eu.dnetlib.dhp</groupId> <!-- <groupId>eu.dnetlib.dhp</groupId>-->
<artifactId>dhp-stats-promote</artifactId> <!-- <artifactId>dhp-stats-promote</artifactId>-->
<version>${project.version}</version> <!-- <version>${project.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>eu.dnetlib.dhp</groupId> <!-- <groupId>eu.dnetlib.dhp</groupId>-->
<artifactId>dhp-stats-update</artifactId> <!-- <artifactId>dhp-stats-update</artifactId>-->
<version>${project.version}</version> <!-- <version>${project.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>eu.dnetlib.dhp</groupId> <!-- <groupId>eu.dnetlib.dhp</groupId>-->
<artifactId>dhp-swh</artifactId> <!-- <artifactId>dhp-swh</artifactId>-->
<version>${project.version}</version> <!-- <version>${project.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>eu.dnetlib.dhp</groupId> <!-- <groupId>eu.dnetlib.dhp</groupId>-->
<artifactId>dhp-usage-raw-data-update</artifactId> <!-- <artifactId>dhp-usage-raw-data-update</artifactId>-->
<version>${project.version}</version> <!-- <version>${project.version}</version>-->
</dependency> <!-- </dependency>-->
<dependency> <!-- <dependency>-->
<groupId>eu.dnetlib.dhp</groupId> <!-- <groupId>eu.dnetlib.dhp</groupId>-->
<artifactId>dhp-usage-stats-build</artifactId> <!-- <artifactId>dhp-usage-stats-build</artifactId>-->
<version>${project.version}</version> <!-- <version>${project.version}</version>-->
</dependency> <!-- </dependency>-->
</dependencies> </dependencies>

2
dhp-workflows/pom.xml
View File

@ -40,7 +40,7 @@
<module>dhp-usage-stats-build</module> <module>dhp-usage-stats-build</module>
<module>dhp-usage-raw-data-update</module> <module>dhp-usage-raw-data-update</module>
<module>dhp-broker-events</module> <module>dhp-broker-events</module>
<module>dhp-doiboost</module> <!-- <module>dhp-doiboost</module>-->
<module>dhp-impact-indicators</module> <module>dhp-impact-indicators</module>
<module>dhp-swh</module> <module>dhp-swh</module>
</modules> </modules>

17
pom.xml
View File

@ -19,6 +19,7 @@
</licenses> </licenses>
<modules> <modules>
<module>dhp-rmi-api</module>
<module>dhp-build</module> <module>dhp-build</module>
<module>dhp-pace-core</module> <module>dhp-pace-core</module>
<module>dhp-common</module> <module>dhp-common</module>
@ -440,12 +441,6 @@
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency>
<groupId>eu.dnetlib</groupId>
<artifactId>cnr-rmi-api</artifactId>
<version>${cnr-rmi-api.version}</version>
</dependency>
<dependency> <dependency>
<groupId>eu.dnetlib.dhp</groupId> <groupId>eu.dnetlib.dhp</groupId>
<artifactId>dnet-openaire-broker-common</artifactId> <artifactId>dnet-openaire-broker-common</artifactId>
@ -926,7 +921,6 @@
<!-- dependency versions --> <!-- dependency versions -->
<apache.poi.version>4.1.2</apache.poi.version> <apache.poi.version>4.1.2</apache.poi.version>
<cnr-rmi-api.version>[2.6.1]</cnr-rmi-api.version>
<common.compress.version>1.20</common.compress.version> <common.compress.version>1.20</common.compress.version>
<common.csv.version>1.8</common.csv.version> <common.csv.version>1.8</common.csv.version>
<common.text.version>1.8</common.text.version> <common.text.version>1.8</common.text.version>
@ -936,6 +930,7 @@
<commons-io.version>2.4</commons-io.version> <commons-io.version>2.4</commons-io.version>
<commons.logging.version>1.1.3</commons.logging.version> <commons.logging.version>1.1.3</commons.logging.version>
<commons-validator.version>1.7</commons-validator.version> <commons-validator.version>1.7</commons-validator.version>
<cxf.version>3.5.9</cxf.version>
<dateparser.version>1.0.7</dateparser.version> <dateparser.version>1.0.7</dateparser.version>
<dhp-schemas.version>[8.0.1]</dhp-schemas.version> <dhp-schemas.version>[8.0.1]</dhp-schemas.version>
<dhp.cdh.version>cdh5.9.2</dhp.cdh.version> <dhp.cdh.version>cdh5.9.2</dhp.cdh.version>
@ -953,6 +948,7 @@
<json4s.version>3.5.3</json4s.version> <json4s.version>3.5.3</json4s.version>
<jsonschemagenerator.version>4.13.0</jsonschemagenerator.version> <jsonschemagenerator.version>4.13.0</jsonschemagenerator.version>
<junit-jupiter.version>5.6.1</junit-jupiter.version> <junit-jupiter.version>5.6.1</junit-jupiter.version>
<metro.version>3.0.3</metro.version>
<mockito-core.version>3.3.3</mockito-core.version> <mockito-core.version>3.3.3</mockito-core.version>
<mongodb.driver.version>3.4.2</mongodb.driver.version> <mongodb.driver.version>3.4.2</mongodb.driver.version>
<okhttp.version>4.7.2</okhttp.version> <okhttp.version>4.7.2</okhttp.version>
@ -1036,6 +1032,7 @@
<net.alchim31.maven.version>4.8.1</net.alchim31.maven.version> <net.alchim31.maven.version>4.8.1</net.alchim31.maven.version>
<!-- dependencies --> <!-- dependencies -->
<dhp.hadoop.version>3.3.4</dhp.hadoop.version>
<common.compress.version>1.23.0</common.compress.version> <common.compress.version>1.23.0</common.compress.version>
<common.csv.version>1.8</common.csv.version> <common.csv.version>1.8</common.csv.version>
<common.text.version>1.10.0</common.text.version> <common.text.version>1.10.0</common.text.version>
@ -1049,7 +1046,7 @@
<dhp.guava.version>14.0.1</dhp.guava.version> <dhp.guava.version>14.0.1</dhp.guava.version>
<solr.version>8.11.0</solr.version> <solr.version>8.11.0</solr.version>
<sparksolr.version>4.0.4</sparksolr.version> <sparksolr.version>4.0.4</sparksolr.version>
<dhp.spark.version>3.5.1.openaire-SNAPSHOT</dhp.spark.version> <dhp.spark.version>3.5.3</dhp.spark.version>
<dhp.jackson.version>2.15.2</dhp.jackson.version> <dhp.jackson.version>2.15.2</dhp.jackson.version>
<dhp.commons.lang.version>3.12.0</dhp.commons.lang.version> <dhp.commons.lang.version>3.12.0</dhp.commons.lang.version>
<log4j.version>2.20.0</log4j.version> <log4j.version>2.20.0</log4j.version>
@ -1067,6 +1064,10 @@
<activation> <activation>
<jdk>[11</jdk> <jdk>[11</jdk>
</activation> </activation>
<properties>
<cxf.version>4.0.5</cxf.version>
<metro.version>4.0.4</metro.version>
</properties>
<build> <build>
<pluginManagement> <pluginManagement>
<plugins> <plugins>