diff options
| author |   Vijay Venkatesh Kumar <vv770d@att.com> | 2018-09-19 14:19:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-19 14:19:05 +0000 |
| commit | 2d1ea513ca0386102f2f9c11bd5c76f37939113a (patch) | |
| tree | 82425dec62e42342da8e1c722ef375845aa4698f | |
| parent | 7051ab4c0776b0978afbb9507b6886996eb5748c (diff) | |
| parent | e0551f4404e1011ccd9d8ca4c3e9c441360d9d2f (diff) | |
Merge "Fix Sonar build problems"
| -rw-r--r-- | datafile-app-server/pom.xml | 26 | ||||
| -rw-r--r-- | datafile-app-server/src/main/resources/datafile_endpoints.json | 28 |
2 files changed, 39 insertions, 15 deletions
diff --git a/datafile-app-server/pom.xml b/datafile-app-server/pom.xml index 64dd2bc5..88a7a6d1 100644 --- a/datafile-app-server/pom.xml +++ b/datafile-app-server/pom.xml @@ -33,26 +33,21 @@ <properties> <docker.image.name>onap/${project.groupId}.${project.artifactId}</docker.image.name> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format> - <project.fatJar.finalName>datafile-happ-server</project.fatJar.finalName> - <nexusproxy>https://nexus.onap.org</nexusproxy> - <snapshots.path>content/repositories/snapshots/</snapshots.path> - <releases.path>content/repositories/releases/</releases.path> </properties> <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + <plugins> <plugin> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-maven-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>repackage</goal> - </goals> - </execution> - </executions> <configuration> - <finalName>${project.fatJar.finalName}</finalName> + <finalName>${project.artifactId}</finalName> <mainClass>org.onap.dcaegen2.collectors.datafile.MainApp</mainClass> </configuration> </plugin> @@ -66,12 +61,11 @@ <tag>latest</tag> </imageTags> <baseImage>openjdk:8-jre-alpine</baseImage> - <entryPoint>["java", "-jar", "/opt/${project.fatJar.finalName}.jar"]</entryPoint> <resources> <resource> - <targetPath>/opt</targetPath> <directory>${project.build.directory}</directory> - <include>${project.fatJar.finalName}.jar</include> + <include>${project.artifactId}.jar</include> + <targetPath>/target</targetPath> </resource> <resource> <targetPath>/config</targetPath> @@ -83,6 +77,7 @@ <expose>8100</expose> <expose>8433</expose> </exposes> + <cmd>["java", "-jar", "/target/${project.artifactId}.jar"]</cmd> </configuration> <executions> <execution> @@ -132,6 +127,7 @@ </plugin> </plugins> </build> + <dependencies> <dependency> <groupId>io.projectreactor</groupId> diff --git a/datafile-app-server/src/main/resources/datafile_endpoints.json b/datafile-app-server/src/main/resources/datafile_endpoints.json new file mode 100644 index 00000000..f6b65fba --- /dev/null +++ b/datafile-app-server/src/main/resources/datafile_endpoints.json @@ -0,0 +1,28 @@ +{ + "configs": { + "dmaap": { + "dmaapConsumerConfiguration": { + "consumerGroup": "notification", + "consumerId": "1", + "dmaapContentType": "application/json", + "dmaapHostName": "localhost", + "dmaapPortNumber": 3904, + "dmaapProtocol": "http", + "dmaapTopicName": "/events/unauthenticated.VES_NOTIFICATION_OUTPUT", + "dmaapUserName": "admin", + "dmaapUserPassword": "admin", + "messageLimit": 1000, + "timeoutMS": 1000 + }, + "dmaapProducerConfiguration": { + "dmaapContentType": "application/octet-stream", + "dmaapHostName": "localhost", + "dmaapPortNumber": 3905, + "dmaapProtocol": "http", + "dmaapTopicName": "/events/unauthenticated.VES_NOTIFICATION_OUTPUT", + "dmaapUserName": "admin", + "dmaapUserPassword": "admin" + } + } + } +} |