From acf3cc340266f96d9da2bd0f797ea58f257235c1 Mon Sep 17 00:00:00 2001
From: Marcin Ireneusz Trycz <marcinireneusz.trycz@cnr.it>
Date: Wed, 11 Dec 2019 10:56:48 +0100
Subject: [PATCH] Build su Java 11

---
 pom.xml                                                  | 6 +++++-
 .../it/cnr/si/flows/ng/service/FlowsMailService.java     | 2 +-
 src/main/java/it/cnr/si/service/HelpdeskService.java     | 9 +++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8f1e3f2f7..6e9856eb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,6 +25,10 @@
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
+        <repository>
+            <id>mavencentral</id>
+            <url>https://repo.maven.apache.org/maven2</url>
+        </repository>
     </repositories>
 
     <scm>
@@ -34,7 +38,7 @@
     </scm>
 
     <properties>
-        <ace-client.version>2.3.15</ace-client.version>
+        <ace-client.version>2.3.16</ace-client.version>
         <activiti.version>5.22.0</activiti.version>
         <assertj-core.version>3.5.2</assertj-core.version>
         <feign.version>9.7.0</feign.version>
diff --git a/src/main/java/it/cnr/si/flows/ng/service/FlowsMailService.java b/src/main/java/it/cnr/si/flows/ng/service/FlowsMailService.java
index 243ee7c74..e1d59e363 100644
--- a/src/main/java/it/cnr/si/flows/ng/service/FlowsMailService.java
+++ b/src/main/java/it/cnr/si/flows/ng/service/FlowsMailService.java
@@ -41,7 +41,7 @@ public class FlowsMailService extends MailService {
     private CnrgroupService cnrgroupService;
     @Autowired(required = false)
     private AceBridgeService aceBridgeService;
-    @Inject
+    @Autowired(required = false) //TODO
     private AceService aceService;
     @Inject
     private FlowsUserService flowsUserService;
diff --git a/src/main/java/it/cnr/si/service/HelpdeskService.java b/src/main/java/it/cnr/si/service/HelpdeskService.java
index d3e39774a..b5e8b4645 100644
--- a/src/main/java/it/cnr/si/service/HelpdeskService.java
+++ b/src/main/java/it/cnr/si/service/HelpdeskService.java
@@ -9,6 +9,7 @@
 import org.hibernate.service.spi.ServiceException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -25,11 +26,11 @@ public class HelpdeskService {
     private final static String REST_OIL_NEW_PROBLEM =  "pest/HDSiper";
     private final Logger log = LoggerFactory.getLogger(HelpdeskService.class);
     @Inject
-    ProxyService proxyService;
+    private ProxyService proxyService;
     @Inject
-    Utils utils;
-    @Inject
-    AceService aceService;
+    private Utils utils;
+    @Autowired(required = false)
+    private AceService aceService;
 
 
     public Long newProblem(ExternalProblem hd) throws ServiceException {