forked from D-Net/dnet-hadoop
Revert "removed legacy actionmanager dependencies"
This reverts commit bb12d0b4df
.
This commit is contained in:
parent
e39e8bbd47
commit
db9c54c944
|
@ -50,12 +50,11 @@
|
||||||
<groupId>org.apache.hadoop</groupId>
|
<groupId>org.apache.hadoop</groupId>
|
||||||
<artifactId>hadoop-distcp</artifactId>
|
<artifactId>hadoop-distcp</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
<!--
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>eu.dnetlib</groupId>
|
<groupId>eu.dnetlib</groupId>
|
||||||
<artifactId>dnet-actionmanager-api</artifactId>
|
<artifactId>dnet-actionmanager-api</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>eu.dnetlib</groupId>
|
<groupId>eu.dnetlib</groupId>
|
||||||
<artifactId>dnet-actionmanager-common</artifactId>
|
<artifactId>dnet-actionmanager-common</artifactId>
|
||||||
|
@ -94,7 +93,6 @@
|
||||||
</exclusion>
|
</exclusion>
|
||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
-->
|
|
||||||
|
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
|
|
|
@ -4,6 +4,7 @@ package eu.dnetlib.dhp.actionmanager;
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.io.StringReader;
|
import java.io.StringReader;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.NoSuchElementException;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
@ -21,14 +22,13 @@ import com.google.common.base.Splitter;
|
||||||
import com.google.common.collect.Iterables;
|
import com.google.common.collect.Iterables;
|
||||||
import com.google.common.collect.Sets;
|
import com.google.common.collect.Sets;
|
||||||
|
|
||||||
|
import eu.dnetlib.actionmanager.rmi.ActionManagerException;
|
||||||
import eu.dnetlib.dhp.utils.ISLookupClientFactory;
|
import eu.dnetlib.dhp.utils.ISLookupClientFactory;
|
||||||
import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpException;
|
import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpException;
|
||||||
import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService;
|
import eu.dnetlib.enabling.is.lookup.rmi.ISLookUpService;
|
||||||
|
|
||||||
public class ISClient implements Serializable {
|
public class ISClient implements Serializable {
|
||||||
|
|
||||||
private static final long serialVersionUID = 4632443200867340872L;
|
|
||||||
|
|
||||||
private static final Logger log = LoggerFactory.getLogger(ISClient.class);
|
private static final Logger log = LoggerFactory.getLogger(ISClient.class);
|
||||||
|
|
||||||
private static final String INPUT_ACTION_SET_ID_SEPARATOR = ",";
|
private static final String INPUT_ACTION_SET_ID_SEPARATOR = ",";
|
||||||
|
@ -65,7 +65,7 @@ public class ISClient implements Serializable {
|
||||||
.map(t -> buildDirectory(basePath, t))
|
.map(t -> buildDirectory(basePath, t))
|
||||||
.collect(Collectors.toList()))
|
.collect(Collectors.toList()))
|
||||||
.orElseThrow(() -> new IllegalStateException("empty set list"));
|
.orElseThrow(() -> new IllegalStateException("empty set list"));
|
||||||
} catch (ISLookUpException e) {
|
} catch (ActionManagerException | ISLookUpException e) {
|
||||||
throw new IllegalStateException("unable to query ActionSets info from the IS");
|
throw new IllegalStateException("unable to query ActionSets info from the IS");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -89,18 +89,31 @@ public class ISClient implements Serializable {
|
||||||
return Joiner.on("/").join(basePath, t.getMiddle(), t.getRight());
|
return Joiner.on("/").join(basePath, t.getMiddle(), t.getRight());
|
||||||
}
|
}
|
||||||
|
|
||||||
private String getBasePathHDFS(ISLookUpService isLookup) throws ISLookUpException {
|
private String getBasePathHDFS(ISLookUpService isLookup) throws ActionManagerException {
|
||||||
return queryServiceProperty(isLookup, "basePath");
|
return queryServiceProperty(isLookup, "basePath");
|
||||||
}
|
}
|
||||||
|
|
||||||
private String queryServiceProperty(ISLookUpService isLookup, final String propertyName)
|
private String queryServiceProperty(ISLookUpService isLookup, final String propertyName)
|
||||||
throws ISLookUpException {
|
throws ActionManagerException {
|
||||||
final String q = "for $x in /RESOURCE_PROFILE[.//RESOURCE_TYPE/@value='ActionManagerServiceResourceType'] return $x//SERVICE_PROPERTIES/PROPERTY[./@ key='"
|
final String q = "for $x in /RESOURCE_PROFILE[.//RESOURCE_TYPE/@value='ActionManagerServiceResourceType'] return $x//SERVICE_PROPERTIES/PROPERTY[./@ key='"
|
||||||
+ propertyName
|
+ propertyName
|
||||||
+ "']/@value/string()";
|
+ "']/@value/string()";
|
||||||
log.debug("quering for service property: {}", q);
|
log.debug("quering for service property: {}", q);
|
||||||
|
try {
|
||||||
final List<String> value = isLookup.quickSearchProfile(q);
|
final List<String> value = isLookup.quickSearchProfile(q);
|
||||||
return Iterables.getOnlyElement(value);
|
return Iterables.getOnlyElement(value);
|
||||||
|
} catch (ISLookUpException e) {
|
||||||
|
String msg = "Error accessing service profile, using query: " + q;
|
||||||
|
log.error(msg, e);
|
||||||
|
throw new ActionManagerException(msg, e);
|
||||||
|
} catch (NoSuchElementException e) {
|
||||||
|
String msg = "missing service property: " + propertyName;
|
||||||
|
log.error(msg, e);
|
||||||
|
throw new ActionManagerException(msg, e);
|
||||||
|
} catch (IllegalArgumentException e) {
|
||||||
|
String msg = "found more than one service property: " + propertyName;
|
||||||
|
log.error(msg, e);
|
||||||
|
throw new ActionManagerException(msg, e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -51,6 +51,49 @@
|
||||||
<artifactId>hadoop-distcp</artifactId>
|
<artifactId>hadoop-distcp</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>eu.dnetlib</groupId>
|
||||||
|
<artifactId>dnet-actionmanager-api</artifactId>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>eu.dnetlib</groupId>
|
||||||
|
<artifactId>dnet-actionmanager-common</artifactId>
|
||||||
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>eu.dnetlib</groupId>
|
||||||
|
<artifactId>dnet-openaireplus-mapping-utils</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>saxonica</groupId>
|
||||||
|
<artifactId>saxon</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>saxonica</groupId>
|
||||||
|
<artifactId>saxon-dom</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>jgrapht</groupId>
|
||||||
|
<artifactId>jgrapht</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>net.sf.ehcache</groupId>
|
||||||
|
<artifactId>ehcache</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>org.springframework</groupId>
|
||||||
|
<artifactId>spring-test</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>org.apache.*</groupId>
|
||||||
|
<artifactId>*</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>apache</groupId>
|
||||||
|
<artifactId>*</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.httpcomponents</groupId>
|
<groupId>org.apache.httpcomponents</groupId>
|
||||||
<artifactId>httpclient</artifactId>
|
<artifactId>httpclient</artifactId>
|
||||||
|
|
331
pom.xml
331
pom.xml
|
@ -13,7 +13,8 @@
|
||||||
<distribution>repo</distribution>
|
<distribution>repo</distribution>
|
||||||
<comments>This program is free software: you can redistribute it and/or modify it under the terms of the
|
<comments>This program is free software: you can redistribute it and/or modify it under the terms of the
|
||||||
GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the
|
GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the
|
||||||
License, or (at your option) any later version.</comments>
|
License, or (at your option) any later version.
|
||||||
|
</comments>
|
||||||
</license>
|
</license>
|
||||||
</licenses>
|
</licenses>
|
||||||
|
|
||||||
|
@ -22,6 +23,7 @@
|
||||||
<module>dhp-pace-core</module>
|
<module>dhp-pace-core</module>
|
||||||
<module>dhp-common</module>
|
<module>dhp-common</module>
|
||||||
<module>dhp-workflows</module>
|
<module>dhp-workflows</module>
|
||||||
|
<module>dhp-shade-package</module>
|
||||||
</modules>
|
</modules>
|
||||||
|
|
||||||
<issueManagement>
|
<issueManagement>
|
||||||
|
@ -47,6 +49,19 @@
|
||||||
</pluginRepositories>
|
</pluginRepositories>
|
||||||
|
|
||||||
<repositories>
|
<repositories>
|
||||||
|
|
||||||
|
<repository>
|
||||||
|
<id>Openaire-third-parties-snaphot</id>
|
||||||
|
<name>Openaire third parties Snapshot</name>
|
||||||
|
<url>https://maven.d4science.org/nexus/content/repositories/Openaire-third-parties-snaphot/</url>
|
||||||
|
<releases>
|
||||||
|
<enabled>false</enabled>
|
||||||
|
</releases>
|
||||||
|
<snapshots>
|
||||||
|
<enabled>true</enabled>
|
||||||
|
</snapshots>
|
||||||
|
</repository>
|
||||||
|
|
||||||
<repository>
|
<repository>
|
||||||
<id>dnet45-releases</id>
|
<id>dnet45-releases</id>
|
||||||
<name>D-Net 45 releases</name>
|
<name>D-Net 45 releases</name>
|
||||||
|
@ -125,6 +140,13 @@
|
||||||
</repositories>
|
</repositories>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
<!-- Quick FIX not to remove lombok everywhere -->
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.projectlombok</groupId>
|
||||||
|
<artifactId>lombok</artifactId>
|
||||||
|
<version>1.18.28</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.junit.jupiter</groupId>
|
<groupId>org.junit.jupiter</groupId>
|
||||||
<artifactId>junit-jupiter</artifactId>
|
<artifactId>junit-jupiter</artifactId>
|
||||||
|
@ -152,7 +174,7 @@
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>eu.dnetlib.dhp</groupId>
|
<groupId>eu.dnetlib.dhp</groupId>
|
||||||
<artifactId>${dhp-schemas.artifact}</artifactId>
|
<artifactId>dhp-schemas</artifactId>
|
||||||
<version>${dhp-schemas.version}</version>
|
<version>${dhp-schemas.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -206,33 +228,76 @@
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.slf4j</groupId>
|
<groupId>org.slf4j</groupId>
|
||||||
<artifactId>jcl-over-slf4j</artifactId>
|
<artifactId>slf4j-api</artifactId>
|
||||||
<version>1.7.25</version>
|
<version>${org.slf4j.version}</version>
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.slf4j</groupId>
|
||||||
|
<artifactId>slf4j-log4j12</artifactId>
|
||||||
|
<version>${org.slf4j.version}</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.slf4j</groupId>
|
||||||
|
<artifactId>jcl-over-slf4j</artifactId>
|
||||||
|
<version>${org.slf4j.version}</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.logging.log4j</groupId>
|
||||||
|
<artifactId>log4j-slf4j2-impl</artifactId>
|
||||||
|
<version>${log4j.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.logging.log4j</groupId>
|
||||||
|
<artifactId>log4j-api</artifactId>
|
||||||
|
<version>${log4j.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.logging.log4j</groupId>
|
||||||
|
<artifactId>log4j-core</artifactId>
|
||||||
|
<version>${log4j.version}</version>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<!-- API bridge between log4j 1 and 2 -->
|
||||||
|
<groupId>org.apache.logging.log4j</groupId>
|
||||||
|
<artifactId>log4j-1.2-api</artifactId>
|
||||||
|
<version>${log4j.version}</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.commons</groupId>
|
<groupId>org.apache.commons</groupId>
|
||||||
<artifactId>commons-lang3</artifactId>
|
<artifactId>commons-lang3</artifactId>
|
||||||
<version>${dhp.commons.lang.version}</version>
|
<version>${dhp.commons.lang.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.apache.commons</groupId>
|
||||||
|
<artifactId>commons-beanutils</artifactId>
|
||||||
|
<version>${commons-beanutils.version}</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-validator</groupId>
|
<groupId>commons-validator</groupId>
|
||||||
<artifactId>commons-validator</artifactId>
|
<artifactId>commons-validator</artifactId>
|
||||||
<version>1.7</version>
|
<version>${commons-validator.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.sisyphsu</groupId>
|
<groupId>com.github.sisyphsu</groupId>
|
||||||
<artifactId>dateparser</artifactId>
|
<artifactId>dateparser</artifactId>
|
||||||
<version>1.0.7</version>
|
<version>${dateparser.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>me.xuender</groupId>
|
<groupId>me.xuender</groupId>
|
||||||
<artifactId>unidecode</artifactId>
|
<artifactId>unidecode</artifactId>
|
||||||
<version>0.0.7</version>
|
<version>${unidecode.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -245,13 +310,13 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-codec</groupId>
|
<groupId>commons-codec</groupId>
|
||||||
<artifactId>commons-codec</artifactId>
|
<artifactId>commons-codec</artifactId>
|
||||||
<version>1.9</version>
|
<version>${commons-codec.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>commons-io</groupId>
|
<groupId>commons-io</groupId>
|
||||||
<artifactId>commons-io</artifactId>
|
<artifactId>commons-io</artifactId>
|
||||||
<version>2.4</version>
|
<version>${commons-io.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -345,7 +410,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.zookeeper</groupId>
|
<groupId>org.apache.zookeeper</groupId>
|
||||||
<artifactId>zookeeper</artifactId>
|
<artifactId>zookeeper</artifactId>
|
||||||
<version>3.4.11</version>
|
<version>${zookeeper.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -375,6 +440,29 @@
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>eu.dnetlib</groupId>
|
||||||
|
<artifactId>dnet-actionmanager-common</artifactId>
|
||||||
|
<version>${dnet-actionmanager-common.version}</version>
|
||||||
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>org.apache.hadoop</groupId>
|
||||||
|
<artifactId>hadoop-common</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>eu.dnetlib</groupId>
|
||||||
|
<artifactId>dnet-actionmanager-api</artifactId>
|
||||||
|
<version>${dnet-actionmanager-api.version}</version>
|
||||||
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>eu.dnetlib</groupId>
|
||||||
|
<artifactId>cnr-misc-utils</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>eu.dnetlib</groupId>
|
<groupId>eu.dnetlib</groupId>
|
||||||
<artifactId>cnr-rmi-api</artifactId>
|
<artifactId>cnr-rmi-api</artifactId>
|
||||||
|
@ -392,6 +480,7 @@
|
||||||
<artifactId>cxf-rt-transports-http</artifactId>
|
<artifactId>cxf-rt-transports-http</artifactId>
|
||||||
<version>3.1.5</version>
|
<version>3.1.5</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>javax.persistence</groupId>
|
<groupId>javax.persistence</groupId>
|
||||||
<artifactId>javax.persistence-api</artifactId>
|
<artifactId>javax.persistence-api</artifactId>
|
||||||
|
@ -481,16 +570,11 @@
|
||||||
<artifactId>commons-compress</artifactId>
|
<artifactId>commons-compress</artifactId>
|
||||||
<version>${common.compress.version}</version>
|
<version>${common.compress.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- https://mvnrepository.com/artifact/org.apache.commons/commons-csv -->
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.commons</groupId>
|
<groupId>org.apache.commons</groupId>
|
||||||
<artifactId>commons-csv</artifactId>
|
<artifactId>commons-csv</artifactId>
|
||||||
<version>${common.csv.version}</version>
|
<version>${common.csv.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
<!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml -->
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.poi</groupId>
|
<groupId>org.apache.poi</groupId>
|
||||||
<artifactId>poi-ooxml</artifactId>
|
<artifactId>poi-ooxml</artifactId>
|
||||||
|
@ -545,14 +629,12 @@
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.commons</groupId>
|
<groupId>org.apache.commons</groupId>
|
||||||
<artifactId>commons-math3</artifactId>
|
<artifactId>commons-math3</artifactId>
|
||||||
<version>3.6.1</version>
|
<version>3.6.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.google.code.gson</groupId>
|
<groupId>com.google.code.gson</groupId>
|
||||||
<artifactId>gson</artifactId>
|
<artifactId>gson</artifactId>
|
||||||
|
@ -573,7 +655,7 @@
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.reflections</groupId>
|
<groupId>org.reflections</groupId>
|
||||||
<artifactId>reflections</artifactId>
|
<artifactId>reflections</artifactId>
|
||||||
<version>0.9.10</version>
|
<version>${reflections.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -587,6 +669,12 @@
|
||||||
<artifactId>icu4j</artifactId>
|
<artifactId>icu4j</artifactId>
|
||||||
<version>70.1</version>
|
<version>70.1</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.javassist</groupId>
|
||||||
|
<artifactId>javassist</artifactId>
|
||||||
|
<version>${javassist.version}</version>
|
||||||
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</dependencyManagement>
|
</dependencyManagement>
|
||||||
|
|
||||||
|
@ -654,6 +742,7 @@
|
||||||
<version>3.0.0-M4</version>
|
<version>3.0.0-M4</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<redirectTestOutputToFile>true</redirectTestOutputToFile>
|
<redirectTestOutputToFile>true</redirectTestOutputToFile>
|
||||||
|
<trimStackTrace>false</trimStackTrace>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
@ -723,7 +812,7 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>net.revelc.code</groupId>
|
<groupId>net.revelc.code</groupId>
|
||||||
<artifactId>impsort-maven-plugin</artifactId>
|
<artifactId>impsort-maven-plugin</artifactId>
|
||||||
<version>1.4.1</version>
|
<version>1.6.2</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<groups>java.,javax.,org.,com.</groups>
|
<groups>java.,javax.,org.,com.</groups>
|
||||||
<staticGroups>java,*</staticGroups>
|
<staticGroups>java,*</staticGroups>
|
||||||
|
@ -744,7 +833,9 @@
|
||||||
<groupId>org.antipathy</groupId>
|
<groupId>org.antipathy</groupId>
|
||||||
<artifactId>mvn-scalafmt_${scala.binary.version}</artifactId>
|
<artifactId>mvn-scalafmt_${scala.binary.version}</artifactId>
|
||||||
<configuration>
|
<configuration>
|
||||||
<configLocation>https://code-repo.d4science.org/D-Net/dnet-hadoop/raw/branch/beta/dhp-build/dhp-code-style/src/main/resources/scalafmt/scalafmt.conf</configLocation>
|
<configLocation>
|
||||||
|
https://code-repo.d4science.org/D-Net/dnet-hadoop/raw/branch/beta/dhp-build/dhp-code-style/src/main/resources/scalafmt/scalafmt.conf
|
||||||
|
</configLocation>
|
||||||
<skipTestSources>false</skipTestSources>
|
<skipTestSources>false</skipTestSources>
|
||||||
<skipSources>false</skipSources>
|
<skipSources>false</skipSources>
|
||||||
<sourceDirectories>
|
<sourceDirectories>
|
||||||
|
@ -775,7 +866,7 @@
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.jacoco</groupId>
|
<groupId>org.jacoco</groupId>
|
||||||
<artifactId>jacoco-maven-plugin</artifactId>
|
<artifactId>jacoco-maven-plugin</artifactId>
|
||||||
<version>0.7.9</version>
|
<version>0.8.10</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<excludes>
|
<excludes>
|
||||||
<exclude>**/schemas/*</exclude>
|
<exclude>**/schemas/*</exclude>
|
||||||
|
@ -843,88 +934,174 @@
|
||||||
<dhp.site.stage.path>sftp://dnet-hadoop@static-web.d4science.org/dnet-hadoop</dhp.site.stage.path>
|
<dhp.site.stage.path>sftp://dnet-hadoop@static-web.d4science.org/dnet-hadoop</dhp.site.stage.path>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||||
<maven.compiler.plugin.version>3.6.0</maven.compiler.plugin.version>
|
|
||||||
<maven.compiler.source>1.8</maven.compiler.source>
|
<maven.compiler.source>1.8</maven.compiler.source>
|
||||||
<maven.compiler.target>1.8</maven.compiler.target>
|
<maven.compiler.target>1.8</maven.compiler.target>
|
||||||
<maven.failsave.plugin.version>2.22.2</maven.failsave.plugin.version>
|
|
||||||
<properties.maven.plugin.version>2.0.1</properties.maven.plugin.version>
|
<!-- scala version -->
|
||||||
<dhp.cdh.version>cdh5.9.2</dhp.cdh.version>
|
|
||||||
<dhp.hadoop.version>2.6.0-${dhp.cdh.version}</dhp.hadoop.version>
|
|
||||||
<dhp.oozie.version>4.1.0-${dhp.cdh.version}</dhp.oozie.version>
|
|
||||||
<dhp-schemas.artifact>dhp-schemas</dhp-schemas.artifact>
|
|
||||||
<sparksolr.version>3.6.0</sparksolr.version>
|
|
||||||
<dhp.spark.version>2.4.0.cloudera2</dhp.spark.version>
|
|
||||||
<dhp.jackson.version>2.9.6</dhp.jackson.version>
|
|
||||||
<dhp.commons.lang.version>3.5</dhp.commons.lang.version>
|
|
||||||
<dhp.site.skip>true</dhp.site.skip>
|
|
||||||
<dhp.guava.version>11.0.2</dhp.guava.version>
|
|
||||||
<scala.version>2.11.12</scala.version>
|
<scala.version>2.11.12</scala.version>
|
||||||
<scala.binary.version>2.11</scala.binary.version>
|
<scala.binary.version>2.11</scala.binary.version>
|
||||||
<scala-xml.version>1.3.0</scala-xml.version>
|
|
||||||
|
<!-- plugin versions -->
|
||||||
|
<maven.compiler.plugin.version>3.6.0</maven.compiler.plugin.version>
|
||||||
|
<maven.failsave.plugin.version>2.22.2</maven.failsave.plugin.version>
|
||||||
|
<properties.maven.plugin.version>2.0.1</properties.maven.plugin.version>
|
||||||
|
<net.alchim31.maven.version>4.0.1</net.alchim31.maven.version>
|
||||||
|
|
||||||
|
<!-- dependency versions -->
|
||||||
|
<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.csv.version>1.8</common.csv.version>
|
||||||
|
<common.text.version>1.8</common.text.version>
|
||||||
|
<commons-beanutils.version>1.9.4</commons-beanutils.version>
|
||||||
|
<commons-codec.version>1.9</commons-codec.version>
|
||||||
|
<commons.collections.version>3.2.1</commons.collections.version>
|
||||||
|
<commons-io.version>2.4</commons-io.version>
|
||||||
|
<commons.logging.version>1.1.3</commons.logging.version>
|
||||||
|
<commons-validator.version>1.7</commons-validator.version>
|
||||||
|
<dateparser.version>1.0.7</dateparser.version>
|
||||||
|
<dhp-schemas.version>[6.1.4-SNAPSHOT]</dhp-schemas.version>
|
||||||
|
<dhp.cdh.version>cdh5.9.2</dhp.cdh.version>
|
||||||
|
<dhp.commons.lang.version>3.5</dhp.commons.lang.version>
|
||||||
|
<dhp.guava.version>11.0.2</dhp.guava.version>
|
||||||
|
<dhp.hadoop.version>2.6.0-${dhp.cdh.version}</dhp.hadoop.version>
|
||||||
|
<dhp.jackson.version>2.9.6</dhp.jackson.version>
|
||||||
|
<dhp.oozie.version>4.1.0-${dhp.cdh.version}</dhp.oozie.version>
|
||||||
|
<dhp.site.skip>true</dhp.site.skip>
|
||||||
|
<dhp.spark.version>2.4.0.cloudera2</dhp.spark.version>
|
||||||
|
<dnet-actionmanager-api.version>[4.0.3]</dnet-actionmanager-api.version>
|
||||||
|
<dnet-actionmanager-common.version>[6.0.5]</dnet-actionmanager-common.version>
|
||||||
|
<dnet-openaire-broker-common.version>[3.1.6]</dnet-openaire-broker-common.version>
|
||||||
|
<google.gson.version>2.2.2</google.gson.version>
|
||||||
|
<log4j.version>1.2.17</log4j.version>
|
||||||
|
<javassist.version>3.19.0-GA</javassist.version>
|
||||||
|
<json4s.version>3.5.3</json4s.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>
|
||||||
<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>
|
||||||
<vtd.version>[2.12,3.0)</vtd.version>
|
|
||||||
<dhp-schemas.version>[6.1.3]</dhp-schemas.version>
|
|
||||||
<dnet-openaire-broker-common.version>[3.1.6]</dnet-openaire-broker-common.version>
|
|
||||||
<cnr-rmi-api.version>[2.6.1]</cnr-rmi-api.version>
|
|
||||||
<solr.version>7.5.0</solr.version>
|
|
||||||
<okhttp.version>4.7.2</okhttp.version>
|
<okhttp.version>4.7.2</okhttp.version>
|
||||||
<common.compress.version>1.20</common.compress.version>
|
|
||||||
<json4s.version>3.5.3</json4s.version>
|
|
||||||
<jsonschemagenerator.version>4.13.0</jsonschemagenerator.version>
|
|
||||||
<common.csv.version>1.8</common.csv.version>
|
|
||||||
<apache.poi.version>4.1.2</apache.poi.version>
|
|
||||||
<common.text.version>1.8</common.text.version>
|
|
||||||
<org.apache.httpcomponents.version>4.5.3</org.apache.httpcomponents.version>
|
<org.apache.httpcomponents.version>4.5.3</org.apache.httpcomponents.version>
|
||||||
<net.alchim31.maven.version>4.0.1</net.alchim31.maven.version>
|
<org.slf4j.version>1.7.25</org.slf4j.version>
|
||||||
<google.gson.version>2.2.2</google.gson.version>
|
<reflections.version>0.9.10</reflections.version>
|
||||||
<commons.logging.version>1.1.3</commons.logging.version>
|
<scala-xml.version>1.3.0</scala-xml.version>
|
||||||
<commons.collections.version>3.2.1</commons.collections.version>
|
<solr.version>7.5.0</solr.version>
|
||||||
|
<sparksolr.version>3.6.0</sparksolr.version>
|
||||||
|
<unidecode.version>0.0.7</unidecode.version>
|
||||||
|
<vtd.version>[2.12,3.0)</vtd.version>
|
||||||
|
<zookeeper.version>3.4.6</zookeeper.version>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<!-- Build with scala 12 and Spark 3.4 -->
|
<!-- Build with scala 12 and Spark 3.4 -->
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
<id>scala-2.12</id>
|
<id>spark-34</id>
|
||||||
<properties>
|
<properties>
|
||||||
<scala.binary.version>2.12</scala.binary.version>
|
<scala.binary.version>2.12</scala.binary.version>
|
||||||
<scala.version>2.12.18</scala.version>
|
<scala.version>2.12.18</scala.version>
|
||||||
<!-- scala-xml.version>2.1.0</scala-xml.version -->
|
<scala-xml.version>1.3.0</scala-xml.version>
|
||||||
|
|
||||||
|
<!-- plugin versions -->
|
||||||
<sparksolr.version>4.0.2</sparksolr.version>
|
|
||||||
<dhp.spark.version>3.4.1</dhp.spark.version>
|
|
||||||
<dhp.jackson.version>2.14.2</dhp.jackson.version>
|
|
||||||
<dhp.commons.lang.version>3.12.0</dhp.commons.lang.version>
|
|
||||||
<json4s.version>3.7.0-M11</json4s.version>
|
|
||||||
<net.alchim31.maven.version>4.8.1</net.alchim31.maven.version>
|
<net.alchim31.maven.version>4.8.1</net.alchim31.maven.version>
|
||||||
|
|
||||||
<!--
|
<!-- dependencies -->
|
||||||
<dhp-schemas.artifact>dhp-schemas_${scala.binary.version}</dhp-schemas.artifact>
|
<common.compress.version>1.22</common.compress.version>
|
||||||
<dhp-schemas.version>3.17.2-SNAPSHOT</dhp-schemas.version>
|
<common.csv.version>1.8</common.csv.version>
|
||||||
-->
|
<common.text.version>1.10.0</common.text.version>
|
||||||
|
<commons-beanutils.version>1.9.4</commons-beanutils.version>
|
||||||
|
<commons-codec.version>1.15</commons-codec.version>
|
||||||
|
<commons.collections.version>3.2.2</commons.collections.version>
|
||||||
|
<commons-io.version>2.11.0</commons-io.version>
|
||||||
|
<commons.logging.version>1.1.3</commons.logging.version>
|
||||||
|
<commons-validator.version>1.7</commons-validator.version>
|
||||||
|
|
||||||
|
<dhp.guava.version>14.0.1</dhp.guava.version>
|
||||||
|
<solr.version>8.11.0</solr.version>
|
||||||
|
<sparksolr.version>4.0.4</sparksolr.version>
|
||||||
|
<dhp.spark.version>3.4.2.openaire</dhp.spark.version>
|
||||||
|
<dhp.jackson.version>2.14.2</dhp.jackson.version>
|
||||||
|
<dhp.commons.lang.version>3.12.0</dhp.commons.lang.version>
|
||||||
|
<log4j.version>2.19.0</log4j.version>
|
||||||
|
<json4s.version>3.7.0-M11</json4s.version>
|
||||||
|
<javassist.version>3.25.0-GA</javassist.version>
|
||||||
|
<okhttp.version>4.10.0</okhttp.version>
|
||||||
|
<org.slf4j.version>2.0.6</org.slf4j.version>
|
||||||
|
<reflections.version>0.10.2</reflections.version>
|
||||||
|
<zookeeper.version>3.6.3</zookeeper.version>
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</profile>
|
||||||
|
|
||||||
<!-- Activate ARM-compatible snappy dependency on new Silicon Macs -->
|
|
||||||
<profile>
|
<profile>
|
||||||
<id>arm-silicon-mac</id>
|
<id>spark-35</id>
|
||||||
|
<properties>
|
||||||
|
<scala.binary.version>2.12</scala.binary.version>
|
||||||
|
<scala.version>2.12.18</scala.version>
|
||||||
|
<scala-xml.version>1.3.0</scala-xml.version>
|
||||||
|
|
||||||
|
<!-- plugin versions -->
|
||||||
|
<net.alchim31.maven.version>4.8.1</net.alchim31.maven.version>
|
||||||
|
|
||||||
|
<!-- dependencies -->
|
||||||
|
<common.compress.version>1.23.0</common.compress.version>
|
||||||
|
<common.csv.version>1.8</common.csv.version>
|
||||||
|
<common.text.version>1.10.0</common.text.version>
|
||||||
|
<commons-beanutils.version>1.9.4</commons-beanutils.version>
|
||||||
|
<commons-codec.version>1.16.0</commons-codec.version>
|
||||||
|
<commons.collections.version>3.2.2</commons.collections.version>
|
||||||
|
<commons-io.version>2.13.0</commons-io.version>
|
||||||
|
<commons.logging.version>1.1.3</commons.logging.version>
|
||||||
|
<commons-validator.version>1.7</commons-validator.version>
|
||||||
|
|
||||||
|
<dhp.guava.version>14.0.1</dhp.guava.version>
|
||||||
|
<solr.version>8.11.0</solr.version>
|
||||||
|
<sparksolr.version>4.0.4</sparksolr.version>
|
||||||
|
<dhp.spark.version>3.5.1.openaire-SNAPSHOT</dhp.spark.version>
|
||||||
|
<dhp.jackson.version>2.15.2</dhp.jackson.version>
|
||||||
|
<dhp.commons.lang.version>3.12.0</dhp.commons.lang.version>
|
||||||
|
<log4j.version>2.20.0</log4j.version>
|
||||||
|
<json4s.version>3.7.0-M11</json4s.version>
|
||||||
|
<javassist.version>3.25.0-GA</javassist.version>
|
||||||
|
<okhttp.version>4.10.0</okhttp.version>
|
||||||
|
<org.slf4j.version>2.0.7</org.slf4j.version>
|
||||||
|
<reflections.version>0.10.2</reflections.version>
|
||||||
|
<zookeeper.version>3.6.3</zookeeper.version>
|
||||||
|
</properties>
|
||||||
|
</profile>
|
||||||
|
|
||||||
|
<profile>
|
||||||
|
<id>java11</id>
|
||||||
<activation>
|
<activation>
|
||||||
<os>
|
<jdk>[11</jdk>
|
||||||
<arch>aarch64</arch>
|
|
||||||
<family>mac</family>
|
|
||||||
</os>
|
|
||||||
</activation>
|
</activation>
|
||||||
<dependencyManagement>
|
<build>
|
||||||
<dependencies>
|
<pluginManagement>
|
||||||
<dependency>
|
<plugins>
|
||||||
<groupId>org.xerial.snappy</groupId>
|
<plugin>
|
||||||
<artifactId>snappy-java</artifactId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<version>1.1.8.4</version>
|
<artifactId>maven-surefire-plugin</artifactId>
|
||||||
</dependency>
|
<version>3.0.0-M4</version>
|
||||||
</dependencies>
|
<configuration>
|
||||||
</dependencyManagement>
|
<!-- only for java 11+ to run spark in tests -->
|
||||||
|
<argLine>--add-opens=java.base/java.lang=ALL-UNNAMED
|
||||||
|
--add-opens=java.base/java.lang.invoke=ALL-UNNAMED
|
||||||
|
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
|
||||||
|
--add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED
|
||||||
|
--add-opens=java.base/java.nio=ALL-UNNAMED
|
||||||
|
--add-opens=java.base/java.util=ALL-UNNAMED
|
||||||
|
--add-opens=java.base/java.util.concurrent=ALL-UNNAMED
|
||||||
|
--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED
|
||||||
|
--add-opens=java.base/sun.nio.ch=ALL-UNNAMED
|
||||||
|
--add-opens=java.base/sun.nio.cs=ALL-UNNAMED
|
||||||
|
--add-opens=java.base/sun.security.action=ALL-UNNAMED
|
||||||
|
--add-opens=java.base/sun.util.calendar=ALL-UNNAMED
|
||||||
|
</argLine>
|
||||||
|
<redirectTestOutputToFile>true</redirectTestOutputToFile>
|
||||||
|
<trimStackTrace>false</trimStackTrace>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</pluginManagement>
|
||||||
|
</build>
|
||||||
</profile>
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
</project>
|
</project>
|
Loading…
Reference in New Issue