Fixed build problems

Fixed a build problem cause by a merge
error from previous commits.

Fixes warnings from maven compile

Change-Id: I1ce88b2686b3be5ecd17113cbfde3e65297c27c6
Issue-ID: DCAEGEN2-1118
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>

diff --git a/datafile-app-server/pom.xml b/datafile-app-server/pom.xml
index ae15ffe..122989f 100644 (file)
--- a/datafile-app-server/pom.xml
+++ b/datafile-app-server/pom.xml
@@ -51,6 +51,13 @@
           <finalName>${project.artifactId}</finalName>
           <mainClass>org.onap.dcaegen2.collectors.datafile.MainApp</mainClass>
         </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>build-info</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>com.spotify</groupId>
@@ -122,18 +129,6 @@
         </executions>
       </plugin>
 
-      <plugin>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>build-info</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
       <plugin>
         <groupId>pl.project13.maven</groupId>
         <artifactId>git-commit-id-plugin</artifactId>
@@ -193,22 +188,6 @@
     <dependency>
       <groupId>com.jcraft</groupId>
       <artifactId>jsch</artifactId>
-    </dependency>
-     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.httpcomponents</groupId>
-      <artifactId>httpclient</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-net</groupId>
-      <artifactId>commons-net</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework.boot</groupId>
-      <artifactId>spring-boot-starter-actuator</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

diff --git a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/tasks/ScheduledTasks.java b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/tasks/ScheduledTasks.java
index ae8c621..364fa04 100644 (file)
--- a/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/tasks/ScheduledTasks.java
+++ b/datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/tasks/ScheduledTasks.java
@@ -133,7 +133,7 @@ public class ScheduledTasks {
     }
 
     public int publishedFilesCacheSize() {
-        return alreadyPublishedFiles.size();
+        return publishedFilesCache.size();
     }
 
     protected DMaaPMessageConsumer createConsumerTask() {

diff --git a/pom.xml b/pom.xml
index c9ad326..2528378 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -135,11 +135,16 @@
             <skip>true</skip>
           </configuration>
         </plugin>
+        <plugin>
+          <groupId>pl.project13.maven</groupId>
+          <artifactId>git-commit-id-plugin</artifactId>
+          <version>2.2.4</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
 
- <dependencyManagement>
+  <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>
@@ -165,7 +170,7 @@
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpasyncclient</artifactId>
         <version>4.1.4</version>
-      </dependency>      
+      </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-dependencies</artifactId>