diff --git a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/GrantDaoImpl.java b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/GrantDaoImpl.java
index 84674491b..90cc0fa67 100644
--- a/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/GrantDaoImpl.java
+++ b/dmp-backend/data/src/main/java/eu/eudat/data/dao/entities/GrantDaoImpl.java
@@ -11,7 +11,6 @@ import eu.eudat.types.grant.GrantStateType;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Component;
-import schemasMicrosoftComOfficeOffice.LeftDocument;
import javax.persistence.criteria.JoinType;
import java.util.Date;
diff --git a/dmp-backend/pom.xml b/dmp-backend/pom.xml
index 16f74c1c1..60199781b 100644
--- a/dmp-backend/pom.xml
+++ b/dmp-backend/pom.xml
@@ -46,8 +46,12 @@
1.2.3
-
+
+ 4.0.0
+ 2.12.3
+ 7.6.2
+ 2.3.1
@@ -57,6 +61,7 @@
json
20160810
+
org.springframework
spring-context-support
@@ -67,68 +72,40 @@
spring-boot-starter-data-jpa
-
-
- org.elasticsearch
- elasticsearch
- 7.7.0
-
-
- org.apache.httpcomponents
- httpclient
-
-
- org.apache.httpcomponents
- httpcore
-
-
- org.apache.httpcomponents
- httpcore-nio
-
-
-
-
-
- org.apache.httpcomponents
- httpclient
- 4.5.12
-
-
-
- org.apache.httpcomponents
- httpcore-nio
- 4.4.13
-
-
-
- org.apache.httpcomponents
- httpcore
- 4.4.13
-
-
-
- org.elasticsearch.client
- elasticsearch-rest-high-level-client
- 7.6.0
-
-
- org.hibernate
- hibernate-core
- ${hibernate.version}
-
-
org.hibernate
hibernate-c3p0
${hibernate.version}
+
+
+
+ org.elasticsearch
+ elasticsearch
+ ${elasticsearch.version}
+
+
+
+ org.elasticsearch.client
+ elasticsearch-rest-high-level-client
+ ${elasticsearch.version}
+
+
+
+ org.elasticsearch.client
+ transport
+ ${elasticsearch.version}
+
+
+
com.google.api-client
google-api-client
1.23.0
+
com.jayway.jsonpath
@@ -136,33 +113,19 @@
2.4.0
-
-
-
- com.fasterxml.jackson.dataformat
- jackson-dataformat-xml
- 2.12.3
-
-
-
com.fasterxml.jackson.core
jackson-core
- 2.12.3
+ ${jackson.version}
com.fasterxml.jackson.core
jackson-databind
- 2.12.3
+ ${jackson.version}
-
-
-
-
-
org.apache.commons
@@ -173,13 +136,13 @@
org.apache.poi
poi-ooxml
- 4.0.0
+ ${apache.poi.version}
org.apache.poi
poi
- 4.0.0
+ ${apache.poi.version}
@@ -194,24 +157,14 @@
jsoup
1.14.3
-
-
- fr.opensagres.xdocreport
- org.apache.poi.xwpf.converter.pdf
- 1.0.6
-
+
+
fr.opensagres.xdocreport
org.apache.poi.xwpf.converter.core
1.0.6
-
-
- fr.opensagres.xdocreport
- fr.opensagres.xdocreport.itext.extension
- 2.0.1
-
commons-io
@@ -219,28 +172,11 @@
2.1
-
-
-
- org.elasticsearch.client
- transport
- 7.6.0
-
-
-
-
javax.xml.bind
jaxb-api
- 2.3.1
+ ${jaxb.version}
@@ -254,7 +190,7 @@
org.glassfish.jaxb
jaxb-runtime
- 2.3.1
+ ${jaxb.version}
@@ -272,32 +208,7 @@
2.0.1.Final
-
-
-
- io.prometheus
- simpleclient
- 0.11.0
-
-
-
- io.prometheus
- simpleclient_hotspot
- 0.11.0
-
-
-
- io.prometheus
- simpleclient_httpserver
- 0.11.0
-
-
-
- io.prometheus
- simpleclient_pushgateway
- 0.11.0
-
-
+
io.micrometer
diff --git a/dmp-backend/queryable/src/main/java/eu/eudat/queryable/collector/ProjectionField.java b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/collector/ProjectionField.java
index d76e33c0c..0a4d2f80a 100644
--- a/dmp-backend/queryable/src/main/java/eu/eudat/queryable/collector/ProjectionField.java
+++ b/dmp-backend/queryable/src/main/java/eu/eudat/queryable/collector/ProjectionField.java
@@ -1,7 +1,5 @@
package eu.eudat.queryable.collector;
-import com.google.common.collect.Lists;
-
import javax.persistence.Tuple;
import java.util.*;
import java.util.stream.Collectors;
@@ -68,7 +66,8 @@ public class ProjectionField {
list.add(current.parent.key);
current = current.parent;
}
- return String.join(".", Lists.reverse(list));
+ Collections.reverse(list);
+ return String.join(".", list);
}
private Object createObject(List tuples, String field) {
diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/B2Access/B2AccessCustomProviderImpl.java b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/B2Access/B2AccessCustomProviderImpl.java
index c986edb01..7bdda1fc6 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/B2Access/B2AccessCustomProviderImpl.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/logic/security/customproviders/B2Access/B2AccessCustomProviderImpl.java
@@ -1,6 +1,5 @@
package eu.eudat.logic.security.customproviders.B2Access;
-import com.google.api.client.repackaged.org.apache.commons.codec.binary.Base64;
import eu.eudat.logic.security.validators.b2access.helpers.B2AccessResponseToken;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.env.Environment;
@@ -14,6 +13,7 @@ import org.springframework.util.MultiValueMap;
import org.springframework.web.client.RestTemplate;
import java.nio.charset.Charset;
+import java.util.Base64;
import java.util.Map;
@Component("b2AccessCustomProvider")
@@ -60,8 +60,7 @@ public class B2AccessCustomProviderImpl implements B2AccessCustomProvider {
private HttpHeaders createBasicAuthHeaders(String username, String password) {
return new HttpHeaders() {{
String auth = username + ":" + password;
- byte[] encodedAuth = Base64.encodeBase64(
- auth.getBytes(Charset.forName("US-ASCII")));
+ byte[] encodedAuth = Base64.getEncoder().encode(auth.getBytes(Charset.forName("US-ASCII")));
String authHeader = "Basic " + new String(encodedAuth);
set("Authorization", authHeader);
}};