diff options
| author |   PatrikBuhr <patrik.buhr@est.tech> | 2019-04-12 08:24:36 +0000 |
|---|---|---|
| committer | PatrikBuhr <patrik.buhr@est.tech> | 2019-04-12 08:24:36 +0000 |
| commit | 1ee111c0eb9d93df995a203d2f153443e17d344c (patch) | |
| tree | ea3ac32d0137185373e4dc9317b5f18533c98ef2 | |
| parent | 3fab23e694acb269ed12a69e0317ded15fef0e3e (diff) | |
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>
| -rw-r--r-- | datafile-app-server/pom.xml | 35 | ||||
| -rw-r--r-- | datafile-app-server/src/main/java/org/onap/dcaegen2/collectors/datafile/tasks/ScheduledTasks.java | 2 | ||||
| -rw-r--r-- | pom.xml | 9 |
3 files changed, 15 insertions, 31 deletions
diff --git a/datafile-app-server/pom.xml b/datafile-app-server/pom.xml index ae15ffe7..122989fa 100644 --- 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> @@ -123,18 +130,6 @@ </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> <executions> @@ -194,22 +189,6 @@ <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> <artifactId>commons-lang3</artifactId> 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 ae8c6215..364fa040 100644 --- 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() { @@ -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> |